@@ -71,6 +71,8 @@ linkName = "Link"
72-- block element names (appear in InDesign's paragraph styles pane)
72-- block element names (appear in InDesign's paragraph styles pane)
73paragraphName :: String
73paragraphName :: String
75+imgCaptionName :: String
74codeBlockName :: String
76codeBlockName :: String
75blockQuoteName :: String
77blockQuoteName :: String
76orderedListName :: String
78orderedListName :: String
@@ -94,6 +96,8 @@ subListParName :: String
94footnoteName :: String
96footnoteName :: String
95citeName :: String
97citeName :: String
96paragraphName = "Paragraph"
98paragraphName = "Paragraph"
100+imgCaptionName = "Caption"
97codeBlockName = "CodeBlock"
101codeBlockName = "CodeBlock"
98blockQuoteName = "Blockquote"
102blockQuoteName = "Blockquote"
99orderedListName = "NumList"
103orderedListName = "NumList"
@@ -285,6 +289,11 @@ blocksToICML opts style lst = vcat `fmap` mapM (blockToICML opts style) lst
285-- | Convert a Pandoc block element to ICML.
289-- | Convert a Pandoc block element to ICML.
286blockToICML :: WriterOptions -> Style -> Block -> WS Doc
290blockToICML :: WriterOptions -> Style -> Block -> WS Doc
287blockToICML opts style (Plain lst) = parStyle opts style lst
291blockToICML opts style (Plain lst) = parStyle opts style lst
292+-- title beginning with fig: indicates that the image is a figure
293+blockToICML opts style (Para img@[Image _ txt (_,'f':'i':'g':':':_)]) = do
294+ figure <- parStyle opts (figureName:style) img
295+ caption <- parStyle opts (imgCaptionName:style) txt
296+ return $ figure $$ caption
288blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst
297blockToICML opts style (Para lst) = parStyle opts (paragraphName:style) lst
289blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]
298blockToICML opts style (CodeBlock _ str) = parStyle opts (codeBlockName:style) $ [Str str]
290blockToICML _ _ (RawBlock f str)
299blockToICML _ _ (RawBlock f str)
@@ -434,7 +443,7 @@ inlineToICML opts style (Link _ lst (url, title)) = do
434 cont = inTags True "HyperlinkTextSource"
443 cont = inTags True "HyperlinkTextSource"
435 [("Self","htss-"++show ident), ("Name",title), ("Hidden","false")] content
444 [("Self","htss-"++show ident), ("Name",title), ("Hidden","false")] content
436 in (cont, newst)
445 in (cont, newst)
437−inlineToICML opts style (Image attr alt target) = imageICML opts style attr alt target
446+inlineToICML opts style (Image attr _ target) = imageICML opts style attr target
438inlineToICML opts style (Note lst) = footnoteToICML opts style lst
447inlineToICML opts style (Note lst) = footnoteToICML opts style lst
439inlineToICML opts style (Span _ lst) = inlinesToICML opts style lst
448inlineToICML opts style (Span _ lst) = inlinesToICML opts style lst
@@ -513,8 +522,8 @@ styleToStrAttr style =
513 in (stlStr, attrs)
522 in (stlStr, attrs)
515-- | Assemble an ICML Image.
524-- | Assemble an ICML Image.
516−imageICML :: WriterOptions -> Style -> Attr -> [Inline] -> Target -> WS Doc
525+imageICML :: WriterOptions -> Style -> Attr -> Target -> WS Doc
517−imageICML opts style attr _ (src, _) = do
526+imageICML opts style attr (src, _) = do
518 res <- liftIO $ fetchItem (writerSourceURL opts) src
527 res <- liftIO $ fetchItem (writerSourceURL opts) src
519 imgS <- case res of
528 imgS <- case res of
520 Left (_) -> do
529 Left (_) -> do