diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-25 19:36:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-25 10:36:06 -0700 |
commit | e9c0f9f97ba6459530c7bb2ffb55d432a1ba7884 (patch) | |
tree | 13defddfe64ea235782f532a1488b380819e9a1b | |
parent | 547bc2cdf83b8be926de55521674c0e8fab12db5 (diff) | |
download | pandoc-e9c0f9f97ba6459530c7bb2ffb55d432a1ba7884.tar.gz |
Markdown writer: Cleaner (code)blocks with single class (#7242)
When a block only has a single class and no other attributes,
it is not necessary to wrap the class attribute in curly braces –
the class name can be placed after the opening mark as is.
This will result in bit cleaner output when pandoc is used
as a markdown pretty-printer.
-rw-r--r-- | src/Text/Pandoc/Writers/Markdown.hs | 10 | ||||
-rw-r--r-- | test/command/5304.md | 2 | ||||
-rw-r--r-- | test/command/5519.md | 2 | ||||
-rw-r--r-- | test/command/6925.md | 4 | ||||
-rw-r--r-- | test/command/toc.md | 4 |
5 files changed, 14 insertions, 8 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 3295d9e6c..2ad9eabd9 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -278,6 +278,12 @@ attrsToMarkdown attribs = braces $ hsep [attribId, attribClasses, attribKeys] escAttrChar '\\' = literal "\\\\" escAttrChar c = literal $ T.singleton c +-- | (Code) blocks with a single class can just use it standalone, +-- no need to bother with curly braces. +classOrAttrsToMarkdown :: Attr -> Doc Text +classOrAttrsToMarkdown ("",[cls],_) = literal cls +classOrAttrsToMarkdown attrs = attrsToMarkdown attrs + linkAttributes :: WriterOptions -> Attr -> Doc Text linkAttributes opts attr = if isEnabled Ext_link_attributes opts && attr /= nullAttr @@ -343,7 +349,7 @@ blockToMarkdown' opts (Div attrs ils) = do case () of _ | isEnabled Ext_fenced_divs opts && attrs /= nullAttr -> - nowrap (literal ":::" <+> attrsToMarkdown attrs) $$ + nowrap (literal ":::" <+> classOrAttrsToMarkdown attrs) $$ chomp contents $$ literal ":::" <> blankline | isEnabled Ext_native_divs opts || @@ -512,7 +518,7 @@ blockToMarkdown' opts (CodeBlock attribs str) = do backticks = endline '`' tildes = endline '~' attrs = if isEnabled Ext_fenced_code_attributes opts - then nowrap $ " " <> attrsToMarkdown attribs + then nowrap $ " " <> classOrAttrsToMarkdown attribs else case attribs of (_,cls:_,_) -> " " <> literal cls _ -> empty diff --git a/test/command/5304.md b/test/command/5304.md index 62b2b9ddd..70f32a96a 100644 --- a/test/command/5304.md +++ b/test/command/5304.md @@ -11,7 +11,7 @@ ... ``` ^D -``` {.markdown} +``` markdown `«sträng»` `` «sträng» `` diff --git a/test/command/5519.md b/test/command/5519.md index a175ce9f9..ecde184f1 100644 --- a/test/command/5519.md +++ b/test/command/5519.md @@ -6,7 +6,7 @@ ``` `````` ^D -```` {.attr} +```` attr ``` code ``` diff --git a/test/command/6925.md b/test/command/6925.md index 458a0b91d..e0d8e6870 100644 --- a/test/command/6925.md +++ b/test/command/6925.md @@ -20,13 +20,13 @@ a \end{thm2} \end{document} ^D -::: {.thm} +::: thm **Theorem 1**. *a* ![image](1.png) ::: -::: {.thm2} +::: thm2 **Theorem 1**. a ![image](1.png) diff --git a/test/command/toc.md b/test/command/toc.md index 794af7690..543f97ba9 100644 --- a/test/command/toc.md +++ b/test/command/toc.md @@ -31,7 +31,7 @@ ## b -::: {.interior} +::: interior # C ## cc @@ -39,7 +39,7 @@ # D ::: -::: {.blue} +::: blue # E ## e |