diff options
| author | Ethan Riley <riley787cmplex@gmail.com> | 2020-02-14 16:44:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 08:44:40 -0800 |
| commit | daf770c1e9b8427611c10904bc4b80110556ea4d (patch) | |
| tree | 479bfa9e55752e5c752b055bfd4defd1c41b68f0 | |
| parent | 652ed0b82cd7095f418859356d7e5f8ada65eb49 (diff) | |
| download | pandoc-daf770c1e9b8427611c10904bc4b80110556ea4d.tar.gz | |
Fixes: group biblatex citations even with prefix and suffix (#6058)
Closes #5849. Previously biblatex citations were only grouped if
there was no prefix. This patch allows them to be grouped in
subgroups split by prefixes and suffixes, which allows better citation
sorting.
| -rw-r--r-- | src/Text/Pandoc/Writers/LaTeX.hs | 67 | ||||
| -rw-r--r-- | test/command/5849-prefix.md | 32 |
2 files changed, 74 insertions, 25 deletions
diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index cf7762ef6..33ba5cb64 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -1421,24 +1421,35 @@ citeCommand c p s k = do args <- citeArguments p s k return $ literal ("\\" <> c) <> args +type Prefix = [Inline] +type Suffix = [Inline] +type CiteId = Text +data CiteGroup = CiteGroup Prefix Suffix [CiteId] + +citeArgumentsList :: PandocMonad m + => CiteGroup -> LW m (Doc Text) +citeArgumentsList (CiteGroup _ _ []) = return empty +citeArgumentsList (CiteGroup pfxs sfxs ids) = do + pdoc <- inlineListToLaTeX pfxs + sdoc <- inlineListToLaTeX sfxs' + return $ (optargs pdoc sdoc) <> + (braces (literal (T.intercalate "," (reverse ids)))) + where sfxs' = stripLocatorBraces $ case sfxs of + (Str t : r) -> case T.uncons t of + Just (x, xs) + | T.null xs + , isPunctuation x -> dropWhile (== Space) r + | isPunctuation x -> Str xs : r + _ -> sfxs + _ -> sfxs + optargs pdoc sdoc = case (isEmpty pdoc, isEmpty sdoc) of + (True, True ) -> empty + (True, False) -> brackets sdoc + (_ , _ ) -> brackets pdoc <> brackets sdoc + citeArguments :: PandocMonad m => [Inline] -> [Inline] -> Text -> LW m (Doc Text) -citeArguments p s k = do - let s' = stripLocatorBraces $ case s of - (Str t : r) -> case T.uncons t of - Just (x, xs) - | T.null xs - , isPunctuation x -> dropWhile (== Space) r - | isPunctuation x -> Str xs : r - _ -> s - _ -> s - pdoc <- inlineListToLaTeX p - sdoc <- inlineListToLaTeX s' - let optargs = case (isEmpty pdoc, isEmpty sdoc) of - (True, True ) -> empty - (True, False) -> brackets sdoc - (_ , _ ) -> brackets pdoc <> brackets sdoc - return $ optargs <> braces (literal k) +citeArguments p s k = citeArgumentsList (CiteGroup p s [k]) -- strip off {} used to define locator in pandoc-citeproc; see #5722 stripLocatorBraces :: [Inline] -> [Inline] @@ -1470,18 +1481,24 @@ citationsToBiblatex (c:cs) NormalCitation -> "\\autocite" return $ text cmd <> braces (literal (T.intercalate "," (map citationId (c:cs)))) - | otherwise = do - let cmd = case citationMode c of + | otherwise + = do + let cmd = case citationMode c of SuppressAuthor -> "\\autocites*" AuthorInText -> "\\textcites" NormalCitation -> "\\autocites" - let convertOne Citation { citationId = k - , citationPrefix = p - , citationSuffix = s - } - = citeArguments p s k - args <- mapM convertOne (c:cs) - return $ text cmd <> foldl' (<>) empty args + + groups <- mapM citeArgumentsList (reverse (foldl' grouper [] (c:cs))) + + return $ text cmd <> (mconcat groups) + + where grouper prev cit = case prev of + ((CiteGroup oPfx oSfx ids):rest) + | null oSfx && null pfx -> (CiteGroup oPfx sfx (cid:ids)):rest + _ -> (CiteGroup pfx sfx [cid]):prev + where pfx = citationPrefix cit + sfx = citationSuffix cit + cid = citationId cit citationsToBiblatex _ = return empty diff --git a/test/command/5849-prefix.md b/test/command/5849-prefix.md new file mode 100644 index 000000000..61af8f03a --- /dev/null +++ b/test/command/5849-prefix.md @@ -0,0 +1,32 @@ +``` +% pandoc -t latex --biblatex +[e.g. @a1;@a2;@a3; but also @b1;@b2;@b3] +^D +\autocites[e.g.~][]{a1,a2,a3}[but also][]{b1,b2,b3} +``` +``` +% pandoc -t latex --biblatex +[e.g. @a1; e.g. @a2;@a3; but also @b1;@b2;but also @b3] +^D +\autocites[e.g.~][]{a1}[e.g.~][]{a2,a3}[but also][]{b1,b2}[but +also][]{b3} +``` +``` +% pandoc -t latex --biblatex +[e.g. @a1, ch.3 and elsewhere;@a2;@a3; but also @a4;@a5] +^D +\autocites[e.g.~][ch.3 and elsewhere]{a1}{a2,a3}[but also][]{a4,a5} +``` +``` +% pandoc -t latex --biblatex +[e.g. @a1;@a2, ch.3 and elsewhere;@a3; but also @a4;@a5] +^D +\autocites[e.g.~][ch.3 and elsewhere]{a1,a2}{a3}[but also][]{a4,a5} +``` +``` +% pandoc -t latex --biblatex +[e.g. @a1, blah;@a2, ch.3 and elsewhere;@a3; but also @b4;@b5] +^D +\autocites[e.g.~][blah]{a1}[ch.3 and elsewhere]{a2}{a3}[but +also][]{b4,b5} +``` |