git.iko.soy/typeable/pandoc
on master help sign in
Distinguish latex & context environments; blank line after in writers.
commiteb26fa6f540fa9c44135a73f2104fbd0d32d78c1 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 24 Jan 2011, 09:05 (16 years ago) parentbd43c0f
6 files changed+9−14
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Markdown.hs+4−3 src/Text/Pandoc/Writers/ConTeXt.hs+1−3 src/Text/Pandoc/Writers/LaTeX.hs+1−1 tests/markdown-reader-more.native+2−2 tests/writer.context−5 tests/writer.latex+1
src/Text/Pandoc/Readers/Markdown.hs+4−3
@@ -711,9 +711,10 @@ rawVerbatimBlock = try $ do
711711rawTeXBlock :: GenParser Char ParserState Block
712712rawTeXBlock = do
713713 failIfStrict
714− result <- rawLaTeXEnvironment' <|> rawConTeXtEnvironment'
714+ result <- liftM (RawBlock "latex") rawLaTeXEnvironment'
715+ <|> liftM (RawBlock "context") rawConTeXtEnvironment'
715716 spaces
716− return $ RawBlock "latex" result
717+ return result
717718
718719rawHtmlBlocks :: GenParser Char ParserState Block
719720rawHtmlBlocks = do
@@ -1186,7 +1187,7 @@ inlineNote = try $ do
11861187rawLaTeXInline' :: GenParser Char ParserState Inline
11871188rawLaTeXInline' = do
11881189 failIfStrict
1189− (rawConTeXtEnvironment' >>= return . RawInline "latex")
1190+ (rawConTeXtEnvironment' >>= return . RawInline "context")
11901191 <|> (rawLaTeXEnvironment' >>= return . RawInline "latex")
11911192 <|> rawLaTeXInline
11921193
src/Text/Pandoc/Writers/ConTeXt.hs+1−3
@@ -124,9 +124,7 @@ blockToConTeXt (BlockQuote lst) = do
124124blockToConTeXt (CodeBlock _ str) =
125125 return $ "\\starttyping" <> cr <> flush (text str) <> cr <> "\\stoptyping" $$ blankline
126126 -- blankline because \stoptyping can't have anything after it, inc. '}'
127−blockToConTeXt (RawBlock "context" str) = return $ text str
128−-- for backwards compatibility, allow latex too:
129−blockToConTeXt (RawBlock "latex" str) = return $ text str
127+blockToConTeXt (RawBlock "context" str) = return $ text str <> blankline
130128blockToConTeXt (RawBlock _ _ ) = return empty
131129blockToConTeXt (BulletList lst) = do
132130 contents <- mapM listItemToConTeXt lst
src/Text/Pandoc/Writers/LaTeX.hs+1−1
@@ -184,7 +184,7 @@ blockToLaTeX (CodeBlock (_,classes,_) str) = do
184184 else return "verbatim"
185185 return $ "\\begin{" <> text env <> "}" $$ flush (text str) $$
186186 "\\end{" <> text env <> "}" $$ cr -- final cr needed because of footnotes
187−blockToLaTeX (RawBlock "latex" x) = return $ text x
187+blockToLaTeX (RawBlock "latex" x) = return $ text x <> blankline
188188blockToLaTeX (RawBlock _ _) = return empty
189189blockToLaTeX (BulletList lst) = do
190190 items <- mapM listItemToLaTeX lst
tests/markdown-reader-more.native+2−2
@@ -2,8 +2,8 @@
22,Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
33,Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
44,Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
5−,Para [RawInline "latex" "\\placeformula",Space,RawInline "latex" "\\startformula\n L_{1} = L_{2}\n \\stopformula"]
6−,RawBlock "latex" "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
5+,Para [RawInline "latex" "\\placeformula",Space,RawInline "context" "\\startformula\n L_{1} = L_{2}\n \\stopformula"]
6+,RawBlock "context" "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
77,Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
88,Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
99,Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
tests/writer.context−5
@@ -691,11 +691,6 @@ These shouldn't be math:
691691
692692Here's a LaTeX table:
693693
694−\begin{tabular}{|l|l|}\hline
695−Animal & Number \\ \hline
696−Dog & 2 \\
697−Cat & 1 \\ \hline
698−\end{tabular}
699694\thinrule
700695
701696\subject{Special Characters}
tests/writer.latex+1
@@ -634,6 +634,7 @@ Animal & Number \\ \hline
634634Dog & 2 \\
635635Cat & 1 \\ \hline
636636\end{tabular}
637+
637638\begin{center}\rule{3in}{0.4pt}\end{center}
638639
639640\section{Special Characters}