e6333a9 · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown writer: Use proper escapes to avoid unwanted lists.

Previously we used 0-width spaces, an ugly hack. Closes #980.

commite6333a9d7cfe8ec36acae59bd19a654d868f4b8d authorJohn MacFarlane <fiddlosopher@gmail.com> dateThu 24 Apr 2014, 16:44 (13 years ago) parent58c9946

2 files changed+21−16

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Markdown.hs+16−11 tests/writer.opml+5−5

src/Text/Pandoc/Writers/Markdown.hs+16−11

@@ -316,20 +316,25 @@ blockToMarkdown opts (Div attrs ils) = do

316316 contents <> blankline <> "</div>" <> blankline

317317blockToMarkdown opts (Plain inlines) = do

318318 contents <- inlineListToMarkdown opts inlines

319− return $ contents <> cr

319+ -- escape if para starts with ordered list marker

320+ st <- get

321+ let colwidth = if writerWrapText opts

322+ then Just $ writerColumns opts

323+ else Nothing

324+ let rendered = render colwidth contents

325+ let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs

326+ | otherwise = x : escapeDelimiter xs

327+ escapeDelimiter [] = []

328+ let contents' = if isEnabled Ext_all_symbols_escapable opts &&

329+ not (stPlain st) && beginsWithOrderedListMarker rendered

330+ then text $ escapeDelimiter rendered

331+ else contents

332+ return $ contents' <> cr

320333-- title beginning with fig: indicates figure

321334blockToMarkdown opts (Para [Image alt (src,'f':'i':'g':':':tit)]) =

322335 blockToMarkdown opts (Para [Image alt (src,tit)])

323−blockToMarkdown opts (Para inlines) = do

324− contents <- inlineListToMarkdown opts inlines

325− -- escape if para starts with ordered list marker

326− st <- get

327− let esc = if isEnabled Ext_all_symbols_escapable opts &&

328− not (stPlain st) &&

329− beginsWithOrderedListMarker (render Nothing contents)

330− then text "\x200B" -- zero-width space, a hack

331− else empty

332− return $ esc <> contents <> blankline

336+blockToMarkdown opts (Para inlines) =

337+ (<> blankline) `fmap` blockToMarkdown opts (Plain inlines)

333338blockToMarkdown opts (RawBlock f str)

334339 | f == "html" = do

335340 st <- get

tests/writer.opml+5−5

@@ -18,7 +18,7 @@

1818</outline>

1919<outline text="Level 1">

2020 <outline text="Level 2 with <em>emphasis</em>">

21− <outline text="Level 3" _note="with no blank line">

21+ <outline text="Level 3" _note="with no blank line
">

2222 </outline>

2323 </outline>

2424 <outline text="Level 2" _note="with no blank line

* * * * *">

@@ -55,18 +55,18 @@

5555<outline text="Special Characters" _note="Here is some unicode:

- I hat: Î
- o umlaut: ö
- section: §
- set membership: ∈
- copyright: ©

AT&T has an ampersand in their name.

AT&T is another way to write it.

This & that.

4 \< 5.

6 \> 5.

Backslash: \\

