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

ICML writer: Better handling of raw blocks and inlines.

Browse source 
Previously these were always escaped and printed verbatim.
Now they are ignored unless the format is "icml", in which
case they are passed through unescaped.

Closes #1951.
This commit is contained in:
John MacFarlane 2015-02-17 08:50:48 -08:00
parent e8cd53d1c9
commit 3480189e8e
2 changed files with 7 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Text/Pandoc/Writers/ICML.hs
View file

@ -70,7 +70,6 @@ linkName = "Link"
-- block element names (appear in InDesign's paragraph styles pane) -- block element names (appear in InDesign's paragraph styles pane)
paragraphName :: String paragraphName :: String
codeBlockName :: String codeBlockName :: String
rawBlockName :: String
blockQuoteName :: String blockQuoteName :: String
orderedListName :: String orderedListName :: String
bulletListName :: String bulletListName :: String
@ -93,7 +92,6 @@ subListParName :: String
footnoteName :: String footnoteName :: String
paragraphName = "Paragraph" paragraphName = "Paragraph"
codeBlockName = "CodeBlock" codeBlockName = "CodeBlock"
rawBlockName = "Rawblock"
blockQuoteName = "Blockquote" blockQuoteName = "Blockquote"
orderedListName = "NumList" orderedListName = "NumList"
bulletListName = "BulList" bulletListName = "BulList"
@ -278,7 +276,9 @@ blockToICML :: WriterOptions -> Style -> Block -> WS Doc
blockToICML opts style (Plain lst) = parStyle opts style lst blockToICML opts style (Plain lst) = parStyle opts style lst
blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst
blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str] blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]
blockToICML opts style (RawBlock _ str) = parStyle opts (rawBlockName:style) $ [Str str] blockToICML _ _ (RawBlock f str)
| f == Format "icml" = return $ text str
| otherwise = return empty
blockToICML opts style (BlockQuote blocks) = blocksToICML opts (blockQuoteName:style) blocks blockToICML opts style (BlockQuote blocks) = blocksToICML opts (blockQuoteName:style) blocks
blockToICML opts style (OrderedList attribs lst) = listItemsToICML opts orderedListName style (Just attribs) lst blockToICML opts style (OrderedList attribs lst) = listItemsToICML opts orderedListName style (Just attribs) lst
blockToICML opts style (BulletList lst) = listItemsToICML opts bulletListName style Nothing lst blockToICML opts style (BulletList lst) = listItemsToICML opts bulletListName style Nothing lst
@ -404,7 +404,9 @@ inlineToICML _ style (Code _ str) = charStyle (codeName:style) $ text $ escap
inlineToICML _ style Space = charStyle style space inlineToICML _ style Space = charStyle style space
inlineToICML _ style LineBreak = charStyle style $ text lineSeparator inlineToICML _ style LineBreak = charStyle style $ text lineSeparator
inlineToICML _ style (Math _ str) = charStyle style $ text $ escapeStringForXML str --InDesign doesn't really do math inlineToICML _ style (Math _ str) = charStyle style $ text $ escapeStringForXML str --InDesign doesn't really do math
inlineToICML _ style (RawInline _ str) = charStyle style $ text $ escapeStringForXML str inlineToICML _ _ (RawInline f str)
| f == Format "icml" = return $ text str
| otherwise = return empty
inlineToICML opts style (Link lst (url, title)) = do inlineToICML opts style (Link lst (url, title)) = do
content <- inlinesToICML opts (linkName:style) lst content <- inlinesToICML opts (linkName:style) lst
state $ \st -> state $ \st ->

133
tests/writer.icml
View file

@ -411,11 +411,6 @@
<BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>
</Properties> </Properties>
</ParagraphStyle> </ParagraphStyle>
<ParagraphStyle Self="ParagraphStyle/Rawblock" Name="Rawblock" LeftIndent="0">
<Properties>
<BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>
</Properties>
</ParagraphStyle>
</RootParagraphStyleGroup> </RootParagraphStyleGroup>
<RootTableStyleGroup Self="pandoc_table_styles"> <RootTableStyleGroup Self="pandoc_table_styles">
<TableStyle Self="TableStyle/Table" Name="Table" /> <TableStyle Self="TableStyle/Table" Name="Table" />
@ -1389,21 +1384,6 @@ These should not be escaped: \$ \\ \&gt; \[ \{</Content>
<Content>Interpreted markdown in a table:</Content> <Content>Interpreted markdown in a table:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;table&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;tr&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;td&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle=""> <ParagraphStyleRange AppliedParagraphStyle="">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>This is </Content> <Content>This is </Content>
@ -1412,16 +1392,6 @@ These should not be escaped: \$ \\ \&gt; \[ \{</Content>
<Content>emphasized</Content> <Content>emphasized</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;/td&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;td&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle=""> <ParagraphStyleRange AppliedParagraphStyle="">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>And this is </Content> <Content>And this is </Content>
@ -1430,26 +1400,6 @@ These should not be escaped: \$ \\ \&gt; \[ \{</Content>
<Content>strong</Content> <Content>strong</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;/td&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;/tr&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;/table&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;script type=&quot;text/javascript&quot;&gt;document.write('This *should not* be interpreted as markdown');&lt;/script&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Here’s a simple block:</Content> <Content>Here’s a simple block:</Content>
@ -1497,31 +1447,11 @@ These should not be escaped: \$ \\ \&gt; \[ \{</Content>
<Content>This should just be an HTML comment:</Content> <Content>This should just be an HTML comment:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;!-- Comment --&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Multiline:</Content> <Content>Multiline:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;!--
Blah
Blah
--&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;!--
This is another comment.
--&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Code block:</Content> <Content>Code block:</Content>
@ -1537,11 +1467,6 @@ Blah
<Content>Just plain comment, with trailing spaces on the line:</Content> <Content>Just plain comment, with trailing spaces on the line:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;!-- foo --&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Code:</Content> <Content>Code:</Content>
@ -1557,51 +1482,6 @@ Blah
<Content>Hr’s:</Content> <Content>Hr’s:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot; /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot; /&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot;&gt;</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Inline Markup</Content> <Content>Inline Markup</Content>
@ -1980,9 +1860,7 @@ Blah
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList &gt; first" NumberingContinue="false"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList &gt; first" NumberingContinue="false">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Br />
<Content>\cite[22-23]{smith.1899}</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
@ -2097,15 +1975,6 @@ Blah
<Content>Here’s a LaTeX table:</Content> <Content>Here’s a LaTeX table:</Content>
</CharacterStyleRange><Br /> </CharacterStyleRange><Br />
</ParagraphStyleRange> </ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>\begin{tabular}{|l|l|}\hline
Animal &amp; Number \\ \hline
Dog &amp; 2 \\
Cat &amp; 1 \\ \hline
\end{tabular}</Content>
</CharacterStyleRange><Br />
</ParagraphStyleRange>
<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1"> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">
<CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">
<Content>Special Characters</Content> <Content>Special Characters</Content>