diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/Markdown.hs | 8 | ||||
| -rw-r--r-- | test/command/8011.md | 4 | ||||
| -rw-r--r-- | test/command/gfm.md | 4 | ||||
| -rw-r--r-- | test/writer.markua | 16 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 222a2dd4a..f10290ec0 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -684,15 +684,15 @@ bulletListItemToMarkdown opts bs = do variant <- asks envVariant let exts = writerExtensions opts contents <- blockListToMarkdown opts $ taskListItemToAscii exts bs - let sps = T.replicate (writerTabStop opts - 2) " " let start = case variant of - Markua -> literal "* " - _ -> literal $ "- " <> sps + Markua -> "* " + Commonmark -> "- " + _ -> "- " <> T.replicate (writerTabStop opts - 2) " " -- remove trailing blank line if item ends with a tight list let contents' = if itemEndsWithTightList bs then chomp contents <> cr else contents - return $ hang (writerTabStop opts) start contents' + return $ hang (T.length start) (literal start) contents' -- | Convert ordered list item (a list of blocks) to markdown. orderedListItemToMarkdown :: PandocMonad m diff --git a/test/command/8011.md b/test/command/8011.md index 0a79ed9e2..552ad2abc 100644 --- a/test/command/8011.md +++ b/test/command/8011.md @@ -9,7 +9,7 @@ </listitem> </itemizedlist> ^D -- [ ] a +- [ ] a -- [x] b +- [x] b ``` diff --git a/test/command/gfm.md b/test/command/gfm.md index 78736b2d6..12bd09094 100644 --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -217,6 +217,6 @@ hi - [ ] foo - [x] bar ^D -- [ ] foo -- [x] bar +- [ ] foo +- [x] bar ``` diff --git a/test/writer.markua b/test/writer.markua index 1c5b44cc2..bc9668a06 100644 --- a/test/writer.markua +++ b/test/writer.markua @@ -202,8 +202,8 @@ Multiple paragraphs: ## Nested * Tab + * Tab * Tab - * Tab Here’s another: @@ -233,9 +233,9 @@ Same thing but with paragraphs: * this is a list item indented with spaces - * this is an example list item indented with tabs + * this is an example list item indented with tabs - * this is an example list item indented with spaces + * this is an example list item indented with spaces {id: fancy-list-markers} ## Fancy list markers @@ -492,17 +492,17 @@ Ellipses…and…and…. * `p`$-Tree * Here’s some display math: - {format: latex} - ``` - \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} - ``` + {format: latex} + ``` + \frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h} + ``` * Here’s one that has a line break in it: `\alpha + \omega \times x^2`$. These shouldn’t be math: * 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.) + emphasized.) * Shoes ($20) and socks ($5). * Escaped `$`: $73 *this should be emphasized* 23$. |