3480189 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

ICML writer: Better handling of raw blocks and inlines.

3480189John MacFarlane12 years ago

src/Text/Pandoc/Writers/ICML.hs+6−4

compare with master

unifiedsplit

@@ -70,7 +70,6 @@ linkName = "Link"

70-- block element names (appear in InDesign's paragraph styles pane)

71paragraphName :: String

72codeBlockName :: String

73−rawBlockName :: String

74blockQuoteName :: String

73blockQuoteName :: String

75orderedListName :: String

74orderedListName :: String

76bulletListName :: String

75bulletListName :: String

@@ -93,7 +92,6 @@ subListParName :: String

93footnoteName :: String

92footnoteName :: String

94paragraphName = "Paragraph"

93paragraphName = "Paragraph"

95codeBlockName = "CodeBlock"

94codeBlockName = "CodeBlock"

96−rawBlockName = "Rawblock"

97blockQuoteName = "Blockquote"

95blockQuoteName = "Blockquote"

98orderedListName = "NumList"

96orderedListName = "NumList"

99bulletListName = "BulList"

97bulletListName = "BulList"

@@ -278,7 +276,9 @@ blockToICML :: WriterOptions -> Style -> Block -> WS Doc

278blockToICML opts style (Plain lst) = parStyle opts style lst

276blockToICML opts style (Plain lst) = parStyle opts style lst

279blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst

277blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst

280blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]

278blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]

281−blockToICML opts style (RawBlock _ str) = parStyle opts (rawBlockName:style) $ [Str str]

279+blockToICML _ _ (RawBlock f str)

280+ | f == Format "icml" = return $ text str

281+ | otherwise = return empty

282blockToICML opts style (BlockQuote blocks) = blocksToICML opts (blockQuoteName:style) blocks

283blockToICML opts style (OrderedList attribs lst) = listItemsToICML opts orderedListName style (Just attribs) lst

284blockToICML opts style (BulletList lst) = listItemsToICML opts bulletListName style Nothing lst

@@ -404,7 +404,9 @@ inlineToICML _ style (Code _ str) = charStyle (codeName:style) $ text $ escap

404inlineToICML _ style Space = charStyle style space

405inlineToICML _ style LineBreak = charStyle style $ text lineSeparator

406inlineToICML _ style (Math _ str) = charStyle style $ text $ escapeStringForXML str --InDesign doesn't really do math

407−inlineToICML _ style (RawInline _ str) = charStyle style $ text $ escapeStringForXML str

407+inlineToICML _ _ (RawInline f str)

408+ | f == Format "icml" = return $ text str

409+ | otherwise = return empty

408inlineToICML opts style (Link lst (url, title)) = do

410inlineToICML opts style (Link lst (url, title)) = do

409 content <- inlinesToICML opts (linkName:style) lst

411 content <- inlinesToICML opts (linkName:style) lst

410 state $ \st ->

412 state $ \st ->

tests/writer.icml+1−132

@@ -410,11 +410,6 @@

410 <Properties>

411 <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>

412 </Properties>

413− </ParagraphStyle>

414− <ParagraphStyle Self="ParagraphStyle/Rawblock" Name="Rawblock" LeftIndent="0">

415− <Properties>

416− <BasedOn type="object">$ID/NormalParagraphStyle</BasedOn>

417− </Properties>

418 </ParagraphStyle>

413 </ParagraphStyle>

419 </RootParagraphStyleGroup>

414 </RootParagraphStyleGroup>

420 <RootTableStyleGroup Self="pandoc_table_styles">

415 <RootTableStyleGroup Self="pandoc_table_styles">

@@ -1389,21 +1384,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content>

1389 <Content>Interpreted markdown in a table:</Content>

1384 <Content>Interpreted markdown in a table:</Content>

1390 </CharacterStyleRange>

1385 </CharacterStyleRange>

1391</ParagraphStyleRange>

1386</ParagraphStyleRange>

1392−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1393− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1394− <Content><table></Content>

1395− </CharacterStyleRange>

1396−</ParagraphStyleRange>

1397−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1398− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1399− <Content><tr></Content>

1400− </CharacterStyleRange>

1401−</ParagraphStyleRange>

1402−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1403− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1404− <Content><td></Content>

1405− </CharacterStyleRange>

1406−</ParagraphStyleRange>

1407<ParagraphStyleRange AppliedParagraphStyle="">

1387<ParagraphStyleRange AppliedParagraphStyle="">

1408 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1388 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1409 <Content>This is </Content>

1389 <Content>This is </Content>

@@ -1412,16 +1392,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content>

1412 <Content>emphasized</Content>

1392 <Content>emphasized</Content>

1413 </CharacterStyleRange>

1393 </CharacterStyleRange>

1414</ParagraphStyleRange>

1394</ParagraphStyleRange>

1415−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1416− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1417− <Content></td></Content>

1418− </CharacterStyleRange>

1419−</ParagraphStyleRange>

1420−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1421− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1422− <Content><td></Content>

1423− </CharacterStyleRange>

1424−</ParagraphStyleRange>

1425<ParagraphStyleRange AppliedParagraphStyle="">

1395<ParagraphStyleRange AppliedParagraphStyle="">

1426 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1396 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1427 <Content>And this is </Content>

1397 <Content>And this is </Content>

