Markdown writer: Use proper escapes to avoid unwanted lists.
Previously we used 0-width spaces, an ugly hack. Closes #980.
This commit is contained in:
John MacFarlane
parent
58c9946cda
commit
e6333a9d7c
2 changed files with 21 additions and 16 deletions
|
|
@ -316,20 +316,25 @@ blockToMarkdown opts (Div attrs ils) = do
|
|||
contents <> blankline <> "</div>" <> blankline
|
||||
blockToMarkdown opts (Plain inlines) = do
|
||||
contents <- inlineListToMarkdown opts inlines
|
||||
return $ contents <> cr
|
||||
-- escape if para starts with ordered list marker
|
||||
st <- get
|
||||
let colwidth = if writerWrapText opts
|
||||
then Just $ writerColumns opts
|
||||
else Nothing
|
||||
let rendered = render colwidth contents
|
||||
let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs
|
||||
| otherwise = x : escapeDelimiter xs
|
||||
escapeDelimiter [] = []
|
||||
let contents' = if isEnabled Ext_all_symbols_escapable opts &&
|
||||
not (stPlain st) && beginsWithOrderedListMarker rendered
|
||||
then text $ escapeDelimiter rendered
|
||||
else contents
|
||||
return $ contents' <> cr
|
||||
-- title beginning with fig: indicates figure
|
||||
blockToMarkdown opts (Para [Image alt (src,'f':'i':'g':':':tit)]) =
|
||||
blockToMarkdown opts (Para [Image alt (src,tit)])
|
||||
blockToMarkdown opts (Para inlines) = do
|
||||
contents <- inlineListToMarkdown opts inlines
|
||||
-- escape if para starts with ordered list marker
|
||||
st <- get
|
||||
let esc = if isEnabled Ext_all_symbols_escapable opts &&
|
||||
not (stPlain st) &&
|
||||
beginsWithOrderedListMarker (render Nothing contents)
|
||||
then text "\x200B" -- zero-width space, a hack
|
||||
else empty
|
||||
return $ esc <> contents <> blankline
|
||||
blockToMarkdown opts (Para inlines) =
|
||||
(<> blankline) `fmap` blockToMarkdown opts (Plain inlines)
|
||||
blockToMarkdown opts (RawBlock f str)
|
||||
| f == "html" = do
|
||||
st <- get
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</outline>
|
||||
<outline text="Level 1">
|
||||
<outline text="Level 2 with <em>emphasis</em>">
|
||||
<outline text="Level 3" _note="with no blank line">
|
||||
<outline text="Level 3" _note="with no blank line ">
|
||||
</outline>
|
||||
</outline>
|
||||
<outline text="Level 2" _note="with no blank line * * * * *">
|
||||
|
|
@ -55,18 +55,18 @@
|
|||
<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: - * * * * *">
|
||||
</outline>
|
||||
<outline text="Links">
|
||||
<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]().">
|
||||
<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](). ">
|
||||
</outline>
|
||||
<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").">
|
||||
<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"). ">
|
||||
</outline>
|
||||
<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).">
|
||||
<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). ">
|
||||
</outline>
|
||||
<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/> * * * * *">
|
||||
</outline>
|
||||
</outline>
|
||||
<outline text="Images" _note="From “Voyage dans la Lune” by Georges Melies (1902):  Here is a movie  icon. * * * * *">
|
||||
</outline>
|
||||
<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.">
|
||||
<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. ">
|
||||
</outline>
|
||||
</body>
|
||||
</opml>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue