diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # citeproc changelog +## 0.8.1 + + * In Pandoc and CslJson CaseTransform, group punctuation in clusters (#127). + + * Fix sorting on dates (#126). Previously this broke for some styles, + e.g. apa.csl, which styles dates as MM/DD/YYYY, and would lead to + incorrect sorting of dates with months and/or days. + + * Add citation-key variable from citeId. This is a new addition in CSL 1.0.2. + + * Update locales from upstream. + + * Raise an error if multiple layout elements are present (#120). + + * Fix two test cases. They had illegal bibliography elements with + no layout children. + + * If there are multiple layout elements, only use the last one. + This can happen with CSL-M styles. The last layout should be + locale-unspecific. This change will prevent us from emitting + doubled citations or bibliographic references (see #120), + allowing more graceful handling of CSL-M styles, even though we + don't support CSL-M. + ## 0.8.0.2 * Fix missing locator after collapsing and grouping with year diff --git a/citeproc.cabal b/citeproc.cabal --- a/citeproc.cabal +++ b/citeproc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: citeproc -version: 0.8.0.2 +version: 0.8.1 synopsis: Generates citations and bibliography from CSL styles. description: citeproc parses CSL style files and uses them to generate a list of formatted citations and bibliography @@ -77,7 +77,7 @@ , aeson , filepath , file-embed - , pandoc-types >= 1.22 && < 1.23 + , pandoc-types >= 1.22 && < 1.24 , unicode-collation >= 0.1.3 && < 0.2 -- , pretty-show if flag(icu) diff --git a/locales/af-ZA.xml b/locales/af-ZA.xml --- a/locales/af-ZA.xml +++ b/locales/af-ZA.xml @@ -66,7 +66,6 @@ in in press internet - interview brief no date n.d. @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/ar.xml b/locales/ar.xml --- a/locales/ar.xml +++ b/locales/ar.xml @@ -72,7 +72,6 @@ في قيد النشر انترنت - مقابلة خطاب دون تاريخ د.ت @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + مقابلة legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/bg-BG.xml b/locales/bg-BG.xml --- a/locales/bg-BG.xml +++ b/locales/bg-BG.xml @@ -71,7 +71,6 @@ в под печат интернет - интервю писмо без дата б.д. @@ -95,9 +94,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -109,7 +108,7 @@ graphic hearing - interview + интервю legal case legislation manuscript @@ -140,8 +139,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -336,39 +335,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/ca-AD.xml b/locales/ca-AD.xml --- a/locales/ca-AD.xml +++ b/locales/ca-AD.xml @@ -72,7 +72,6 @@ en en impremta internet - entrevista carta sense data s.d. @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + entrevista legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/cs-CZ.xml b/locales/cs-CZ.xml --- a/locales/cs-CZ.xml +++ b/locales/cs-CZ.xml @@ -79,7 +79,6 @@ in v tisku internet - interview dopis nedatováno b.r. @@ -103,9 +102,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -148,8 +147,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -307,39 +306,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/cy-GB.xml b/locales/cy-GB.xml --- a/locales/cy-GB.xml +++ b/locales/cy-GB.xml @@ -66,7 +66,6 @@ yn yn y wasg rhyngrwyd - cyfweliad llythyr dim dyddiad d.d. @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -104,7 +103,7 @@ graphic hearing - interview + cyfweliad legal case legislation manuscript @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/da-DK.xml b/locales/da-DK.xml --- a/locales/da-DK.xml +++ b/locales/da-DK.xml @@ -75,7 +75,6 @@ i i trykken internet - interview brev uden år u.å. @@ -99,9 +98,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -144,8 +143,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/de-AT.xml b/locales/de-AT.xml --- a/locales/de-AT.xml +++ b/locales/de-AT.xml @@ -84,7 +84,6 @@ in im Druck Internet - Interview Brief ohne Datum o. J. @@ -108,9 +107,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -122,7 +121,7 @@ graphic hearing - interview + Interview legal case legislation manuscript @@ -153,8 +152,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -312,39 +311,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/de-CH.xml b/locales/de-CH.xml --- a/locales/de-CH.xml +++ b/locales/de-CH.xml @@ -78,7 +78,6 @@ in im Druck Internet - Interview Brief ohne Datum o. J. @@ -102,9 +101,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -116,7 +115,7 @@ graphic hearing - interview + Interview legal case legislation manuscript @@ -147,8 +146,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -306,39 +305,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/de-DE.xml b/locales/de-DE.xml --- a/locales/de-DE.xml +++ b/locales/de-DE.xml @@ -81,7 +81,6 @@ in im Druck Internet - Interview Brief ohne Datum o. J. @@ -105,9 +104,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -119,7 +118,7 @@ graphic hearing - interview + Interview legal case legislation manuscript @@ -150,8 +149,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -309,39 +308,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/el-GR.xml b/locales/el-GR.xml --- a/locales/el-GR.xml +++ b/locales/el-GR.xml @@ -72,7 +72,6 @@ στο υπό έκδοση διαδίκτυο - συνέντευξη επιστολή χωρίς χρονολογία χ.χ. @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + συνέντευξη legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -302,39 +301,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/en-GB.xml b/locales/en-GB.xml --- a/locales/en-GB.xml +++ b/locales/en-GB.xml @@ -75,7 +75,6 @@ in in press internet - interview letter no date n.d. @@ -99,9 +98,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -144,8 +143,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. diff --git a/locales/en-US.xml b/locales/en-US.xml --- a/locales/en-US.xml +++ b/locales/en-US.xml @@ -81,7 +81,6 @@ in in press internet - interview letter no date n.d. @@ -105,9 +104,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -150,8 +149,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. diff --git a/locales/es-CL.xml b/locales/es-CL.xml --- a/locales/es-CL.xml +++ b/locales/es-CL.xml @@ -70,7 +70,6 @@ en en imprenta internet - entrevista carta sin fecha s. f. @@ -94,9 +93,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -108,7 +107,7 @@ graphic hearing - interview + entrevista legal case legislation manuscript @@ -139,8 +138,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -298,39 +297,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/es-ES.xml b/locales/es-ES.xml --- a/locales/es-ES.xml +++ b/locales/es-ES.xml @@ -69,7 +69,6 @@ en en imprenta internet - entrevista carta sin fecha s. f. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + entrevista legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/es-MX.xml b/locales/es-MX.xml --- a/locales/es-MX.xml +++ b/locales/es-MX.xml @@ -73,7 +73,6 @@ en en imprenta internet - entrevista carta sin fecha s/f @@ -97,9 +96,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -111,7 +110,7 @@ graphic hearing - interview + entrevista legal case legislation manuscript @@ -142,8 +141,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/et-EE.xml b/locales/et-EE.xml --- a/locales/et-EE.xml +++ b/locales/et-EE.xml @@ -69,7 +69,6 @@ trükis internet - intervjuu kiri s.a. s.a. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + intervjuu legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/eu.xml b/locales/eu.xml --- a/locales/eu.xml +++ b/locales/eu.xml @@ -69,7 +69,6 @@ in moldiztegian internet - elkarrizketa gutuna datarik gabe d. g. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + elkarrizketa legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/fa-IR.xml b/locales/fa-IR.xml --- a/locales/fa-IR.xml +++ b/locales/fa-IR.xml @@ -72,7 +72,6 @@ در زیر چاپ اینترنت - مصاحبه نامه بدون تاریخ بدون تاریخ @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + مصاحبه legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/fi-FI.xml b/locales/fi-FI.xml --- a/locales/fi-FI.xml +++ b/locales/fi-FI.xml @@ -78,7 +78,6 @@ teoksessa painossa internet - haastattelu kirje ei päivämäärää ei pvm. @@ -102,9 +101,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -116,7 +115,7 @@ graphic hearing - interview + haastattelu legal case legislation manuscript @@ -147,8 +146,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -306,39 +305,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/fr-CA.xml b/locales/fr-CA.xml --- a/locales/fr-CA.xml +++ b/locales/fr-CA.xml @@ -69,7 +69,6 @@ dans sous presse Internet - entretien lettre sans date s. d. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + entretien legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -299,39 +298,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/fr-FR.xml b/locales/fr-FR.xml --- a/locales/fr-FR.xml +++ b/locales/fr-FR.xml @@ -72,7 +72,6 @@ in sous presse Internet - entretien lettre sans date s. d. @@ -96,9 +95,9 @@ article de magazine article de presse projet de loi - livre + émission - chapitre de livre + classique collection jeu de données @@ -110,7 +109,7 @@ image audience - interview + entretien affaire acte juridique manuscrit @@ -141,8 +140,8 @@ art. de revue art. de mag. art. de presse - liv. - chap. de liv. + + doc. graph. @@ -302,39 +301,39 @@ - + append. append. - + art. art. - + emplact emplact - + eq. eq. - + règle règles - + sc. sc. - + tab. tab. - + - + tit. tit. diff --git a/locales/he-IL.xml b/locales/he-IL.xml --- a/locales/he-IL.xml +++ b/locales/he-IL.xml @@ -69,7 +69,6 @@ בתוך בהדפסה אינטרנט - ראיון מכתב אין נתונים nd @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + ראיון legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/hi-IN.xml b/locales/hi-IN.xml --- a/locales/hi-IN.xml +++ b/locales/hi-IN.xml @@ -70,7 +70,6 @@ में मुद्रण में इंटर्नेट - साक्षात्कार पत्र दिनांक अज्ञात n.d. @@ -94,9 +93,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -108,7 +107,7 @@ graphic hearing - interview + साक्षात्कार legal case legislation manuscript @@ -139,8 +138,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -180,7 +179,7 @@ पहला पहली दूसरा - दूसरी + दूसरी तीसरा तीसरी चौथा @@ -313,39 +312,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/hr-HR.xml b/locales/hr-HR.xml --- a/locales/hr-HR.xml +++ b/locales/hr-HR.xml @@ -69,7 +69,6 @@ u u tisku internet - intervju pismo bez datuma bez dat. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + intervju legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/hu-HU.xml b/locales/hu-HU.xml --- a/locales/hu-HU.xml +++ b/locales/hu-HU.xml @@ -69,7 +69,6 @@ in nyomtatás alatt internet - interjú levél évszám nélkül é. n. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + interjú legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/id-ID.xml b/locales/id-ID.xml --- a/locales/id-ID.xml +++ b/locales/id-ID.xml @@ -75,7 +75,6 @@ dalam dalam proses cetakan internet - wawancara surat tanpa tanggal t.t. @@ -99,9 +98,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -113,7 +112,7 @@ graphic hearing - interview + wawancara legal case legislation manuscript @@ -144,8 +143,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -309,39 +308,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/is-IS.xml b/locales/is-IS.xml --- a/locales/is-IS.xml +++ b/locales/is-IS.xml @@ -72,7 +72,6 @@ í í prentun rafrænt - viðtal bréf engin dagsetning e.d. @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + viðtal legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/it-IT.xml b/locales/it-IT.xml --- a/locales/it-IT.xml +++ b/locales/it-IT.xml @@ -20,7 +20,7 @@ - advance online publication + pubblicazione online ad accesso anticipato album registrazione audio film @@ -65,15 +65,13 @@ ed. et al. - futuro + in corso di pubblicazione da - ibid. ibidem ibid. in in stampa internet - intervista lettera sine data s.d. @@ -97,9 +95,9 @@ articolo di rivista generalista articolo di giornale proposta di legge - libro + broadcast - capitolo di libro + classico collezione dataset @@ -142,8 +140,8 @@ art. di riv. art. di riv art. di g. - l. - c. di l. + + doc. op. d'arte @@ -323,39 +321,39 @@ - + app. app. - + art. art. - + loc. locs. - + eq. eq. - + r. r. - + sc. sc. - + tab. tab. - + - + tit. tits. diff --git a/locales/ja-JP.xml b/locales/ja-JP.xml --- a/locales/ja-JP.xml +++ b/locales/ja-JP.xml @@ -69,7 +69,6 @@ in press internet - interview 手紙 no date 日付なし @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/km-KH.xml b/locales/km-KH.xml --- a/locales/km-KH.xml +++ b/locales/km-KH.xml @@ -66,7 +66,6 @@ in in press internet - interview letter no date n.d. @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/ko-KR.xml b/locales/ko-KR.xml --- a/locales/ko-KR.xml +++ b/locales/ko-KR.xml @@ -66,7 +66,6 @@ in in press internet - interview 편지 no date 일자 없음 @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/la.xml b/locales/la.xml --- a/locales/la.xml +++ b/locales/la.xml @@ -69,7 +69,6 @@ in impressorio interrete - congressus epistula sine die s.d. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + congressus legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/lt-LT.xml b/locales/lt-LT.xml --- a/locales/lt-LT.xml +++ b/locales/lt-LT.xml @@ -71,7 +71,6 @@ priimta spaudai prieiga per internetą - interviu laiškas sine anno s.a. @@ -95,9 +94,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -109,7 +108,7 @@ graphic hearing - interview + interviu legal case legislation manuscript @@ -140,8 +139,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -316,39 +315,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/lv-LV.xml b/locales/lv-LV.xml --- a/locales/lv-LV.xml +++ b/locales/lv-LV.xml @@ -49,14 +49,12 @@ video working paper skatīts - m.ē. un un citi anonīms anon. pieejams - p.m.ē. apmēram apm. @@ -73,7 +71,6 @@ no presē internets - intervija vēstule bez datuma b.g. @@ -97,9 +94,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -111,7 +108,7 @@ graphic hearing - interview + intervija legal case legislation manuscript @@ -142,8 +139,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -156,8 +153,8 @@ audio rec. - AD - BC + m.ē. + p.m.ē. BCE CE @@ -313,39 +310,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/mn-MN.xml b/locales/mn-MN.xml --- a/locales/mn-MN.xml +++ b/locales/mn-MN.xml @@ -66,7 +66,6 @@ in in press internet - interview захиа no date n.d. @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -294,39 +293,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/nb-NO.xml b/locales/nb-NO.xml --- a/locales/nb-NO.xml +++ b/locales/nb-NO.xml @@ -69,7 +69,6 @@ i i trykk Internett - intervju brev ingen dato u.å. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + intervju legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/nl-NL.xml b/locales/nl-NL.xml --- a/locales/nl-NL.xml +++ b/locales/nl-NL.xml @@ -70,7 +70,6 @@ in in druk internet - interview brief zonder datum z.d. @@ -94,9 +93,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -139,8 +138,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -316,39 +315,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/nn-NO.xml b/locales/nn-NO.xml --- a/locales/nn-NO.xml +++ b/locales/nn-NO.xml @@ -69,7 +69,6 @@ i i trykk Internett - intervju brev ingen dato u.å. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + intervju legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/pl-PL.xml b/locales/pl-PL.xml --- a/locales/pl-PL.xml +++ b/locales/pl-PL.xml @@ -75,7 +75,6 @@ w w druku internet - wywiad list brak daty b.d. @@ -99,9 +98,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -113,7 +112,7 @@ graphic hearing - interview + wywiad legal case legislation manuscript @@ -144,8 +143,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/pt-BR.xml b/locales/pt-BR.xml --- a/locales/pt-BR.xml +++ b/locales/pt-BR.xml @@ -72,7 +72,6 @@ em no prelo internet - entrevista carta sem data [s.d.] @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + entrevista legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -312,39 +311,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/pt-PT.xml b/locales/pt-PT.xml --- a/locales/pt-PT.xml +++ b/locales/pt-PT.xml @@ -69,7 +69,6 @@ em no prelo internet - entrevista carta sem data sem data @@ -93,9 +92,9 @@ artigo de revista artigo de jornal bill - livro + transmissão - capítulo de livro + clássico coleção dataset @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. gráf. @@ -308,39 +307,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tít. títs. diff --git a/locales/ro-RO.xml b/locales/ro-RO.xml --- a/locales/ro-RO.xml +++ b/locales/ro-RO.xml @@ -70,7 +70,6 @@ în sub tipar internet - interviu scrisoare fără dată f.a. @@ -94,9 +93,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -108,7 +107,7 @@ graphic hearing - interview + interviu legal case legislation manuscript @@ -139,8 +138,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -299,39 +298,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/ru-RU.xml b/locales/ru-RU.xml --- a/locales/ru-RU.xml +++ b/locales/ru-RU.xml @@ -71,7 +71,6 @@ в в печати Интернет - интервью письмо без даты б. д. @@ -97,9 +96,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -111,7 +110,7 @@ graphic hearing - interview + интервью legal case legislation manuscript @@ -142,8 +141,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -321,39 +320,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/sk-SK.xml b/locales/sk-SK.xml --- a/locales/sk-SK.xml +++ b/locales/sk-SK.xml @@ -72,7 +72,6 @@ v v tlači internet - osobná komunikácia list no date n.d. @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + osobná komunikácia legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -306,39 +305,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/sl-SI.xml b/locales/sl-SI.xml --- a/locales/sl-SI.xml +++ b/locales/sl-SI.xml @@ -72,7 +72,6 @@ v v tisku internet - intervju pismo brez datuma b. d. @@ -96,9 +95,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -110,7 +109,7 @@ graphic hearing - interview + intervju legal case legislation manuscript @@ -141,8 +140,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/sr-RS.xml b/locales/sr-RS.xml --- a/locales/sr-RS.xml +++ b/locales/sr-RS.xml @@ -66,7 +66,6 @@ у у штампи Интернет - интервју писмо no date без датума @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -104,7 +103,7 @@ graphic hearing - interview + интервју legal case legislation manuscript @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -300,39 +299,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/sv-SE.xml b/locales/sv-SE.xml --- a/locales/sv-SE.xml +++ b/locales/sv-SE.xml @@ -78,7 +78,6 @@ i i tryck internet - intervju brev utan årtal u.å. @@ -102,9 +101,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -116,7 +115,7 @@ graphic hearing - interview + intervju legal case legislation manuscript @@ -147,8 +146,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -310,39 +309,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/th-TH.xml b/locales/th-TH.xml --- a/locales/th-TH.xml +++ b/locales/th-TH.xml @@ -69,7 +69,6 @@ ใน กำลังรอตีพิมพ์ อินเทอร์เน็ต - การสัมภาษณ์ จดหมาย ไม่ปรากฏปีที่พิมพ์ ม.ป.ป. @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -107,7 +106,7 @@ graphic hearing - interview + การสัมภาษณ์ legal case legislation manuscript @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -297,39 +296,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/tr-TR.xml b/locales/tr-TR.xml --- a/locales/tr-TR.xml +++ b/locales/tr-TR.xml @@ -79,7 +79,6 @@ içinde basımda internet - mülakat mektup tarih yok t.y. @@ -103,9 +102,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -117,7 +116,7 @@ graphic hearing - interview + mülakat legal case legislation manuscript @@ -148,8 +147,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -307,39 +306,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/uk-UA.xml b/locales/uk-UA.xml --- a/locales/uk-UA.xml +++ b/locales/uk-UA.xml @@ -63,7 +63,6 @@ в у пресі інтернет - інтервю лист без дати б. д. @@ -81,9 +80,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -95,7 +94,7 @@ graphic hearing - interview + інтервю legal case legislation manuscript @@ -126,8 +125,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -276,39 +275,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/vi-VN.xml b/locales/vi-VN.xml --- a/locales/vi-VN.xml +++ b/locales/vi-VN.xml @@ -69,7 +69,6 @@ trong in press internet - interview thư không ngày không ngày @@ -93,9 +92,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -138,8 +137,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -303,39 +302,39 @@ - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/locales/zh-CN.xml b/locales/zh-CN.xml --- a/locales/zh-CN.xml +++ b/locales/zh-CN.xml @@ -72,7 +72,6 @@ 收入 送印中 网际网络 - 访谈 信函 日期不详 不详 @@ -90,9 +89,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -104,7 +103,7 @@ graphic hearing - interview + 访谈 legal case legislation manuscript @@ -135,8 +134,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -243,39 +242,39 @@ 卷 - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. @@ -459,7 +458,7 @@ 绘 译 编译 - 校 + 校 一月 diff --git a/locales/zh-TW.xml b/locales/zh-TW.xml --- a/locales/zh-TW.xml +++ b/locales/zh-TW.xml @@ -66,7 +66,6 @@ 收入 印行中 互聯網 - 訪談 信函 日期不詳 不詳 @@ -84,9 +83,9 @@ magazine article newspaper article bill - book + broadcast - book chapter + classic collection dataset @@ -98,7 +97,7 @@ graphic hearing - interview + 訪談 legal case legislation manuscript @@ -129,8 +128,8 @@ journal art. mag. art. newspaper art. - bk. - bk. chap. + + doc. graph. @@ -237,39 +236,39 @@ 卷 - + app. apps. - + art. arts. - + loc. locs. - + eq. eqs. - + r. rr. - + sc. scs. - + tbl. tbls. - + - + tit. tits. diff --git a/src/Citeproc/CslJson.hs b/src/Citeproc/CslJson.hs --- a/src/Citeproc/CslJson.hs +++ b/src/Citeproc/CslJson.hs @@ -33,7 +33,7 @@ import Citeproc.Locale (lookupQuotes) import Citeproc.CaseTransform import Data.Ord () -import Data.Char (isAlphaNum, isSpace, isAscii) +import Data.Char (isAlphaNum, isSpace, isAscii, isPunctuation) import Data.Text (Text) import qualified Data.Text as T import Data.Foldable (fold) @@ -562,7 +562,8 @@ hasWordBreak = any (T.any isWordBreak) splitUp = T.groupBy sameType sameType c d = - (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) + (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) || + (isPunctuation c && isPunctuation d) caseTransform :: Maybe Lang -> CaseTransformer diff --git a/src/Citeproc/Eval.hs b/src/Citeproc/Eval.hs --- a/src/Citeproc/Eval.hs +++ b/src/Citeproc/Eval.hs @@ -137,6 +137,8 @@ ref{ referenceVariables = M.insert "citation-number" (NumVal num) . + M.insert "citation-key" + (TextVal (unItemId citeId)) . M.alter (addIfMissing (citationLabel ref)) "citation-label" $ referenceVariables ref @@ -1861,54 +1863,76 @@ | otherwise -> return Nothing Nothing -> return Nothing - +formatSortDate :: CiteprocOutput a + => [DP] -> (Maybe Int, Maybe Int, Maybe Int) -> Output a +formatSortDate dpSpecs (mbyr, mbmo, mbda) = + Literal $ fromText $ T.pack $ sortyr <> sortmo <> sortda + where + sortyr = case mbyr of + Just yr | any ((== DPYear) . dpName) dpSpecs + -> printf "%04d" (yr + 5000) -- to work with BC and AD + _ -> "" + sortmo = case mbmo of + Just mo | any ((== DPMonth) . dpName) dpSpecs + -> printf "%02d" mo + _ -> "" + sortda = case mbda of + Just da | any ((== DPDay) . dpName) dpSpecs + -> printf "%02d" da + _ -> "" formatDateParts :: CiteprocOutput a => [DP] -> (DateParts, Maybe DateParts) -> Eval a [Output a] formatDateParts dpSpecs (date, mbNextDate) = do + inSortKey <- asks contextInSortKey let (yr,mo,da) = bindDateParts date - case mbNextDate of - Nothing -> mapM (eDP (yr,mo,da)) dpSpecs - Just nextDate -> do - let (nextyr,nextmo,nextda) = bindDateParts nextDate - let isOpenRange = nextyr == Just 0 && - isNothing nextmo && - isNothing nextda - -- figure out where the range goes: - -- first to differ out of the items selected by dpSpecs, in order y->m->d - let dpToNs DPYear = (yr, nextyr) - dpToNs DPMonth = (mo, nextmo) - dpToNs DPDay = (da, nextda) - let areSame = takeWhile (uncurry (==) . dpToNs) $ - sort $ map dpName dpSpecs - let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs - let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest - let cleanup = filter (/= NullOutput) - sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1 - diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs - diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs - sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2 - let rangeDelim = case sortOn dpName diffs of - [] -> Nothing - (dp:_) -> Just $ dpRangeDelimiter dp - let toRange xs ys = - case lastMay xs of - Just xlast -> - initSafe xs ++ - [Formatted mempty{ formatDelimiter = rangeDelim } - [xlast, headDef (Literal mempty) ys]] ++ - tailSafe ys - _ -> xs ++ ys + case bindDateParts <$> mbNextDate of + Nothing + | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da)] + | otherwise -> mapM (eDP (yr,mo,da)) dpSpecs + Just (nextyr, nextmo, nextda) + | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da), + Literal (fromText "-"), + formatSortDate dpSpecs (nextyr, nextmo, nextda)] + | otherwise -> do + let isOpenRange = nextyr == Just 0 && + isNothing nextmo && + isNothing nextda + -- figure out where the range goes: + -- first to differ out of the items selected by dpSpecs, in order y->m->d + let dpToNs DPYear = (yr, nextyr) + dpToNs DPMonth = (mo, nextmo) + dpToNs DPDay = (da, nextda) + let areSame = takeWhile (uncurry (==) . dpToNs) $ + sort $ map dpName dpSpecs + let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs + let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest + let cleanup = filter (/= NullOutput) + sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1 + diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs + diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs + sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2 + let rangeDelim = case sortOn dpName diffs of + [] -> Nothing + (dp:_) -> Just $ dpRangeDelimiter dp + let toRange xs ys = + case lastMay xs of + Just xlast -> + initSafe xs ++ + [Formatted mempty{ formatDelimiter = rangeDelim } + [xlast, headDef (Literal mempty) ys]] ++ + tailSafe ys + _ -> xs ++ ys - return $ - if isOpenRange - then [Formatted mempty{ formatSuffix = rangeDelim } - (removeLastSuffix $ sames1' ++ diffsLeft')] - else removeLastSuffix $ - sames1' ++ - toRange (removeLastSuffix diffsLeft') - (removeFirstPrefix diffsRight') ++ - sames2' + return $ + if isOpenRange + then [Formatted mempty{ formatSuffix = rangeDelim } + (removeLastSuffix $ sames1' ++ diffsLeft')] + else removeLastSuffix $ + sames1' ++ + toRange (removeLastSuffix diffsLeft') + (removeFirstPrefix diffsRight') ++ + sames2' removeFirstPrefix :: [Output a] -> [Output a] removeFirstPrefix (Formatted f xs : rest) = diff --git a/src/Citeproc/Pandoc.hs b/src/Citeproc/Pandoc.hs --- a/src/Citeproc/Pandoc.hs +++ b/src/Citeproc/Pandoc.hs @@ -300,4 +300,5 @@ hasWordBreak = T.any isWordBreak splitUp = T.groupBy sameType sameType c d = - (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) + (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) || + (isPunctuation c && isPunctuation d) diff --git a/src/Citeproc/Style.hs b/src/Citeproc/Style.hs --- a/src/Citeproc/Style.hs +++ b/src/Citeproc/Style.hs @@ -530,9 +530,15 @@ local (<> attrmap) $ do node' <- expandMacros macroMap node let layouts = getChildren "layout" node' - let formatting = mconcat $ map (getFormatting . getAttributes) layouts + -- In case there are multiple layouts (as CSL-M allows), we raise an error + let elname = T.unpack $ X.nameLocalName $ X.elementName node + layout <- case layouts of + [] -> parseFailure $ "No layout element present in " <> elname + [l] -> return l + (_:_) -> parseFailure $ "Multiple layout elements present in " <> elname + let formatting = getFormatting . getAttributes $ layout let sorts = getChildren "sort" node' - elements <- mapM pElement (concatMap allChildren layouts) + elements <- mapM pElement $ allChildren layout let opts = LayoutOptions { layoutCollapse = case lookupAttribute "collapse" attr of diff --git a/test/extra/issue_126.txt b/test/extra/issue_126.txt new file mode 100644 --- /dev/null +++ b/test/extra/issue_126.txt @@ -0,0 +1,1779 @@ +>>===== MODE =====>> +bibliography +<<===== MODE =====<< + + + + +>>===== RESULT =====>> +
+
American College of Sports Medicine. (1975). Guidelines for graded exercise testing and exercise prescription.
+
American College of Sports Medicine. (2013). ACSM’s resource manual for guidelines for exercise testing and prescription.
+
American College of Sports Medicine. (2018). ACSM’s exercise testing and prescription.
+
American College of Sports Medicine. (2021a). ACSM’s guidelines for exercise testing and prescription.
+
American College of Sports Medicine. (2021b, November 10). The American College of Sports Medicine. https://bit.ly/3DSQHc8
+
+<<===== RESULT =====<< + + +>>===== CSL =====>> + + +<<===== CSL =====<< + + +>>===== CITATION-ITEMS =====>> +[[ ]] +<<===== CITATION-ITEMS =====<< + + + +>>===== INPUT =====>> +[ + { + "author": [ + { + "family": "American College of Sports Medicine", + "given": "" + } + ], + "citation-key": "americancollegeofsportsmedicine1975", + "id": "americancollegeofsportsmedicine1975", + "issued": { + "date-parts": [ + [ + 1975 + ] + ] + }, + "title": "Guidelines for graded exercise testing and exercise prescription", + "type": "book" + }, + { + "author": [ + { + "family": "American College of Sports Medicine", + "given": "" + } + ], + "citation-key": "americancollegeofsportsmedicine2013", + "id": "americancollegeofsportsmedicine2013", + "issued": { + "date-parts": [ + [ + 2013 + ] + ] + }, + "title": "ACSM’s resource manual for guidelines for exercise testing and prescription", + "type": "book" + }, + { + "author": [ + { + "family": "American College of Sports Medicine", + "given": "" + } + ], + "citation-key": "americancollegeofsportsmedicine2018", + "id": "americancollegeofsportsmedicine2018", + "issued": { + "date-parts": [ + [ + 2018 + ] + ] + }, + "title": "ACSM’s exercise testing and prescription", + "type": "book" + }, + { + "URL": "https://bit.ly/3DSQHc8", + "accessed": { + "date-parts": [ + [ + 2021, + 12, + 15 + ] + ] + }, + "author": [ + { + "family": "American College of Sports Medicine", + "given": "" + } + ], + "citation-key": "americancollegeofsportsmedicine2021", + "id": "americancollegeofsportsmedicine2021", + "issued": { + "date-parts": [ + [ + 2021, + 11, + 10 + ] + ] + }, + "title": "The American College of Sports Medicine", + "type": "webpage" + }, + { + "author": [ + { + "family": "American College of Sports Medicine", + "given": "" + } + ], + "citation-key": "americancollegeofsportsmedicine2021a", + "id": "americancollegeofsportsmedicine2021a", + "issued": { + "date-parts": [ + [ + 2021 + ] + ] + }, + "title": "ACSM’s guidelines for exercise testing and prescription", + "type": "book" + } +] +<<===== INPUT =====<< + + +>>===== VERSION =====>> +1.0 +<<===== VERSION =====<< + diff --git a/test/extra/issue_37.txt b/test/extra/issue_37.txt --- a/test/extra/issue_37.txt +++ b/test/extra/issue_37.txt @@ -18,7 +18,6 @@ - <<===== CSL =====<< diff --git a/test/extra/issue_38.txt b/test/extra/issue_38.txt --- a/test/extra/issue_38.txt +++ b/test/extra/issue_38.txt @@ -634,7 +634,6 @@ - <<===== CSL =====<<