@@ -1430,26 +1400,6 @@ These should not be escaped: \$ \\ \> \[ \{</Content>

1430 <Content>strong</Content>

1400 <Content>strong</Content>

1431 </CharacterStyleRange>

1401 </CharacterStyleRange>

1432</ParagraphStyleRange>

1402</ParagraphStyleRange>

1433−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1434− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1435− <Content></td></Content>

1436− </CharacterStyleRange>

1437−</ParagraphStyleRange>

1438−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1439− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1440− <Content></tr></Content>

1441− </CharacterStyleRange>

1442−</ParagraphStyleRange>

1443−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1444− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1445− <Content></table></Content>

1446− </CharacterStyleRange>

1447−</ParagraphStyleRange>

1448−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1449− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1450− <Content><script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script></Content>

1451− </CharacterStyleRange>

1452−</ParagraphStyleRange>

1453<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1403<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1454 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1404 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1455 <Content>Here’s a simple block:</Content>

1405 <Content>Here’s a simple block:</Content>

@@ -1497,31 +1447,11 @@ These should not be escaped: \$ \\ \> \[ \{</Content>

1497 <Content>This should just be an HTML comment:</Content>

1447 <Content>This should just be an HTML comment:</Content>

1498 </CharacterStyleRange>

1448 </CharacterStyleRange>

1499</ParagraphStyleRange>

1449</ParagraphStyleRange>

1500−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1501− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1502− <Content></Content>

1503− </CharacterStyleRange>

1504−</ParagraphStyleRange>

1505<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1450<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1506 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1451 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1507 <Content>Multiline:</Content>

1452 <Content>Multiline:</Content>

1508 </CharacterStyleRange>

1453 </CharacterStyleRange>

1509</ParagraphStyleRange>

1454</ParagraphStyleRange>

1510−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1511− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1512− <Content><!--

1513−Blah

1514−Blah

1515−--></Content>

1516− </CharacterStyleRange>

1517−</ParagraphStyleRange>

1518−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1519− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1520− <Content><!--

1521− This is another comment.

1522−--></Content>

1523− </CharacterStyleRange>

1524−</ParagraphStyleRange>

1525<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1455<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1526 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1456 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1527 <Content>Code block:</Content>

1457 <Content>Code block:</Content>

@@ -1537,11 +1467,6 @@ Blah

1537 <Content>Just plain comment, with trailing spaces on the line:</Content>

1467 <Content>Just plain comment, with trailing spaces on the line:</Content>

1538 </CharacterStyleRange>

1468 </CharacterStyleRange>

1539</ParagraphStyleRange>

1469</ParagraphStyleRange>

1540−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1541− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1542− <Content></Content>

1543− </CharacterStyleRange>

1544−</ParagraphStyleRange>

1545<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1470<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Paragraph">

1546 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1471 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1547 <Content>Code:</Content>

1472 <Content>Code:</Content>

@@ -1557,51 +1482,6 @@ Blah

1557 <Content>Hr’s:</Content>

1482 <Content>Hr’s:</Content>

1558 </CharacterStyleRange>

1483 </CharacterStyleRange>

1559</ParagraphStyleRange>

1484</ParagraphStyleRange>

1560−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1561− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1562− <Content><hr></Content>

1563− </CharacterStyleRange>

1564−</ParagraphStyleRange>

1565−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1566− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1567− <Content><hr /></Content>

1568− </CharacterStyleRange>

1569−</ParagraphStyleRange>

1570−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1571− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1572− <Content><hr /></Content>

1573− </CharacterStyleRange>

1574−</ParagraphStyleRange>

1575−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1576− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1577− <Content><hr></Content>

1578− </CharacterStyleRange>

1579−</ParagraphStyleRange>

1580−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1581− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1582− <Content><hr /></Content>

1583− </CharacterStyleRange>

1584−</ParagraphStyleRange>

1585−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1586− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1587− <Content><hr /></Content>

1588− </CharacterStyleRange>

1589−</ParagraphStyleRange>

1590−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1591− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1592− <Content><hr class="foo" id="bar" /></Content>

1593− </CharacterStyleRange>

1594−</ParagraphStyleRange>

1595−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1596− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1597− <Content><hr class="foo" id="bar" /></Content>

1598− </CharacterStyleRange>

1599−</ParagraphStyleRange>

1600−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

1601− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1602− <Content><hr class="foo" id="bar"></Content>

1603− </CharacterStyleRange>

1604−</ParagraphStyleRange>

1605<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">

1485<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">

1606 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1486 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1607 <Content>Inline Markup</Content>

1487 <Content>Inline Markup</Content>

@@ -1980,9 +1860,7 @@ Blah

1980 </CharacterStyleRange>

1860 </CharacterStyleRange>

1981</ParagraphStyleRange>

1861</ParagraphStyleRange>

1982<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList > first" NumberingContinue="false">

1862<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList > first" NumberingContinue="false">

1983− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1863+

1984− <Content>\cite[22-23]{smith.1899}</Content>

1985− </CharacterStyleRange>

1986</ParagraphStyleRange>

1864</ParagraphStyleRange>

1987<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList">

1865<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/BulList">

1988 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1866 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

@@ -2097,15 +1975,6 @@ Blah

2097 <Content>Here’s a LaTeX table:</Content>

1975 <Content>Here’s a LaTeX table:</Content>

2098 </CharacterStyleRange>

1976 </CharacterStyleRange>

2099</ParagraphStyleRange>

1977</ParagraphStyleRange>

2100−<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Rawblock">

2101− <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

2102− <Content>\begin{tabular}{|l|l|}\hline

2103−Animal & Number \\ \hline

2104−Dog & 2 \\

2105−Cat & 1 \\ \hline

2106−\end{tabular}</Content>

2107− </CharacterStyleRange>

2108−</ParagraphStyleRange>

2109<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">

1978<ParagraphStyleRange AppliedParagraphStyle="ParagraphStyle/Header1">

2110 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

1979 <CharacterStyleRange AppliedCharacterStyle="$ID/NormalCharacterStyle">

2111 <Content>Special Characters</Content>

1980 <Content>Special Characters</Content>