6d484bc · typeable/pandoc

git.iko.soy/typeable/pandoc

Treat inline code blocks like <code> instead of <tt> in dokuwiki writer (#386)

Done because I noticed that in the Autolinks section of writer.dokuwiki, the URL in inlined code was getting auto-linked, when it wasn't supposed to. This also meant that any inline code examples that had text that looked like dokuwiki syntax could break the formatting of later text.

commit6d484bc55e2bc8d318b0727bcd88e4ceea795329 authorclaremacrae <github@cfmacrae.fastmail.co.uk> dateSun 18 Aug 2013, 08:13 (13 years ago) parent2a4bbe5

3 files changed+17−8

compare with master

unifiedsplit

src/Text/Pandoc/Writers/DokuWiki.hs+10−1 tests/dokuwiki-writer.dokuwiki+1−1 tests/writer.dokuwiki+6−6

src/Text/Pandoc/Writers/DokuWiki.hs+10−1

@@ -412,7 +412,16 @@ inlineToDokuWiki opts (Quoted DoubleQuote lst) = do

412412inlineToDokuWiki opts (Cite _ lst) = inlineListToDokuWiki opts lst

413413

414414inlineToDokuWiki _ (Code _ str) =

415− return $ "''" ++ ( escapeString str ) ++ "''"

415+ -- In dokuwiki, text surrounded by '' is really just a font statement, i.e. <tt>,

416+ -- and so other formatting can be present inside.

417+ -- However, in pandoc, and markdown, inlined code doesn't contain formatting.

418+ -- So I have opted for using %% to disable all formatting inside inline code blocks.

419+ -- This gives the best results when converting from other formats to dokuwiki, even if

420+ -- the resultand code is a little ugly, for short strings that don't contain formatting

421+ -- characters.

422+ -- It does mean that if pandoc could ever read dokuwiki, and so round-trip the format,

423+ -- any formatting inside inlined code blocks would be lost, or presented incorrectly.

424+ return $ "''%%" ++ str ++ "%%''"

416425

417426inlineToDokuWiki _ (Str str) = return $ str

418427

tests/dokuwiki-writer.dokuwiki+1−1

@@ -1,3 +1,3 @@

11hello // world ** from __ me

3−''hello %%//%% world ** from __ me''

3+''%%hello // world ** from __ me%%''

tests/writer.dokuwiki+6−6

@@ -433,7 +433,7 @@ So is **//this//** word.

433433

434434So is **//this//** word.

435435

436−This is code: ''>'', ''$'', ''\'', ''\$'', ''<html>''.

436+This is code: ''%%>%%'', ''%%$%%'', ''%%\%%'', ''%%\$%%'', ''%%<html>%%''.

437437

438438<del>This is //strikeout//.</del>

439439

@@ -456,7 +456,7 @@ These should not be superscripts or subscripts, because of the unescaped spaces:

456456

457457‘He said, “I want to go.”’ Were you alive in the 70’s?

458458

459−Here is some quoted ‘''code''’ and a “[[http://example.com/?foo=1&bar=2|quoted link]]”.

459+Here is some quoted ‘''%%code%%''’ and a “[[http://example.com/?foo=1&bar=2|quoted link]]”.

460460

461461Some dashes: one—two — three—four — five.

462462

@@ -480,10 +480,10 @@ Ellipses…and…and….

480480

481481These shouldn’t be math:

482482

483− * To get the famous equation, write ''$e = mc^2$''.

483+ * To get the famous equation, write ''%%$e = mc^2$%%''.

484484 * $22,000 is a //lot// of money. So is $34,000. (It worked if “lot” is emphasized.)

485485 * Shoes ($20) and socks ($5).

486− * Escaped ''$'': $73 //this should be emphasized// 23$.

486+ * Escaped ''%%$%%'': $73 //this should be emphasized// 23$.

487487

488488Here’s a LaTeX table:

489489

@@ -615,7 +615,7 @@ An e-mail address: [[mailto:nobody@nowhere.net|nobody@nowhere.net]]

615615

616616<blockquote>Blockquoted: http://example.com/

617617</blockquote>

618−Auto-links should not occur here: ''<http://example.com/>''

618+Auto-links should not occur here: ''%%<http://example.com/>%%''

619619

620620<code>or here: <http://example.com/></code>

621621

@@ -641,7 +641,7 @@ Subsequent blocks are indented to show that they belong to the footnote (as with

641641

642642<code> { <code> }</code>

643643If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

644−)) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and '']'' verbatim characters, as well as [bracketed text].

644+)) This should //not// be a footnote reference, because it contains a space.[^my note] Here is an inline note.((This is //easier// to type. Inline notes may contain [[http://google.com|links]] and ''%%]%%'' verbatim characters, as well as [bracketed text].

645645))

646646

647647<blockquote>Notes can go in quotes.((In quote.