git.iko.soy/typeable/pandoc
on master help sign in
ConTeXt writer: Use setupcaption to separate style from content.
526762bJohn MacFarlane
data/templates+1−1
compare with master
unifiedsplit

Submodule changed.

src/Text/Pandoc/Writers/ConTeXt.hs+1−1
@@ -130,7 +130,7 @@ blockToConTeXt (Plain lst) = inlineListToConTeXt lst
130-- title beginning with fig: indicates that the image is a figure
130-- title beginning with fig: indicates that the image is a figure
131blockToConTeXt (Para [Image txt (src,'f':'i':'g':':':_)]) = do
131blockToConTeXt (Para [Image txt (src,'f':'i':'g':':':_)]) = do
132 capt <- inlineListToConTeXt txt
132 capt <- inlineListToConTeXt txt
133− return $ blankline $$ "\\placefigure[here,nonumber]" <> braces capt <>
133+ return $ blankline $$ "\\placefigure[here]" <> braces capt <>
134 braces ("\\externalfigure" <> brackets (text src)) <> blankline
134 braces ("\\externalfigure" <> brackets (text src)) <> blankline
135blockToConTeXt (Para lst) = do
135blockToConTeXt (Para lst) = do
136 contents <- inlineListToConTeXt lst
136 contents <- inlineListToConTeXt lst
tests/writer.context+3−1
@@ -30,6 +30,8 @@
30\setupitemize[autointro] % prevent orphan list intro
30\setupitemize[autointro] % prevent orphan list intro
31\setupitemize[indentnext=no]
31\setupitemize[indentnext=no]
32
32
33+\setupcaption[figure][number=no] % don't number figures
34+
33\setupthinrules[width=15em] % width of horizontal rules
35\setupthinrules[width=15em] % width of horizontal rules
34
36
35\setupdelimitedtext
37\setupdelimitedtext
@@ -842,7 +844,7 @@ or here: <http://example.com/>
842
844
843From \quotation{Voyage dans la Lune} by Georges Melies (1902):
845From \quotation{Voyage dans la Lune} by Georges Melies (1902):
844
846
845−\placefigure[here,nonumber]{lalune}{\externalfigure[lalune.jpg]}
847+\placefigure[here]{lalune}{\externalfigure[lalune.jpg]}
846
848
847Here is a movie {\externalfigure[movie.jpg]} icon.
849Here is a movie {\externalfigure[movie.jpg]} icon.
848
850