diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +pandoc-citeproc (0.14.3.1) + + * Allow pandoc 2.2.x. + * Update locales and default csl. + pandoc-citeproc (0.14.3) * Fixed other-modules in cabal. diff --git a/chicago-author-date.csl b/chicago-author-date.csl --- a/chicago-author-date.csl +++ b/chicago-author-date.csl @@ -20,11 +20,12 @@ Andrew Dunning andrew.dunning@utoronto.ca + https://orcid.org/0000-0003-0464-5036 The author-date variant of the Chicago style - 2017-10-12T12:00:00+00:00 + 2018-01-24T12:00:00+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -360,7 +361,7 @@ - + @@ -416,14 +417,14 @@ - - - - - - - - + + + + + + + + diff --git a/locales/locales-ar.xml b/locales/locales-ar.xml --- a/locales/locales-ar.xml +++ b/locales/locales-ar.xml @@ -1,13 +1,19 @@ + + abdealikhurrum + + + Dr. Ayman Saleh + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 - + @@ -25,14 +31,14 @@ موجود في عن طريق حوالي - حو. + حوالي وثق الطبعة الطبعات - ط. - وآخ. + ط + وآخرون التالي من المرجع السابق @@ -43,7 +49,7 @@ خطاب دون تاريخ د.ت - على الخط المباشر + مباشر على الإنترنت قُدَّم في مرجع @@ -54,8 +60,8 @@ مراجع استرجع في - scale - version + السلم الموسيقي + إصدار ب.م. @@ -72,7 +78,7 @@ - الاول + الأول الثاني الثالث الرابع @@ -118,7 +124,7 @@ نوته موسيقية - نوت موسيقية + نوتات موسيقية صفحة @@ -160,19 +166,19 @@ رسم توضيحي مطوية عدد - l. - n. + سـ + ملاحظة نوتة موسيقية ص - ص.ص. + ص ص - ص.ص. + ص فقرة - ج. + ج قسم تفسير فرعي @@ -183,8 +189,8 @@ أبيات شعر - مج. - مج. + م + م @@ -198,109 +204,50 @@ - - مدور - مدورين - - - محرر - محررين - - - رئيس التحرير - رؤساء التحرير - - - illustrator - illustrators - - - مترجم - مترجمين - - - مترجم ومحرر - مترجمين ومحررين - + إدارة + تحقيق + إدارة التحرير + رسوم + ترجمة + ترجمة وتحقيق - - dir. - dirs. - - - محرر - محررين - - - مشرف على الطبعة - مشرفين على الطبعة - - - ill. - ills. - - - مترجم - مترجمين - - - مترجم ومشرف على الطباعه - مترجمين ومشرفين على الطباعه - - - directed by - تحرير - اعداد - illustrated by - مقابلة بواسطة - مرسل الى - بـ + إنشاء + إشراف + تحقيق + إعداد + رسوم + مقابلة مع + المستلم + مراجعة ترجمة - اعداد وترجمة + تحقيق وترجمة - dir. - تحرير - اشرف على الطبعة - illus. - ترجمة - ترجمه واشرف على الطباعه - + يناير فبراير مارس - ابريل + أبريل مايو يونيو يوليو - اغسطس + أغسطس سبتمبر - اكتوبر + أكتوبر نوفمبر ديسمبر - يناير - فبراير - مارس - ابريل - مايو - يونيو - يوليو - اغسطس - سبتمبر - اكتوبر - نوفمبر - ديسمبر + - الربيع - الصيف - الخريف - الشتاء + ربيع + صيف + خريف + شتاء diff --git a/locales/locales-ca-AD.xml b/locales/locales-ca-AD.xml --- a/locales/locales-ca-AD.xml +++ b/locales/locales-ca-AD.xml @@ -1,6 +1,12 @@ + + anidal + + + javimat + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-cs-CZ.xml b/locales/locales-cs-CZ.xml --- a/locales/locales-cs-CZ.xml +++ b/locales/locales-cs-CZ.xml @@ -1,6 +1,18 @@ + + nosaal + + + Andrew Dunning + + + libora + + + Michal Hoftich + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-da-DK.xml b/locales/locales-da-DK.xml --- a/locales/locales-da-DK.xml +++ b/locales/locales-da-DK.xml @@ -1,6 +1,15 @@ + + Niels Erik Wille + + + Jonas Nyrup + + + hafnius + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-de-AT.xml b/locales/locales-de-AT.xml --- a/locales/locales-de-AT.xml +++ b/locales/locales-de-AT.xml @@ -1,6 +1,24 @@ + + Till A. Heilmann + + + Georg Duffner + + + Sebastian Karcher + + + Sylvester Keil + + + jakov + + + Frank Bennett + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-de-CH.xml b/locales/locales-de-CH.xml --- a/locales/locales-de-CH.xml +++ b/locales/locales-de-CH.xml @@ -1,6 +1,18 @@ + + Till A. Heilmann + + + Sylvester Keil + + + jakov + + + Sebastian Karcher + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-de-DE.xml b/locales/locales-de-DE.xml --- a/locales/locales-de-DE.xml +++ b/locales/locales-de-DE.xml @@ -1,6 +1,21 @@ + + Till A. Heilmann + + + Ulrich + + + Rintze M. Zelle + + + Sebastian Karcher + + + jakov + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-el-GR.xml b/locales/locales-el-GR.xml --- a/locales/locales-el-GR.xml +++ b/locales/locales-el-GR.xml @@ -1,6 +1,12 @@ + + thanasis57 + + + dimtamb + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2013-11-08T20:31:02+00:00 diff --git a/locales/locales-en-GB.xml b/locales/locales-en-GB.xml --- a/locales/locales-en-GB.xml +++ b/locales/locales-en-GB.xml @@ -1,6 +1,15 @@ + + Andrew Dunning + + + Sebastian Karcher + + + Rintze M. Zelle + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2015-10-10T23:31:02+00:00 diff --git a/locales/locales-en-US.xml b/locales/locales-en-US.xml --- a/locales/locales-en-US.xml +++ b/locales/locales-en-US.xml @@ -1,6 +1,15 @@ + + Andrew Dunning + + + Sebastian Karcher + + + Rintze M. Zelle + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2015-10-10T23:31:02+00:00 diff --git a/locales/locales-es-ES.xml b/locales/locales-es-ES.xml --- a/locales/locales-es-ES.xml +++ b/locales/locales-es-ES.xml @@ -1,6 +1,9 @@ + + javimat + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-et-EE.xml b/locales/locales-et-EE.xml --- a/locales/locales-et-EE.xml +++ b/locales/locales-et-EE.xml @@ -1,6 +1,9 @@ + + Andrew Dunning + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-eu.xml b/locales/locales-eu.xml --- a/locales/locales-eu.xml +++ b/locales/locales-eu.xml @@ -1,6 +1,9 @@ + + Amaraun + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-fa-IR.xml b/locales/locales-fa-IR.xml --- a/locales/locales-fa-IR.xml +++ b/locales/locales-fa-IR.xml @@ -1,6 +1,12 @@ + + Hamed Heydari + + + abdealikhurrum + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-fi-FI.xml b/locales/locales-fi-FI.xml --- a/locales/locales-fi-FI.xml +++ b/locales/locales-fi-FI.xml @@ -1,6 +1,18 @@ + + Janne Huovari + + + snissine + + + villelahtinen + + + Juhana Venäläinen + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-he-IL.xml b/locales/locales-he-IL.xml --- a/locales/locales-he-IL.xml +++ b/locales/locales-he-IL.xml @@ -1,6 +1,9 @@ + + roypeled1 + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-hr-HR.xml b/locales/locales-hr-HR.xml --- a/locales/locales-hr-HR.xml +++ b/locales/locales-hr-HR.xml @@ -1,6 +1,9 @@ + + tvrbanec + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-hu-HU.xml b/locales/locales-hu-HU.xml --- a/locales/locales-hu-HU.xml +++ b/locales/locales-hu-HU.xml @@ -1,6 +1,9 @@ + + Miklos Vajna + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2014-06-17T09:56:35+02:00 diff --git a/locales/locales-id-ID.xml b/locales/locales-id-ID.xml --- a/locales/locales-id-ID.xml +++ b/locales/locales-id-ID.xml @@ -1,7 +1,16 @@ - This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License + + faizhabibullah + + + Deden Habibi + + + xbypass + + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2015-08-05T23:31:02+00:00 diff --git a/locales/locales-is-IS.xml b/locales/locales-is-IS.xml --- a/locales/locales-is-IS.xml +++ b/locales/locales-is-IS.xml @@ -1,6 +1,12 @@ + + dadamaster + + + styrmirm + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-it-IT.xml b/locales/locales-it-IT.xml --- a/locales/locales-it-IT.xml +++ b/locales/locales-it-IT.xml @@ -1,6 +1,9 @@ + + FI App Development + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-ja-JP.xml b/locales/locales-ja-JP.xml --- a/locales/locales-ja-JP.xml +++ b/locales/locales-ja-JP.xml @@ -1,6 +1,9 @@ + + Shoji Takahashi + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-nb-NO.xml b/locales/locales-nb-NO.xml --- a/locales/locales-nb-NO.xml +++ b/locales/locales-nb-NO.xml @@ -1,6 +1,9 @@ + + Guttorm Flatabø + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2013-03-01T12:20:00+01:00 diff --git a/locales/locales-nl-NL.xml b/locales/locales-nl-NL.xml --- a/locales/locales-nl-NL.xml +++ b/locales/locales-nl-NL.xml @@ -2,7 +2,7 @@ - Rintze Zelle + Rintze M. Zelle http://twitter.com/rintzezelle This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License diff --git a/locales/locales-nn-NO.xml b/locales/locales-nn-NO.xml --- a/locales/locales-nn-NO.xml +++ b/locales/locales-nn-NO.xml @@ -1,6 +1,9 @@ + + Guttorm Flatabø + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2013-03-01T12:20:00+01:00 diff --git a/locales/locales-pl-PL.xml b/locales/locales-pl-PL.xml --- a/locales/locales-pl-PL.xml +++ b/locales/locales-pl-PL.xml @@ -1,6 +1,12 @@ + + pAo + + + Michal + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-pt-BR.xml b/locales/locales-pt-BR.xml --- a/locales/locales-pt-BR.xml +++ b/locales/locales-pt-BR.xml @@ -1,8 +1,14 @@ - 2016-05-16T00:00:00+03:00 + + José Antonio Meira da Rocha + + + Meira da Rocha + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License + 2016-05-16T00:00:00+03:00 diff --git a/locales/locales-sk-SK.xml b/locales/locales-sk-SK.xml --- a/locales/locales-sk-SK.xml +++ b/locales/locales-sk-SK.xml @@ -1,6 +1,12 @@ + + Tomáš Ferianc + + + kohafan + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2014-03-09T22:23:31+00:00 diff --git a/locales/locales-sl-SI.xml b/locales/locales-sl-SI.xml --- a/locales/locales-sl-SI.xml +++ b/locales/locales-sl-SI.xml @@ -1,6 +1,12 @@ + + Kristof Ostir + + + ratek1 + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2014-11-06T09:41:02+00:00 @@ -32,7 +38,7 @@ izdaje izd. - in dr. + in sod. pred izidom od isto diff --git a/locales/locales-sv-SE.xml b/locales/locales-sv-SE.xml --- a/locales/locales-sv-SE.xml +++ b/locales/locales-sv-SE.xml @@ -1,6 +1,18 @@ + + torfeur + + + Sylvester Keil + + + Sebastian Karcher + + + Ulf Harnhammar + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-th-TH.xml b/locales/locales-th-TH.xml --- a/locales/locales-th-TH.xml +++ b/locales/locales-th-TH.xml @@ -1,6 +1,9 @@ + + Dusit Laohasinnarong + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-tr-TR.xml b/locales/locales-tr-TR.xml --- a/locales/locales-tr-TR.xml +++ b/locales/locales-tr-TR.xml @@ -1,6 +1,19 @@ + + ekizyener + + + Binici + + + cengiza + + + Muhammet Tarakçı + muhammettarakci@gmail.com + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 @@ -22,29 +35,29 @@ anonim anonim de - available at + erişim adresi by - circa - c. - kaynak + yaklaşık + yakl. + a.yer baskı baskı - baskı + bs vd. gelecek - adresinden erişildi + gönderen a.g.e. içinde basımda internet - kişisel iletişim + mülakat mektup tarih yok - y.y. + t.y. çevrimiçi - sunulan + program adı: kaynak kaynaklar @@ -53,8 +66,8 @@ kay. kay. - tarihinde - scale + geliş tarihi + ölçek versiyon @@ -66,7 +79,7 @@ ” ‘ ’ - – + - . @@ -106,7 +119,7 @@ sayı - sayılar + sayı satır @@ -117,16 +130,16 @@ notlar - opus - opera + eser + eserler sayfa sayfalar - sayfa - sayfalar + sayfa sayısı + sayfa sayıları paragraf @@ -141,12 +154,12 @@ bölümler - sub verbo - sub verbis + madde + maddeler - dize - dizeler + ayet + ayetler cilt @@ -158,11 +171,11 @@ böl. süt. şek. - f. - sayı + fl. + sy satır n. - op. + a.yer s. ss. @@ -172,11 +185,11 @@ ss. par. - kıs. - böl. + ksm. + blm. - s.v. - s.vv. + md. + md. v. @@ -207,12 +220,12 @@ editörler - editör - editörler + sorumlu editör + sorumlu editörler - illüstrasyon - illüstrasyon + çizen + çizenler çeviren @@ -233,12 +246,12 @@ ed. - ed. - ed. + sor.ed. + sor.ed. - ill. - ill. + çzm. + çzm. çev. @@ -250,22 +263,22 @@ - + kitap editörü direktör editör - düzenleyen - illustrated by - Röportaj yapan - to - by + sorumlu editör + çizen + röportaj yapan + alıcı + tanıtım yazarı çeviren düzenleyen & çeviren by dir. ed. - ed. - illüs. + sor.ed. + çizen çev. ed. & çev. diff --git a/locales/locales-vi-VN.xml b/locales/locales-vi-VN.xml --- a/locales/locales-vi-VN.xml +++ b/locales/locales-vi-VN.xml @@ -1,6 +1,9 @@ + + dowens76 + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2012-07-04T23:31:02+00:00 diff --git a/locales/locales-zh-CN.xml b/locales/locales-zh-CN.xml --- a/locales/locales-zh-CN.xml +++ b/locales/locales-zh-CN.xml @@ -1,6 +1,15 @@ + + rongls + + + sati-bodhi + + + Heromyth + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2014-05-15T23:31:02+00:00 diff --git a/locales/locales-zh-TW.xml b/locales/locales-zh-TW.xml --- a/locales/locales-zh-TW.xml +++ b/locales/locales-zh-TW.xml @@ -1,6 +1,9 @@ + + sati-bodhi + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License 2014-05-15T23:31:02+00:00 diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal --- a/pandoc-citeproc.cabal +++ b/pandoc-citeproc.cabal @@ -1,5 +1,5 @@ name: pandoc-citeproc -version: 0.14.3 +version: 0.14.3.1 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc @@ -108,7 +108,7 @@ build-depends: containers, directory, mtl, bytestring, filepath, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.2, + pandoc >= 1.16 && < 2.3, tagsoup, aeson >= 0.7 && < 1.4, text, @@ -158,7 +158,7 @@ ghc-prof-options: -fprof-auto-exported -rtsopts build-depends: base >= 4, pandoc-citeproc, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.2, + pandoc >= 1.16 && < 2.3, aeson, aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, filepath @@ -187,7 +187,7 @@ Buildable: False build-depends: base >= 4, aeson, directory, text, mtl, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.2, + pandoc >= 1.16 && < 2.3, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.8.7, containers >= 0.4, vector >= 0.10 @@ -209,7 +209,7 @@ Hs-Source-Dirs: tests, compat build-depends: base >= 4, aeson, directory, text, pandoc-types >= 1.17.3 && < 1.18, mtl, - pandoc >= 1.16 && < 2.2, filepath, containers, + pandoc >= 1.16 && < 2.3, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.8.7 ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -threaded diff --git a/tests/chicago-author-date.expected.native b/tests/chicago-author-date.expected.native --- a/tests/chicago-author-date.expected.native +++ b/tests/chicago-author-date.expected.native @@ -19,6 +19,6 @@ [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]] ,Div ("ref-item2",[],[]) - [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:33\8211\&34."]] + [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:",Space,Str "33\8211\&34."]] ,Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Str "and",Space,Str "Jenny",Space,Str "Roe.",Space,Str "2007.",Space,Str "\8220Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet.\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith.",Space,Str "Oxford:",Space,Str "Oxford",Space,Str "University",Space,Str "Press."]]]] diff --git a/tests/issue307.expected.native b/tests/issue307.expected.native --- a/tests/issue307.expected.native +++ b/tests/issue307.expected.native @@ -2,4 +2,4 @@ [Para [Str "Bonjour",Cite [Citation {citationId = "bazin_cybernetique_1954", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Bazin",Space,Str "1954)"],Space,Str "!"] ,Div ("refs",["references"],[]) [Div ("ref-bazin_cybernetique_1954",[],[]) - [Para [Str "Bazin,",Space,Str "Andr\233.",Space,Str "1954.",Space,Str "\171\160La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte\160\187.",Space,Emph [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"],Str ",",Space,Str "n\7506",Space,Str "36",Space,Str "(juin):22\8209\&27."]]]] + [Para [Str "Bazin,",Space,Str "Andr\233.",Space,Str "1954.",Space,Str "\171\160La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte\160\187.",Space,Emph [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"],Str ",",Space,Str "n\7506",Space,Str "36",Space,Str "(juin):",Space,Str "22\8209\&27."]]]] diff --git a/tests/issue51.expected.native b/tests/issue51.expected.native --- a/tests/issue51.expected.native +++ b/tests/issue51.expected.native @@ -2,6 +2,6 @@ [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Doe",Space,Str "(1987\8211\&1988)"],Str ";",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Roe",Space,Str "(1987)"]] ,Div ("refs",["references"],[]) [Div ("ref-item1",[],[]) - [Para [Str "Doe,",Space,Str "John.",Space,Str "1987\8211\&1988.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "3:12\8211\&34."]] + [Para [Str "Doe,",Space,Str "John.",Space,Str "1987\8211\&1988.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "3:",Space,Str "12\8211\&34."]] ,Div ("ref-item2",[],[]) - [Para [Str "Roe,",Space,Str "Ron.",Space,Str "1987.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "4:12\8211\&34."]]]] + [Para [Str "Roe,",Space,Str "Ron.",Space,Str "1987.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "4:",Space,Str "12\8211\&34."]]]] diff --git a/tests/issue64.expected.native b/tests/issue64.expected.native --- a/tests/issue64.expected.native +++ b/tests/issue64.expected.native @@ -3,6 +3,6 @@ [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]] ,Div ("ref-item2",[],[]) - [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:33\8211\&34."]] + [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:",Space,Str "33\8211\&34."]] ,Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Str "and",Space,Str "Jenny",Space,Str "Roe.",Space,Str "2007.",Space,Str "\8220Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet.\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith.",Space,Str "Oxford:",Space,Str "Oxford",Space,Str "University",Space,Str "Press."]]]] diff --git a/tests/issue70.expected.native b/tests/issue70.expected.native --- a/tests/issue70.expected.native +++ b/tests/issue70.expected.native @@ -4,4 +4,4 @@ [Div ("ref-bruun:2009samuel",[],[]) [Para [Str "Dinkova-Bruun,",Space,Str "Greti.",Space,Str "2009.",Space,Str "\8220Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?\8221",Space,Str "In",Space,Emph [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Jos\233",Space,Str "Francisco",Space,Str "Meirinhos",Space,Str "and",Space,Str "Olga",Space,Str "Weijers,",Space,Str "155\8211\&74.",Space,Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge",Space,Str "50.",Space,Str "Louvain-la-Neuve:",Space,Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales."]] ,Div ("ref-thorndike:1955unde",[],[]) - [Para [Str "Thorndike,",Space,Str "Lynn.",Space,Str "1955.",Space,Str "\8220Unde",Space,Str "versus.\8221",Space,Emph [Str "Traditio"],Space,Str "11:163\8211\&93."]]]] + [Para [Str "Thorndike,",Space,Str "Lynn.",Space,Str "1955.",Space,Str "\8220Unde",Space,Str "versus.\8221",Space,Emph [Str "Traditio"],Space,Str "11:",Space,Str "163\8211\&93."]]]]