From 98ee6ca289ad7117b7336a57bcfc6f4b54463f4e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 5 May 2019 21:57:30 -0700 Subject: Asciidoc writer: use `` `+...+` `` form for inline code. The old `` `a__b__c` `` yields emphasis inside code in asciidoc. To get a pure literal code span, use `` `+a__b__c+` ``. --- src/Text/Pandoc/Writers/AsciiDoc.hs | 2 +- test/writer.asciidoc | 12 ++++++------ test/writer.asciidoctor | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs index 47738e69d..31827fd69 100644 --- a/src/Text/Pandoc/Writers/AsciiDoc.hs +++ b/src/Text/Pandoc/Writers/AsciiDoc.hs @@ -436,7 +436,7 @@ inlineToAsciiDoc opts (Quoted qt lst) = do | isAsciidoctor -> [Str "\"`"] ++ lst ++ [Str "`\""] | otherwise -> [Str "``"] ++ lst ++ [Str "''"] inlineToAsciiDoc _ (Code _ str) = return $ - text "`" <> text (escapeStringUsing (backslashEscapes "`") str) <> "`" + text "`+" <> text (escapeStringUsing (backslashEscapes "`") str) <> "+`" inlineToAsciiDoc _ (Str str) = return $ text $ escapeString str inlineToAsciiDoc _ (Math InlineMath str) = do isAsciidoctor <- gets asciidoctorVariant diff --git a/test/writer.asciidoc b/test/writer.asciidoc index 237e4a70b..ab3347b63 100644 --- a/test/writer.asciidoc +++ b/test/writer.asciidoc @@ -423,7 +423,7 @@ So is *_this_* word. So is *_this_* word. -This is code: `>`, `$`, `\`, `\$`, ``. +This is code: `+>+`, `+$+`, `+\+`, `+\$+`, `++`. [line-through]*This is _strikeout_.* @@ -446,7 +446,7 @@ spaces: a^b c^d, a~b c~d. `He said, ``I want to go.''' Were you alive in the 70’s? -Here is some quoted ``code`' and a ``http://example.com/?foo=1&bar=2[quoted +Here is some quoted ``+code+`' and a ``http://example.com/?foo=1&bar=2[quoted link]''. Some dashes: one—two — three—four — five. @@ -476,11 +476,11 @@ latexmath:[$\alpha + \omega \times x^2$]. These shouldn’t be math: -* To get the famous equation, write `$e = mc^2$`. +* To get the famous equation, write `+$e = mc^2$+`. * $22,000 is a _lot_ of money. So is $34,000. (It worked if ``lot'' is emphasized.) * Shoes ($20) and socks ($5). -* Escaped `$`: $73 _this should be emphasized_ 23$. +* Escaped `+$+`: $73 _this should be emphasized_ 23$. Here’s a LaTeX table: @@ -610,7 +610,7 @@ ____ Blockquoted: http://example.com/ ____ -Auto-links should not occur here: `` +Auto-links should not occur here: `++` .... or here: @@ -635,7 +635,7 @@ anywhere after the footnote reference. It need not be placed at the end of the document.] and another.[multiblock footnote omitted] This should _not_ be a footnote reference, because it contains a space.[^my note] Here is an inline note.footnote:[This is _easier_ to type. Inline notes may contain -http://google.com[links] and `]` verbatim characters, as well as [bracketed +http://google.com[links] and `+]+` verbatim characters, as well as [bracketed text].] ____ diff --git a/test/writer.asciidoctor b/test/writer.asciidoctor index d72b1876f..00cae3b27 100644 --- a/test/writer.asciidoctor +++ b/test/writer.asciidoctor @@ -424,7 +424,7 @@ So is *_this_* word. So is *_this_* word. -This is code: `>`, `$`, `\`, `\$`, ``. +This is code: `+>+`, `+$+`, `+\+`, `+\$+`, `++`. [line-through]*This is _strikeout_.* @@ -447,8 +447,8 @@ spaces: a^b c^d, a~b c~d. '`He said, "`I want to go.`"`' Were you alive in the 70’s? -Here is some quoted '``code``' and a "`http://example.com/?foo=1&bar=2[quoted -link]`". +Here is some quoted '``+code+``' and a +"`http://example.com/?foo=1&bar=2[quoted link]`". Some dashes: one—two — three—four — five. @@ -477,11 +477,11 @@ latexmath:[\alpha + \omega \times x^2]. These shouldn’t be math: -* To get the famous equation, write `$e = mc^2$`. +* To get the famous equation, write `+$e = mc^2$+`. * $22,000 is a _lot_ of money. So is $34,000. (It worked if "`lot`" is emphasized.) * Shoes ($20) and socks ($5). -* Escaped `$`: $73 _this should be emphasized_ 23$. +* Escaped `+$+`: $73 _this should be emphasized_ 23$. Here’s a LaTeX table: @@ -611,7 +611,7 @@ ____ Blockquoted: http://example.com/ ____ -Auto-links should not occur here: `` +Auto-links should not occur here: `++` .... or here: @@ -636,7 +636,7 @@ anywhere after the footnote reference. It need not be placed at the end of the document.] and another.[multiblock footnote omitted] This should _not_ be a footnote reference, because it contains a space.[^my note] Here is an inline note.footnote:[This is _easier_ to type. Inline notes may contain -http://google.com[links] and `]` verbatim characters, as well as [bracketed +http://google.com[links] and `+]+` verbatim characters, as well as [bracketed text].] ____ -- cgit v1.2.3