Backtick: \`

Asterisk: \*

Underscore: \_

Left brace: {

Right brace: }

Left bracket: [

Right bracket: ]

Left paren: (

Right paren: )

Greater-than: \>

Hash: \#

Period: .

Bang: !

Plus: +

Minus: -

* * * * *">

5656</outline>

5757<outline text="Links">

58− <outline text="Explicit" _note="Just a [URL](/url/).

[URL and title](/url/ "title").

[URL and title](/url/ "title preceded by two spaces").

[URL and title](/url/ "title preceded by a tab").

[URL and title](/url/ "title with "quotes" in it")

[URL and title](/url/ "title with single quotes")

[with\_underscore](/url/with_underscore)

[Email link](mailto:nobody@nowhere.net)

[Empty]().">

58+ <outline text="Explicit" _note="Just a [URL](/url/).

[URL and title](/url/ "title").

[URL and title](/url/ "title preceded by two spaces").

[URL and title](/url/ "title preceded by a tab").

[URL and title](/url/ "title with "quotes" in it")

[URL and title](/url/ "title with single quotes")

[with\_underscore](/url/with_underscore)

[Email link](mailto:nobody@nowhere.net)

[Empty]().
">

5959 </outline>

60− <outline text="Reference" _note="Foo [bar](/url/).

Foo [bar](/url/).

Foo [bar](/url/).

With [embedded [brackets]](/url/).

[b](/url/) by itself should be a link.

Indented [once](/url).

Indented [twice](/url).

Indented [thrice](/url).

This should [not][] be a link.

 [not]: /url

Foo [bar](/url/ "Title with "quotes" inside").

Foo [biz](/url/ "Title with "quote" inside").">

60+ <outline text="Reference" _note="Foo [bar](/url/).

Foo [bar](/url/).

Foo [bar](/url/).

With [embedded [brackets]](/url/).

[b](/url/) by itself should be a link.

Indented [once](/url).

Indented [twice](/url).

Indented [thrice](/url).

This should [not][] be a link.

 [not]: /url

Foo [bar](/url/ "Title with "quotes" inside").

Foo [biz](/url/ "Title with "quote" inside").
">

6161 </outline>

62− <outline text="With ampersands" _note="Here’s a [link with an ampersand in the
URL](http://example.com/?foo=1&bar=2).

Here’s a link with an amersand in the link text:
[AT&T](http://att.com/ "AT&T").

Here’s an [inline link](/script?foo=1&bar=2).

Here’s an [inline link in pointy braces](/script?foo=1&bar=2).">

62+ <outline text="With ampersands" _note="Here’s a [link with an ampersand in the
URL](http://example.com/?foo=1&bar=2).

Here’s a link with an amersand in the link text:
[AT&T](http://att.com/ "AT&T").

Here’s an [inline link](/script?foo=1&bar=2).

Here’s an [inline link in pointy braces](/script?foo=1&bar=2).
">

6363 </outline>

6464 <outline text="Autolinks" _note="With an ampersand: <http://example.com/?foo=1&bar=2>

- In a list?
- <http://example.com/>
- It should.

An e-mail address: <nobody@nowhere.net>

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

Auto-links should not occur here: `<http://example.com/>`

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

* * * * *">

6565 </outline>

6666</outline>

6767<outline text="Images" _note="From “Voyage dans la Lune” by Georges Melies (1902):

![lalune](lalune.jpg "Voyage dans la Lune")

Here is a movie ![movie](movie.jpg) icon.

* * * * *">

6868</outline>

69−<outline text="Footnotes" _note="Here is a footnote reference,[^1] and another.[^2] This should *not* be
a footnote reference, because it contains a space.[\^my note] Here is an
inline note.[^3]

> Notes can go in quotes.[^4]

1. And in list items.[^5]

This paragraph should not be part of the note, as it is not indented.

[^1]: Here is the footnote. It can go anywhere after the footnote
 reference. It need not be placed at the end of the document.

[^2]: Here’s the long note. This one contains multiple blocks.

 Subsequent blocks are indented to show that they belong to the
 footnote (as with list items).

 { <code> }

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

[^3]: This is *easier* to type. Inline notes may contain
 [links](http://google.com) and `]` verbatim characters, as well as
 [bracketed text].

[^4]: In quote.

[^5]: In list.">

69+<outline text="Footnotes" _note="Here is a footnote reference,[^1] and another.[^2] This should *not* be
a footnote reference, because it contains a space.[\^my note] Here is an
inline note.[^3]

> Notes can go in quotes.[^4]

1. And in list items.[^5]

This paragraph should not be part of the note, as it is not indented.

[^1]: Here is the footnote. It can go anywhere after the footnote
 reference. It need not be placed at the end of the document.

[^2]: Here’s the long note. This one contains multiple blocks.

 Subsequent blocks are indented to show that they belong to the
 footnote (as with list items).

 { <code> }

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

[^3]: This is *easier* to type. Inline notes may contain
 [links](http://google.com) and `]` verbatim characters, as well as
 [bracketed text].

[^4]: In quote.

[^5]: In list.
">

7070</outline>

7171 </body>

7272</opml>