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

Docx zotero/mendeley/endnote: add comma before locator in suffix.

Browse source
This commit is contained in:
John MacFarlane 2022-02-04 23:28:46 -08:00
parent f48890eff0
commit b7f1c97b6a
3 changed files with 6 additions and 6 deletions

6
src/Text/Pandoc/Readers/Docx.hs
View file

@ -503,9 +503,9 @@ handleCitation citation = do
, citationPrefix = maybe [] (toList . text) $ , citationPrefix = maybe [] (toList . text) $
Citeproc.citationItemPrefix item Citeproc.citationItemPrefix item
, citationSuffix = (toList . text) $ , citationSuffix = (toList . text) $
maybe mempty (\x -> maybe mempty (\x -> ", " <>
fromMaybe "" (Citeproc.citationItemLabel item) maybe "" (<>" ") (Citeproc.citationItemLabel item)
<> " " <> x <> " ") <> x <> " ")
(Citeproc.citationItemLocator item) (Citeproc.citationItemLocator item)
<> fromMaybe mempty (Citeproc.citationItemSuffix item) <> fromMaybe mempty (Citeproc.citationItemSuffix item)
, citationMode = NormalCitation -- TODO for now , citationMode = NormalCitation -- TODO for now

4
test/docx/mendeley_citations_plus.native
View file

@ -268,7 +268,7 @@ Pandoc
{ citationId = "ITEM-1" { citationId = "ITEM-1"
, citationPrefix = [ Str "prefix" ] , citationPrefix = [ Str "prefix" ]
, citationSuffix = , citationSuffix =
[ Space , Str "123" , Space , Str "suffix" ] [ Str ",", Space , Str "123" , Space , Str "suffix" ]
, citationMode = NormalCitation , citationMode = NormalCitation
, citationNoteNum = 0 , citationNoteNum = 0
, citationHash = 0 , citationHash = 0
@ -302,7 +302,7 @@ Pandoc
{ citationId = "ITEM-1" { citationId = "ITEM-1"
, citationPrefix = [ Str "prefix" ] , citationPrefix = [ Str "prefix" ]
, citationSuffix = , citationSuffix =
[ Space , Str "10-20" , Space , Str "suffix" ] [ Str ",", Space , Str "10-20" , Space , Str "suffix" ]
, citationMode = NormalCitation , citationMode = NormalCitation
, citationNoteNum = 0 , citationNoteNum = 0
, citationHash = 0 , citationHash = 0

2
test/docx/zotero_citations_plus.native
View file

@ -412,7 +412,7 @@ Pandoc
{ citationId = "10" { citationId = "10"
, citationPrefix = [ Str "prefix" ] , citationPrefix = [ Str "prefix" ]
, citationSuffix = , citationSuffix =
[ Space , Str "2" , Space , Str "suffix" ] [ Str ",", Space , Str "2" , Space , Str "suffix" ]
, citationMode = NormalCitation , citationMode = NormalCitation
, citationNoteNum = 0 , citationNoteNum = 0
, citationHash = 0 , citationHash = 0