diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-02-17 08:50:48 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-02-17 08:50:48 -0800 |
| commit | 3480189e8e3edce51351629444e5ed0db2c21eef (patch) | |
| tree | 627a1e951ab88f85819dfd1840fcce861d78469f /tests | |
| parent | e8cd53d1c987a85724f5608370d8ac6039487900 (diff) | |
ICML writer: Better handling of raw blocks and inlines.
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/writer.icml | 133 |
1 files changed, 1 insertions, 132 deletions
diff --git a/tests/writer.icml b/tests/writer.icml index 8922da7ed..968e84941 100644 --- a/tests/writer.icml +++ b/tests/writer.icml @@ -410,11 +410,6 @@ <Properties> <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> </Properties> - </ParagraphStyle> - <ParagraphStyle Self="ParagraphStyle/Rawblock" Name="Rawblock" LeftIndent="0"> - <Properties> - <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn> - </Properties> </ParagraphStyle> </RootParagraphStyleGroup> <RootTableStyleGroup Self="pandoc_table_styles"> @@ -1389,21 +1384,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content>Interpreted markdown in a table:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><table></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><tr></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><td></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle=""> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>This is </Content> @@ -1412,16 +1392,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content>emphasized</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content></td></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><td></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle=""> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>And this is </Content> @@ -1430,26 +1400,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content>strong</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content></td></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content></tr></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content></table></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Here’s a simple block:</Content> @@ -1497,31 +1447,11 @@ These should not be escaped: \$ \\ \> \[ \{</Content> <Content>This should just be an HTML comment:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><!-- Comment --></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Multiline:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><!-- -Blah -Blah ---></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><!-- - This is another comment. ---></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Code block:</Content> @@ -1537,11 +1467,6 @@ Blah <Content>Just plain comment, with trailing spaces on the line:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><!-- foo --></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Code:</Content> @@ -1557,51 +1482,6 @@ Blah <Content>Hr’s:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr class="foo" id="bar" /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr class="foo" id="bar" /></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content><hr class="foo" id="bar"></Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Inline Markup</Content> @@ -1980,9 +1860,7 @@ Blah </CharacterStyleRange><Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList > first" NumberingContinue="false"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>\cite[22-23]{smith.1899}</Content> - </CharacterStyleRange><Br /> + <Br /> </ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> @@ -2097,15 +1975,6 @@ Blah <Content>Here’s a LaTeX table:</Content> </CharacterStyleRange><Br /> </ParagraphStyleRange> -<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock"> - <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> - <Content>\begin{tabular}{|l|l|}\hline -Animal & Number \\ \hline -Dog & 2 \\ -Cat & 1 \\ \hline -\end{tabular}</Content> - </CharacterStyleRange><Br /> -</ParagraphStyleRange> <ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1"> <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle"> <Content>Special Characters</Content> |