Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Plain writer: don't use symbols for super/subscript.

Browse source 
Simplified code by using plainExtensions from Options.

Closes #2237.
This commit is contained in:
John MacFarlane 2015-06-27 20:18:42 -07:00
parent 177533d3f8
commit fce3ebb8e0
3 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Text/Pandoc.hs
View file

@ -316,7 +316,7 @@ getDefaultExtensions "markdown_phpextra" = phpMarkdownExtraExtensions
getDefaultExtensions "markdown_mmd" = multimarkdownExtensions getDefaultExtensions "markdown_mmd" = multimarkdownExtensions
getDefaultExtensions "markdown_github" = githubMarkdownExtensions getDefaultExtensions "markdown_github" = githubMarkdownExtensions
getDefaultExtensions "markdown" = pandocExtensions getDefaultExtensions "markdown" = pandocExtensions
getDefaultExtensions "plain" = pandocExtensions getDefaultExtensions "plain" = plainExtensions
getDefaultExtensions "org" = Set.fromList [Ext_citations] getDefaultExtensions "org" = Set.fromList [Ext_citations]
getDefaultExtensions "textile" = Set.fromList [Ext_auto_identifiers] getDefaultExtensions "textile" = Set.fromList [Ext_auto_identifiers]
getDefaultExtensions "html" = Set.fromList [Ext_auto_identifiers, getDefaultExtensions "html" = Set.fromList [Ext_auto_identifiers,

24
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -79,17 +79,7 @@ writeMarkdown opts document =
-- pictures, or inline formatting). -- pictures, or inline formatting).
writePlain :: WriterOptions -> Pandoc -> String writePlain :: WriterOptions -> Pandoc -> String
writePlain opts document = writePlain opts document =
evalState (pandocToMarkdown opts{ evalState (pandocToMarkdown opts document) def{ stPlain = True }
writerExtensions = Set.delete Ext_escaped_line_breaks $
Set.delete Ext_pipe_tables $
Set.delete Ext_raw_html $
Set.delete Ext_markdown_in_html_blocks $
Set.delete Ext_raw_tex $
Set.delete Ext_footnotes $
Set.delete Ext_tex_math_dollars $
Set.delete Ext_citations $
writerExtensions opts }
document) def{ stPlain = True }
pandocTitleBlock :: Doc -> [Doc] -> Doc -> Doc pandocTitleBlock :: Doc -> [Doc] -> Doc -> Doc
pandocTitleBlock tit auths dat = pandocTitleBlock tit auths dat =
@ -774,17 +764,23 @@ inlineToMarkdown opts (Strikeout lst) = do
contents <- inlineListToMarkdown opts lst contents <- inlineListToMarkdown opts lst
return $ if isEnabled Ext_strikeout opts return $ if isEnabled Ext_strikeout opts
then "~~" <> contents <> "~~" then "~~" <> contents <> "~~"
else "<s>" <> contents <> "</s>" else if isEnabled Ext_raw_html opts
then "<s>" <> contents <> "</s>"
else contents
inlineToMarkdown opts (Superscript lst) = do inlineToMarkdown opts (Superscript lst) = do
contents <- inlineListToMarkdown opts $ walk escapeSpaces lst contents <- inlineListToMarkdown opts $ walk escapeSpaces lst
return $ if isEnabled Ext_superscript opts return $ if isEnabled Ext_superscript opts
then "^" <> contents <> "^" then "^" <> contents <> "^"
else "<sup>" <> contents <> "</sup>" else if isEnabled Ext_raw_html opts
then "<sup>" <> contents <> "</sup>"
else contents
inlineToMarkdown opts (Subscript lst) = do inlineToMarkdown opts (Subscript lst) = do
contents <- inlineListToMarkdown opts $ walk escapeSpaces lst contents <- inlineListToMarkdown opts $ walk escapeSpaces lst
return $ if isEnabled Ext_subscript opts return $ if isEnabled Ext_subscript opts
then "~" <> contents <> "~" then "~" <> contents <> "~"
else "<sub>" <> contents <> "</sub>" else if isEnabled Ext_raw_html opts
then "<sub>" <> contents <> "</sub>"
else contents
inlineToMarkdown opts (SmallCaps lst) = do inlineToMarkdown opts (SmallCaps lst) = do
plain <- gets stPlain plain <- gets stPlain
if not plain && if not plain &&

6
tests/writer.plain
View file

@ -449,9 +449,9 @@ This is code: >, $, \, \$, <html>.
~~This is _strikeout_.~~ ~~This is _strikeout_.~~
Superscripts: a^bc^d a^_hello_^ a^hello there^. Superscripts: abcd a_hello_ ahello there.
Subscripts: H~2~O, H~23~O, H~many of them~O. Subscripts: H2O, H23O, Hmany of themO.
These should not be superscripts or subscripts, because of the unescaped These should not be superscripts or subscripts, because of the unescaped
spaces: a^b c^d, a~b c~d. spaces: a^b c^d, a~b c~d.
@ -494,7 +494,7 @@ LATEX
- p-Tree - p-Tree
- Here’s some display math: - Here’s some display math:
$$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$ $$\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: α + ω × x^2^. - Here’s one that has a line break in it: α + ω × x2.
These shouldn’t be math: These shouldn’t be math: