git.iko.soy/typeable/pandoc
on master help sign in
Docx Reader: Trim line breaks from the beginning and end of Section

Headers. We might also want to do this elsewhere (for pars, for example).

commitdca55630e641905d5447b9468d0953227f9e704a authorJesse Rosenthal <jrosenthal@jhu.edu> dateTue 12 Aug 2014, 23:40 (12 years ago) parent378a795
2 files changed+11−3
compare with master
unifiedsplit
data/templates+1−1 src/Text/Pandoc/Readers/Docx.hs+10−2
data/templates+1−1

Submodule changed.

src/Text/Pandoc/Readers/Docx.hs+10−2
@@ -455,6 +455,13 @@ isHeaderContainer :: Container Block -> Bool
455455isHeaderContainer (Container f) | Header _ _ _ <- f [] = True
456456isHeaderContainer _ = False
457457
458+trimLineBreaks :: [Inline] -> [Inline]
459+trimLineBreaks [] = []
460+trimLineBreaks (LineBreak : ils) = trimLineBreaks ils
461+trimLineBreaks ils
462+ | (LineBreak : ils') <- reverse ils = trimLineBreaks (reverse ils')
463+trimLineBreaks ils = ils
464+
458465bodyPartToBlocks :: BodyPart -> DocxContext [Block]
459466bodyPartToBlocks (Paragraph pPr parparts)
460467 | any isBlockCodeContainer (parStyleToContainers pPr) =
@@ -467,8 +474,9 @@ bodyPartToBlocks (Paragraph pPr parparts)
467474 [CodeBlock ("", [], []) (concatMap parPartToString parparts)]
468475bodyPartToBlocks (Paragraph pPr parparts)
469476 | any isHeaderContainer (parStyleToContainers pPr) = do
470− ils <- normalizeSpaces <$> local (\s -> s{docxInHeaderBlock = True})
471− (parPartsToInlines parparts)
477+ ils <- (trimLineBreaks . normalizeSpaces) <$>
478+ local (\s -> s{docxInHeaderBlock = True})
479+ (parPartsToInlines parparts)
472480 let (Container hdrFun) = head $ filter isHeaderContainer (parStyleToContainers pPr)
473481 Header n attr _ = hdrFun []
474482 hdr <- makeHeaderAnchor $ Header n attr ils