Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix truncation of [Citation] list in Cite inside footnotes...

Browse source 
This affected author-in-text citations in footnotes.
It didn't cause problems for the printed output, but for
filters that expected the citation id and other information.

Closes #6890.
This commit is contained in:
John MacFarlane 2020-11-25 09:08:51 -08:00
parent c6f2663a23
commit 815976d537
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Text/Pandoc/Citeproc.hs
View file

@ -527,9 +527,9 @@ deNote (Note bs:rest) =
go [] = []
go (Cite (c:cs) ils : zs)
| citationMode c == AuthorInText
= Cite cs (concatMap (noteAfterComma (needsPeriod zs)) ils) : go zs
= Cite (c:cs) (concatMap (noteAfterComma (needsPeriod zs)) ils) : go zs
| otherwise
= Cite cs (concatMap noteInParens ils) : go zs
= Cite (c:cs) (concatMap noteInParens ils) : go zs
go (x:xs) = x : go xs
needsPeriod [] = True
needsPeriod (Str t:_) = case T.uncons t of

36
test/command/6890.md Normal file
View file

@ -0,0 +1,36 @@
```
% pandoc -t native --citeproc
---
references:
- author:
- family: Früchtel
given: Frank
- family: Budde
given: Wolfgang
- family: Cyprian
given: Gudrun
edition: 3
id: fruchtel-sozialer-2013a
issued: 2013
language: de-DE
publisher: Springer VS
publisher-place: Wiesbaden, Germany
title: "Sozialer Raum und Soziale Arbeit Fieldbook: Methoden und
Techniken"
title-short: Sozialer Raum und Soziale Arbeit Fieldbook
type: book
---
@fruchtel-sozialer-2013a
Some text [^1].
[^1]: @fruchtel-sozialer-2013a
^D
[Para [Cite [Citation {citationId = "fruchtel-sozialer-2013a", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0}] [Str "Fr\252chtel,",Space,Str "Budde,",Space,Str "and",Space,Str "Cyprian",Space,Str "(2013)"]]
,Para [Str "Some",Space,Str "text",Str ".",Note [Para [Cite [Citation {citationId = "fruchtel-sozialer-2013a", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0}] [Str "Fr\252chtel,",Space,Str "Budde,",Space,Str "and",Space,Str "Cyprian",Space,Str "(2013)"]]],Str ""]
,Div ("refs",["references","csl-bib-body","hanging-indent"],[])
[Div ("ref-fruchtel-sozialer-2013a",["csl-entry"],[])
[Para [Str "Fr\252chtel,",Space,Str "Frank,",Space,Str "Wolfgang",Space,Str "Budde,",Space,Str "and",Space,Str "Gudrun",Space,Str "Cyprian.",Space,Str "2013.",Space,Emph [Str "Sozialer",Space,Str "Raum",Space,Str "und",Space,Str "Soziale",Space,Str "Arbeit",Space,Str "Fieldbook:",Space,Str "Methoden",Space,Str "und",Space,Str "Techniken"],Str ".",Space,Str "3rd",Space,Str "ed.",Space,Str "Wiesbaden,",Space,Str "Germany:",Space,Str "Springer",Space,Str "VS."]]]]
```