diff options
| author | Alexander Krotov <ilabdsf@gmail.com> | 2018-01-29 23:27:40 +0300 |
|---|---|---|
| committer | Alexander Krotov <ilabdsf@gmail.com> | 2018-01-30 00:33:02 +0300 |
| commit | 9ff8bc64f9c873e2bcae6a1a46f71af9287d6753 (patch) | |
| tree | 5dd6f3c10d5e9626da153f3dfb4e520f7aa18e11 | |
| parent | b7d8930dc097defcae754120a4fa0d6727c9b265 (diff) | |
| download | pandoc-9ff8bc64f9c873e2bcae6a1a46f71af9287d6753.tar.gz | |
Muse writer: don't wrap displayMath into <verse>
<verse> is a block tag and displayMath is an inline element.
Writing <verse> around displayMath could result in nested
<verse> tags.
| -rw-r--r-- | src/Text/Pandoc/Writers/Muse.hs | 7 | ||||
| -rw-r--r-- | test/Tests/Writers/Muse.hs | 2 | ||||
| -rw-r--r-- | test/writer.muse | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index 73d79a9a2..c3c1c3120 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -363,11 +363,8 @@ inlineToMuse (Quoted DoubleQuote lst) = do inlineToMuse (Cite _ lst) = inlineListToMuse lst inlineToMuse (Code _ str) = return $ "<code>" <> text (substitute "</code>" "<</code><code>/code>" str) <> "</code>" -inlineToMuse (Math InlineMath str) = - lift (texMathToInlines InlineMath str) >>= inlineListToMuse -inlineToMuse (Math DisplayMath str) = do - contents <- lift (texMathToInlines DisplayMath str) >>= inlineListToMuse - return $ "<verse>" <> contents <> "</verse>" <> blankline +inlineToMuse (Math t str) = + lift (texMathToInlines t str) >>= inlineListToMuse inlineToMuse (RawInline (Format f) str) = return $ "<literal style=\"" <> text f <> "\">" <> text str <> "</literal>" inlineToMuse LineBreak = return $ "<br>" <> cr diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index fda5c7c9e..f330d14c5 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -330,7 +330,7 @@ tests = [ testGroup "block elements" ] , testGroup "math" [ "inline math" =: math "2^3" =?> "2<sup>3</sup>" - , "display math" =: displayMath "2^3" =?> "<verse>2<sup>3</sup></verse>" + , "display math" =: displayMath "2^3" =?> "2<sup>3</sup>" , "multiple letters in inline math" =: math "abc" =?> "<em>abc</em>" ] , "raw inline" diff --git a/test/writer.muse b/test/writer.muse index 33c622a3a..aed30ba4a 100644 --- a/test/writer.muse +++ b/test/writer.muse @@ -520,7 +520,7 @@ Ellipses…and…and…. - 223 - <em>p</em>-Tree - Here’s some display math: - <verse><verbatim>$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</verbatim></verse> + <verbatim>$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$</verbatim> - Here’s one that has a line break in it: <em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup>. |