7a40fa8 · typeable/pandoc

git.iko.soy/typeable/pandoc

Biblio: Make sure mvPunc and deNote run on metadata too.

This fixed a bug with notes on titles using footnote styles.

commit7a40fa8c08996cb94e7ff3cfafd8ede84972ce70 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 8 Jan 2013, 17:23 (14 years ago) parentd1ebde0

1 file changed+3−4

unifiedsplit

src/Text/Pandoc/Biblio.hs+3−4

@@ -53,9 +53,8 @@ processBiblio (Just style) r p =

5353 map (map toCslCite) grps)

5454 cits_map = M.fromList $ zip grps (citations result)

5555 biblioList = map (renderPandoc' style) (bibliography result)

56− Pandoc m b = bottomUp (processCite style cits_map) p'

57− b' = bottomUp mvPunct $ deNote b

58− in Pandoc m $ b' ++ biblioList

56+ Pandoc m b = bottomUp mvPunct . deNote . bottomUp (processCite style cits_map) $ p'

57+ in Pandoc m $ b ++ biblioList

5958

6059-- | Substitute 'Cite' elements with formatted citations.

6160processCite :: Style -> M.Map [Citation] [FormattedOutput] -> Inline -> Inline

@@ -89,7 +88,7 @@ sanitize :: [Inline] -> [Inline]

8988sanitize xs | endWithPunct xs = toCapital xs

9089 | otherwise = toCapital (xs ++ [Str "."])

9190

92−deNote :: [Block] -> [Block]

91+deNote :: Pandoc -> Pandoc

9392deNote = topDown go

9493 where go (Note [Para xs]) = Note $ bottomUp go' [Para $ sanitize xs]

9594 go (Note xs) = Note $ bottomUp go' xs