diff options
| author | Jesse Rosenthal <jrosenthal@jhu.edu> | 2014-08-11 23:30:12 -0400 |
|---|---|---|
| committer | Jesse Rosenthal <jrosenthal@jhu.edu> | 2014-08-11 23:31:16 -0400 |
| commit | 45ec035e93ec0c32f9fb7d7f2f99ca17de73ebf9 (patch) | |
| tree | 4a9f2b07c691c2af7ffa119c56b1ec8478b0c4f4 | |
| parent | 0808449547a2ec3469dbcc82c1755d895c1057e5 (diff) | |
| download | pandoc-45ec035e93ec0c32f9fb7d7f2f99ca17de73ebf9.tar.gz | |
Docx reader: combine inlines properly in dropcaps.
Make sure that adjacent inlines are combined properly in dropcaps. This
updates the test results as well.
| -rw-r--r-- | src/Text/Pandoc/Readers/Docx.hs | 2 | ||||
| -rw-r--r-- | tests/docx.drop_cap.native | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs index d6d5f317c..c856ca30a 100644 --- a/src/Text/Pandoc/Readers/Docx.hs +++ b/src/Text/Pandoc/Readers/Docx.hs @@ -462,7 +462,7 @@ bodyPartToBlocks (Paragraph pPr parparts) bodyPartToBlocks (Paragraph pPr parparts) = do ils <- parPartsToInlines parparts >>= (return . normalizeSpaces) dropIls <- gets docxDropCap - let ils' = dropIls ++ ils + let ils' = reduceList $ dropIls ++ ils if dropCap pPr then do modify $ \s -> s { docxDropCap = ils' } return [] diff --git a/tests/docx.drop_cap.native b/tests/docx.drop_cap.native index e6eb29de7..d361cfb0b 100644 --- a/tests/docx.drop_cap.native +++ b/tests/docx.drop_cap.native @@ -1,4 +1,4 @@ -[Para [Str "D",Str "rop",Space,Str "cap."] +[Para [Str "Drop",Space,Str "cap."] ,Para [Str "Next",Space,Str "paragraph."] -,Para [Str "D",Str "rop",Space,Str "cap",Space,Str "in",Space,Str "margin."] +,Para [Str "Drop",Space,Str "cap",Space,Str "in",Space,Str "margin."] ,Para [Str "Drop",Space,Str "cap",Space,Str "(not",Space,Str "really)."]] |