diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-10-15 14:35:01 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-10-15 14:35:01 -0700 |
| commit | 047cb32dfcf182368a9de5658857e16894253285 (patch) | |
| tree | 90445414ddcb13feebc89f8a868dedda7e802a9b | |
| parent | 3f9dd655728ce3af2419c01c316187480860ed6f (diff) | |
Use unicode super/subscripts for digits in plain output.
| -rw-r--r-- | src/Text/Pandoc/Writers/Markdown.hs | 17 | ||||
| -rw-r--r-- | tests/writer.plain | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 5e7748efb..cd9c26289 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -40,7 +40,7 @@ import Text.Pandoc.Options import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space) import Data.Maybe (fromMaybe) import Data.List ( group, stripPrefix, find, intersperse, transpose, sortBy ) -import Data.Char ( isSpace, isPunctuation ) +import Data.Char ( isSpace, isPunctuation, ord, chr ) import Data.Ord ( comparing ) import Text.Pandoc.Pretty import Control.Monad.State @@ -775,14 +775,25 @@ inlineToMarkdown opts (Superscript lst) = do then "^" <> contents <> "^" else if isEnabled Ext_raw_html opts then "<sup>" <> contents <> "</sup>" - else contents + else case (render Nothing contents) of + ds | all (\d -> d >= '0' && d <= '9') ds + -> text (map toSuperscript ds) + _ -> contents + where toSuperscript '1' = '\x00B9' + toSuperscript '2' = '\x00B2' + toSuperscript '3' = '\x00B3' + toSuperscript c = chr (0x2070 + (ord c - 48)) inlineToMarkdown opts (Subscript lst) = do contents <- inlineListToMarkdown opts $ walk escapeSpaces lst return $ if isEnabled Ext_subscript opts then "~" <> contents <> "~" else if isEnabled Ext_raw_html opts then "<sub>" <> contents <> "</sub>" - else contents + else case (render Nothing contents) of + ds | all (\d -> d >= '0' && d <= '9') ds + -> text (map toSubscript ds) + _ -> contents + where toSubscript c = chr (0x2080 + (ord c - 48)) inlineToMarkdown opts (SmallCaps lst) = do plain <- gets stPlain if not plain && diff --git a/tests/writer.plain b/tests/writer.plain index ba476f21d..a8c8f9bf9 100644 --- a/tests/writer.plain +++ b/tests/writer.plain @@ -451,7 +451,7 @@ This is code: >, $, \, \$, <html>. Superscripts: abcd a_hello_ ahello there. -Subscripts: H2O, H23O, Hmany of themO. +Subscripts: H₂O, H₂₃O, Hmany of themO. These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d. @@ -494,7 +494,7 @@ LATEX - p-Tree - Here’s some display math: $$\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: α + ω × x2. +- Here’s one that has a line break in it: α + ω × x². These shouldn’t be math: |