git.iko.soy/typeable/pandoc
on master help sign in
Docx reader: combine inlines properly in dropcaps.
45ec035Jesse Rosenthal
src/Text/Pandoc/Readers/Docx.hs+1−1
compare with master
unifiedsplit
@@ -462,7 +462,7 @@ bodyPartToBlocks (Paragraph pPr parparts)
462bodyPartToBlocks (Paragraph pPr parparts) = do
462bodyPartToBlocks (Paragraph pPr parparts) = do
463 ils <- parPartsToInlines parparts >>= (return . normalizeSpaces)
463 ils <- parPartsToInlines parparts >>= (return . normalizeSpaces)
464 dropIls <- gets docxDropCap
464 dropIls <- gets docxDropCap
465− let ils' = dropIls ++ ils
465+ let ils' = reduceList $ dropIls ++ ils
466 if dropCap pPr
466 if dropCap pPr
467 then do modify $ \s -> s { docxDropCap = ils' }
467 then do modify $ \s -> s { docxDropCap = ils' }
468 return []
468 return []
tests/docx.drop_cap.native+2−2
@@ -1,4 +1,4 @@
1−[Para [Str "D",Str "rop",Space,Str "cap."]
1+[Para [Str "Drop",Space,Str "cap."]
2,Para [Str "Next",Space,Str "paragraph."]
2,Para [Str "Next",Space,Str "paragraph."]
3−,Para [Str "D",Str "rop",Space,Str "cap",Space,Str "in",Space,Str "margin."]
3+,Para [Str "Drop",Space,Str "cap",Space,Str "in",Space,Str "margin."]
4,Para [Str "Drop",Space,Str "cap",Space,Str "(not",Space,Str "really)."]]
4,Para [Str "Drop",Space,Str "cap",Space,Str "(not",Space,Str "really)."]]