diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,18 @@
+pandoc-citeproc (0.9.1)
+
+ * Fixed YAML/CSL reference type for motion_picture, etc. (#214).
+ Several CSL reference types (`motion_picture`, `legal_case`, ...)
+ use an underscore instead of a hyphen, and these had been
+ incorrectly rendered by pandoc when translating to YAML/CSL.
+ * Fixed handling of dimension and other 'literal' variables (#213).
+ This also affects call-number, scale, language.
+ * Fixed test-citeproc.
+ * Fixed travis builds to use stack.
+ * Only use -rtsopts for executable.
+ * Allow aeson 0.11.
+ * Allow compilation with pandoc 1.17.
+ * Updated locales and chicago-author-date.csl.
+
pandoc-citeproc (0.9)
* Allow spaces around CSL note fields. Closes #191.
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -116,7 +116,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
diff --git a/locales/locales-af-ZA.xml b/locales/locales-af-ZA.xml
--- a/locales/locales-af-ZA.xml
+++ b/locales/locales-af-ZA.xml
@@ -256,6 +256,7 @@
+ by
directed by
onder redaksie van
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
red
ed.
diff --git a/locales/locales-ar.xml b/locales/locales-ar.xml
--- a/locales/locales-ar.xml
+++ b/locales/locales-ar.xml
@@ -69,7 +69,7 @@
–
-
+
الاول
@@ -250,6 +250,7 @@
+
directed by
تحرير
اعداد
@@ -261,7 +262,6 @@
اعداد وترجمة
-
dir.
تحرير
اشرف على الطبعة
diff --git a/locales/locales-bg-BG.xml b/locales/locales-bg-BG.xml
--- a/locales/locales-bg-BG.xml
+++ b/locales/locales-bg-BG.xml
@@ -256,6 +256,7 @@
+ by
directed by
редактиран от
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ред
ed.
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
@@ -250,6 +250,7 @@
+ per
dirigit per
editat per
editat per
@@ -261,7 +262,6 @@
editat i traduït per
- per
dir.
ed.
ed.
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
@@ -251,6 +251,7 @@
+
řídil
editoval
editoval
@@ -262,7 +263,6 @@
editoval a přeložil
-
řed.
ed.
ed.
diff --git a/locales/locales-cy-GB.xml b/locales/locales-cy-GB.xml
--- a/locales/locales-cy-GB.xml
+++ b/locales/locales-cy-GB.xml
@@ -256,6 +256,7 @@
+ gan
cyfarwyddwyd gan
golygwyd gan
cyfarwyddwyd a golygwyd gan
@@ -267,7 +268,6 @@
golygwyd a chyfieithwyd gan
- gan
cyf. gan
gol. gan
cyf.-gol. gan
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
@@ -250,6 +250,7 @@
+ af
directed by
redigeret af
redigeret af
@@ -261,7 +262,6 @@
redigeret & oversat af
- af
dir.
red.
red.
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
@@ -199,20 +199,24 @@
- director
- directors
+ Regisseur
+ Regisseure
Herausgeber
Herausgeber
+
+ Reihenherausgeber
+ Reihenherausgeber
+
Herausgeber
Herausgeber
- illustrator
- illustrators
+ Illustrator
+ Illustratoren
Übersetzer
@@ -232,6 +236,10 @@
Hrsg.
Hrsg.
+
+ Hrsg.
+ Hrsg.
+
Hrsg.
Hrsg.
@@ -250,10 +258,12 @@
+ von
Regie von
herausgegeben von
+ herausgegeben von
herausgegeben von
- illustriert by
+ illustriert von
interviewt von
an
von
@@ -261,9 +271,9 @@
herausgegeben und übersetzt von
- von
Reg.
hg. von
+ hg. von
hg. von
illus. von
übers. von
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
@@ -250,6 +250,7 @@
+ von
Regie von
herausgegeben von
herausgegeben von
@@ -261,7 +262,6 @@
herausgegeben und übersetzt von
- von
Reg.
hg. von
hg. von
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
@@ -258,6 +258,7 @@
+ von
Regie von
herausgegeben von
herausgegeben von
@@ -270,7 +271,6 @@
herausgegeben und übersetzt von
- von
Reg.
hg. von
hg. von
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
@@ -252,6 +252,7 @@
+ στον συλλ. τόμο
διεύθυνση
επιμέλεια
διεύθυνση σειράς
@@ -263,7 +264,6 @@
μετάφραση και επιμέλεια
- στον συλλ. τόμο
διευθ.
επιμέλ.
δ/νση σειράς
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
@@ -2,7 +2,7 @@
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
- 2015-09-21T23:31:02+00:00
+ 2015-10-10T23:31:02+00:00
@@ -136,7 +136,7 @@
paragraph
- paragraph
+ paragraphs
part
@@ -292,6 +292,7 @@
+ by
directed by
edited by
edited by
@@ -303,7 +304,6 @@
edited & translated by
- by
dir. by
ed. by
ed. by
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
@@ -2,7 +2,7 @@
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License
- 2015-09-21T23:31:02+00:00
+ 2015-10-10T23:31:02+00:00
@@ -136,7 +136,7 @@
paragraph
- paragraph
+ paragraphs
part
@@ -292,6 +292,7 @@
+ by
directed by
edited by
edited by
@@ -303,7 +304,6 @@
edited & translated by
- by
dir. by
ed. by
ed. by
diff --git a/locales/locales-es-CL.xml b/locales/locales-es-CL.xml
--- a/locales/locales-es-CL.xml
+++ b/locales/locales-es-CL.xml
@@ -254,6 +254,7 @@
+ de
dirigido por
editado por
coordinado por
@@ -265,7 +266,6 @@
editado y traducido por
- de
dir.
ed.
coord.
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
@@ -250,6 +250,7 @@
+ de
dirigido por
editado por
editado por
@@ -261,7 +262,6 @@
editado y traducido por
- de
dir.
ed.
ed.
diff --git a/locales/locales-es-MX.xml b/locales/locales-es-MX.xml
--- a/locales/locales-es-MX.xml
+++ b/locales/locales-es-MX.xml
@@ -295,6 +295,7 @@
+ de
dirigido por
editado por
coordinado por
@@ -306,7 +307,6 @@
editado y traducido por
- de
dir.
ed.
coord.
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
@@ -21,9 +21,9 @@
ja teised
anonüümne
anon
-
+
available at
-
+
umbes
u
tsiteeritud
@@ -34,9 +34,9 @@
tr
et al.
ilmumisel
-
+
ibid.
-
+
trükis
internet
intervjuu
@@ -250,18 +250,18 @@
+
directed by
toimetanud
toimetanud
illustrated by
intervjueerinud
-
+
by
tõlkinud
toimetanud & tõlkinud
-
dir.
toim
toim
diff --git a/locales/locales-eu.xml b/locales/locales-eu.xml
--- a/locales/locales-eu.xml
+++ b/locales/locales-eu.xml
@@ -250,6 +250,7 @@
+
directed by
-(e)k argitaratua
-(e)k argitaratua
@@ -261,7 +262,6 @@
-(e)k argitaratu eta itzulia
-
dir.
arg.
arg.
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
@@ -256,6 +256,7 @@
+ توسط
directed by
edited by
ویراستهی
@@ -267,7 +268,6 @@
ترجمه و ویراستهی
- توسط
dir.
ویراستهی
ویراستهی
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
@@ -250,18 +250,18 @@
+
ohjannut
toimittanut
toimittanut
kuvittanut
haastatellut
vastaanottaja
-
+
kääntänyt
toimittanut ja kääntänyt
-
ohj.
toim.
toim.
diff --git a/locales/locales-fr-CA.xml b/locales/locales-fr-CA.xml
--- a/locales/locales-fr-CA.xml
+++ b/locales/locales-fr-CA.xml
@@ -261,6 +261,7 @@
+ par
réalisé par
édité par
sous la direction de
@@ -272,7 +273,6 @@
édité et traduit par
- par
réal. par
éd. par
ss la dir. de
diff --git a/locales/locales-fr-FR.xml b/locales/locales-fr-FR.xml
--- a/locales/locales-fr-FR.xml
+++ b/locales/locales-fr-FR.xml
@@ -261,6 +261,7 @@
+ par
réalisé par
édité par
sous la direction de
@@ -272,7 +273,6 @@
édité et traduit par
- par
réal. par
éd. par
ss la dir. de
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
@@ -256,6 +256,7 @@
+ by
בוים ע"י
נערך ע"י
בוים ע"י
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ed
ed.
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
@@ -256,6 +256,7 @@
+ by
directed by
priredio
priredio
@@ -267,7 +268,6 @@
priredio & preveo by
- by
dir.
prir.
prir.
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
@@ -21,7 +21,7 @@
és mások
szerző nélkül
sz. n.
-
+
elérhető
by
körülbelül
@@ -254,6 +254,7 @@
+ by
directed by
szerkesztette
edited by
@@ -265,7 +266,6 @@
szerkesztette & fordította
- by
ig.
szerk.
ed.
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
@@ -256,7 +256,8 @@
- directed by
+ oleh
+ diarahkan oleh
diedit oleh
diedit oleh
diilustrasi oleh
@@ -267,7 +268,6 @@
disunting & diterjemahkan oleh
- oleh
dir. oleh
ed. oleh
ed. oleh
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
@@ -250,6 +250,7 @@
+ eftir
leikstýrt af
ritstýrt af
ritstýrt af
@@ -261,7 +262,6 @@
ritstýrt og þýtt af
- eftir
leikstj.
ritstj.
ritstj.
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
@@ -250,6 +250,7 @@
+ di
directed by
a cura di
edited by
@@ -261,7 +262,6 @@
a cura di e tradotto da
- di
dir.
a c. di
ed.
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
@@ -36,7 +36,7 @@
近刊
から
前掲
-
+
in press
internet
interview
@@ -256,6 +256,7 @@
+ by
directed by
編集者：
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
編集者：
ed.
diff --git a/locales/locales-km-KH.xml b/locales/locales-km-KH.xml
--- a/locales/locales-km-KH.xml
+++ b/locales/locales-km-KH.xml
@@ -213,7 +213,7 @@
editors
-
+
editors
@@ -256,6 +256,7 @@
+ by
directed by
edited by
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ed.
ed.
diff --git a/locales/locales-ko-KR.xml b/locales/locales-ko-KR.xml
--- a/locales/locales-ko-KR.xml
+++ b/locales/locales-ko-KR.xml
@@ -256,6 +256,7 @@
+ by
directed by
편집자：
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ed
ed.
diff --git a/locales/locales-lt-LT.xml b/locales/locales-lt-LT.xml
--- a/locales/locales-lt-LT.xml
+++ b/locales/locales-lt-LT.xml
@@ -28,9 +28,9 @@
ir kt.
anonimas
anon.
-
+
available at
-
+
circa
ca.
cituojama pagal
@@ -41,9 +41,9 @@
leid.
et al.
ruošiamas
-
+
ibid.
-
+
spaudoje
prieiga per internetą
interviu
@@ -257,6 +257,7 @@
+
directed by
sudarė
parengė
@@ -268,7 +269,6 @@
sudarė ir vertė
-
dir.
sud.
pareng.
diff --git a/locales/locales-lv-LV.xml b/locales/locales-lv-LV.xml
--- a/locales/locales-lv-LV.xml
+++ b/locales/locales-lv-LV.xml
@@ -27,10 +27,10 @@
un citi
anonīms
anon.
-
+
pieejams
p.m.ē.
-
+
apmēram
apm.
citēts
@@ -305,6 +305,7 @@
+
sastādīja
vadīja
sagatavoja
@@ -316,7 +317,6 @@
tulkoja
-
sast.
sag.
sag.
diff --git a/locales/locales-mn-MN.xml b/locales/locales-mn-MN.xml
--- a/locales/locales-mn-MN.xml
+++ b/locales/locales-mn-MN.xml
@@ -256,6 +256,7 @@
+ by
directed by
edited by
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ed
ed.
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
@@ -250,6 +250,7 @@
+ av
regissert av
redigert av
redigert av
@@ -261,7 +262,6 @@
redigert & oversatt av
- av
regi
red.
red.
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
@@ -272,6 +272,7 @@
+ door
geregisseerd door
bewerkt door
bewerkt door
@@ -283,7 +284,6 @@
bewerkt & vertaald door
- door
geregisseerd door
bewerkt door
bewerkt door
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
@@ -250,6 +250,7 @@
+ av
regissert av
redigert av
redigert av
@@ -261,7 +262,6 @@
redigert & omsett av
- av
regi
red.
red.
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
@@ -250,6 +250,7 @@
+ przez
directed by
zredagowane przez
zredagowane przez
@@ -261,7 +262,6 @@
zredagowane i przetłumaczone przez
- przez
dir.
red.
red.
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
@@ -250,6 +250,7 @@
+ por
directed by
organizado por
editado por
@@ -261,7 +262,6 @@
editado & traduzido por
- por
dir.
org.
ed.
diff --git a/locales/locales-pt-PT.xml b/locales/locales-pt-PT.xml
--- a/locales/locales-pt-PT.xml
+++ b/locales/locales-pt-PT.xml
@@ -264,6 +264,7 @@
+ por
dirigido por
editado por
editorial de
@@ -275,7 +276,6 @@
editado & traduzido por
- por
dir.
ed.
ed.
diff --git a/locales/locales-ro-RO.xml b/locales/locales-ro-RO.xml
--- a/locales/locales-ro-RO.xml
+++ b/locales/locales-ro-RO.xml
@@ -74,7 +74,7 @@
-lea
-
+
primul
@@ -255,6 +255,7 @@
+ de
coordonat de
ediție de
ediție de
@@ -266,7 +267,6 @@
ediție & traducere de
- de
dir.
ed.
ed.
diff --git a/locales/locales-ru-RU.xml b/locales/locales-ru-RU.xml
--- a/locales/locales-ru-RU.xml
+++ b/locales/locales-ru-RU.xml
@@ -27,7 +27,7 @@
анон.
на
доступно на
-
+
около
ок.
цитируется по
@@ -264,18 +264,18 @@
+
режиссировано
под редакцией
под ответственной редакцией
иллюстрировано
интервью проведено
к
-
+
переведено
под редакцией и переведено
-
реж.
под ред.
под отв. ред.
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
@@ -256,6 +256,7 @@
+ by
directed by
zostavil
zostavil
@@ -267,7 +268,6 @@
zostavil & preložil
- by
dir.
ed.
ed.
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
@@ -250,6 +250,7 @@
+
režiral
uredil
uredil
@@ -261,7 +262,6 @@
uredil & prevedel
-
rež.
ured.
ured.
diff --git a/locales/locales-sr-RS.xml b/locales/locales-sr-RS.xml
--- a/locales/locales-sr-RS.xml
+++ b/locales/locales-sr-RS.xml
@@ -256,6 +256,7 @@
+ by
directed by
уредио
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ур.
ed.
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
@@ -254,6 +254,7 @@
+ av
directed by
redigerad av
edited by
@@ -265,7 +266,6 @@
redigerad & översatt av
- av
dir.
red.
ed.
@@ -288,18 +288,18 @@
december
- jan
- feb
- mar
- apr
+ jan.
+ feb.
+ mar.
+ apr.
maj
- jun
- jul
- aug
- sep
- okt
- nov
- dec
+ juni
+ juli
+ aug.
+ sep.
+ okt.
+ nov.
+ dec.
vår
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
@@ -69,7 +69,7 @@
–
-
+
หนึ่ง
@@ -250,6 +250,7 @@
+ โดย
directed by
เรียบเรียงโดย
เรียบเรียงโดย
@@ -261,7 +262,6 @@
แปลและเรียบเรียงโดย
- โดย
dir.
โดย
โดย
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
@@ -250,6 +250,7 @@
+
direktör
editör
düzenleyen
@@ -261,7 +262,6 @@
düzenleyen & çeviren by
-
dir.
ed.
ed.
diff --git a/locales/locales-uk-UA.xml b/locales/locales-uk-UA.xml
--- a/locales/locales-uk-UA.xml
+++ b/locales/locales-uk-UA.xml
@@ -256,6 +256,7 @@
+ by
directed by
edited by
edited by
@@ -267,7 +268,6 @@
edited & translated by
- by
dir.
ed
ed.
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
@@ -256,6 +256,7 @@
+ bởi
directed by
biên tập bởi
biên tập bởi
@@ -267,7 +268,6 @@
biên tập & biên dịch bởi
- bởi
dir.
b.t
b.t
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
@@ -139,6 +139,7 @@
编译
+ 著
指导
编辑
主编
@@ -150,7 +151,6 @@
编译
- 著
导
编
主编
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
@@ -148,6 +148,7 @@
著
+ 著
指導
編輯
點校
@@ -160,7 +161,6 @@
編譯
- 著
導
編
校
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.9
+version: 0.9.1
cabal-version: >= 1.12
synopsis: Supports using pandoc with citeproc
@@ -92,13 +92,13 @@
Prelude
Paths_pandoc_citeproc
ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
- ghc-prof-options: -fprof-auto-exported -rtsopts
+ ghc-prof-options: -fprof-auto-exported
build-depends: containers, directory, mtl,
bytestring, filepath,
pandoc-types >= 1.16 && < 1.17,
- pandoc >= 1.16 && < 1.17,
+ pandoc >= 1.16 && < 1.18,
tagsoup,
- aeson >= 0.7 && < 0.11, text, vector,
+ aeson >= 0.7 && < 0.12, text, vector,
xml-conduit >= 1.2 && < 1.4,
unordered-containers >= 0.2 && < 0.3,
data-default,
@@ -145,7 +145,7 @@
ghc-prof-options: -fprof-auto-exported -rtsopts
build-depends: base >= 4, pandoc-citeproc,
pandoc-types >= 1.16 && < 1.17,
- pandoc >= 1.16 && < 1.17,
+ pandoc >= 1.16 && < 1.18,
aeson,
aeson-pretty, yaml, bytestring, syb, attoparsec, text,
filepath
@@ -164,7 +164,7 @@
Buildable: False
build-depends: base >= 4, aeson, directory, text,
pandoc-types >= 1.16 && < 1.17,
- pandoc >= 1.16 && < 1.17,
+ pandoc >= 1.16 && < 1.18,
filepath,
bytestring, pandoc-citeproc, process, temporary >= 1.1,
yaml >= 0.8.8.7, containers >= 0.4, vector >= 0.10
@@ -178,7 +178,7 @@
Hs-Source-Dirs: tests, prelude
build-depends: base >= 4, aeson, directory, text,
pandoc-types >= 1.16 && < 1.17,
- pandoc >= 1.16 && < 1.17, filepath,
+ pandoc >= 1.16 && < 1.18, filepath,
bytestring, pandoc-citeproc, process, temporary >= 1.1,
yaml >= 0.8.8.7
default-language: Haskell98
diff --git a/src/Text/CSL/Eval.hs b/src/Text/CSL/Eval.hs
--- a/src/Text/CSL/Eval.hs
+++ b/src/Text/CSL/Eval.hs
@@ -26,11 +26,10 @@
import Data.Char ( toLower, isDigit, isLetter )
import Data.Maybe
import Data.String ( fromString )
-import Text.Pandoc.Definition (Inline(Str, Space, Link), nullAttr)
+import Text.Pandoc.Definition (Inline(Str, Link), nullAttr)
import Text.Pandoc.Walk (walk)
import Text.Pandoc.Shared (stringify)
import qualified Data.Text as T
-import Data.Maybe (isNothing)
import Text.CSL.Eval.Common
import Text.CSL.Eval.Output
@@ -204,35 +203,39 @@
, env = (env s)
{names = tail $ names (env s)}}) >> return r
- getVariable f fm s = if isTitleVar s || isTitleShortVar s
- then consumeVariable s >> formatTitle s f fm else
- case map toLower s of
- "year-suffix" -> getStringVar "ref-id" >>= \k ->
- return . return $ OYearSuf [] k [] fm
- "page" -> getStringVar "page" >>= formatRange fm
- "locator" -> getLocVar >>= formatRange fm . snd
- "url" -> getStringVar "url" >>= \k ->
- if null k then return [] else return [Output [OPan [Link nullAttr [Str k] (k,"")]] fm]
- "doi" -> do d <- getStringVar "doi"
- let (prefixPart, linkPart) = T.breakOn (T.pack "http") (T.pack (prefix fm))
- let u = if T.null linkPart
- then "https://doi.org/" ++ d
- else T.unpack linkPart ++ d
- if null d
- then return []
- else return [Output [OPan [Link nullAttr [Str (T.unpack linkPart ++ d)] (u, "")]]
- fm{ prefix = T.unpack prefixPart, suffix = suffix fm }]
- "pmid" -> getStringVar "pmid" >>= \d ->
- if null d
- then return []
- else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pubmed/" ++ d, "")]] fm]
- "pmcid" -> getStringVar "pmcid" >>= \d ->
- if null d
- then return []
- else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pmc/articles/" ++ d, "")]] fm]
- _ -> gets (env >>> options &&& abbrevs) >>= \(opts,as) ->
- getVar [] (getFormattedValue opts as f fm s) s >>= \r ->
- consumeVariable s >> return r
+ getVariable f fm s
+ | isTitleVar s || isTitleShortVar s =
+ consumeVariable s >> formatTitle s f fm
+ | otherwise =
+ case map toLower s of
+ "year-suffix" -> getStringVar "ref-id" >>= \k ->
+ return . return $ OYearSuf [] k [] fm
+ "page" -> getStringVar "page" >>= formatRange fm
+ "locator" -> getLocVar >>= formatRange fm . snd
+ "url" -> getStringVar "url" >>= \k ->
+ if null k then return [] else return [Output [OPan [Link nullAttr [Str k] (k,"")]] fm]
+ "doi" -> do d <- getStringVar "doi"
+ let (prefixPart, linkPart) = T.breakOn (T.pack "http") (T.pack (prefix fm))
+ let u = if T.null linkPart
+ then "https://doi.org/" ++ d
+ else T.unpack linkPart ++ d
+ if null d
+ then return []
+ else return [Output [OPan [Link nullAttr [Str (T.unpack linkPart ++ d)] (u, "")]]
+ fm{ prefix = T.unpack prefixPart, suffix = suffix fm }]
+ "pmid" -> getStringVar "pmid" >>= \d ->
+ if null d
+ then return []
+ else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pubmed/" ++ d, "")]] fm]
+ "pmcid" -> getStringVar "pmcid" >>= \d ->
+ if null d
+ then return []
+ else return [Output [OPan [Link nullAttr [Str d] ("http://www.ncbi.nlm.nih.gov/pmc/articles/" ++ d, "")]] fm]
+ _ -> do (opts, as) <- gets (env >>> options &&& abbrevs)
+ r <- getVar []
+ (getFormattedValue opts as f fm s) s
+ consumeVariable s
+ return r
evalIfThen :: IfThen -> [IfThen] -> [Element] -> State EvalState [Element]
evalIfThen (IfThen c' m' el') ei e = whenElse (evalCond m' c') (return el') rest
@@ -286,6 +289,8 @@
then []
else [Output [OPan $ walk value' ys] fm]
| Just v <- fromValue val :: Maybe String = (:[]) . flip OStr fm . maybe v id . getAbbr $ value v
+ | Just v <- fromValue val :: Maybe Literal = (:[]) . flip OStr fm . maybe (unLiteral v) id . getAbbr $ value $ unLiteral v
+ | Just v <- fromValue val :: Maybe Int = output fm (if v == 0 then [] else show v)
| Just v <- fromValue val :: Maybe Int = output fm (if v == 0 then [] else show v)
| Just v <- fromValue val :: Maybe CNum = if v == 0 then [] else [OCitNum (unCNum v) fm]
| Just v <- fromValue val :: Maybe [RefDate] = formatDate (EvalSorting emptyCite) [] [] sortDate v
diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs
--- a/src/Text/CSL/Pandoc.hs
+++ b/src/Text/CSL/Pandoc.hs
@@ -4,7 +4,7 @@
import Text.Pandoc
import Text.Pandoc.Walk
-import Text.Pandoc.Builder (setMeta, deleteMeta, Inlines, cite)
+import Text.Pandoc.Builder (setMeta, deleteMeta)
import Text.Pandoc.Shared (stringify)
import Text.HTML.TagSoup.Entity (lookupEntity)
import qualified Data.ByteString.Lazy as L
diff --git a/src/Text/CSL/Reference.hs b/src/Text/CSL/Reference.hs
--- a/src/Text/CSL/Reference.hs
+++ b/src/Text/CSL/Reference.hs
@@ -256,12 +256,6 @@
deriving ( Read, Eq, Typeable, Data, Generic )
instance Show RefType where
- -- TODO: clean up this mess. For now, commenting these out makes
- -- motion pictures work properly again.
- -- show MotionPicture = "motion_picture"
- -- show MusicalScore = "musical_score"
- -- show PersonalCommunication = "personal_communication"
- -- show LegalCase = "legal_case"
show x = map toLower . uncamelize . showConstr . toConstr $ x
instance FromJSON RefType where
@@ -275,10 +269,18 @@
parseJSON _ = fail "Could not parse RefType"
instance ToJSON RefType where
- toJSON reftype = toJSON (uncamelize $ show reftype)
+ toJSON reftype = toJSON (handleSpecialCases $ show reftype)
instance ToYaml RefType where
- toYaml r = Y.string (T.pack $ uncamelize $ show r)
+ toYaml r = Y.string (T.pack $ handleSpecialCases $ show r)
+
+-- For some reason, CSL is inconsistent about hyphens and underscores:
+handleSpecialCases :: String -> String
+handleSpecialCases "motion-picture" = "motion_picture"
+handleSpecialCases "musical-score" = "musical_score"
+handleSpecialCases "personal-communication" = "personal_communication"
+handleSpecialCases "legal-case" = "legal_case"
+handleSpecialCases x = x
newtype CNum = CNum { unCNum :: Int } deriving ( Show, Read, Eq, Num, Typeable, Data, Generic )
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,4 +8,4 @@
packages:
- '.'
extra-deps: []
-resolver: lts-3.20
+resolver: lts-5.8
diff --git a/tests/biblio2yaml/video.biblatex b/tests/biblio2yaml/video.biblatex
new file mode 100644
--- /dev/null
+++ b/tests/biblio2yaml/video.biblatex
@@ -0,0 +1,13 @@
+@video{x1,title={blah}}
+@movie{x2,title={blah}}
+
+---
+references:
+- id: x1
+ type: motion_picture
+ title: Blah
+
+- id: x2
+ type: motion_picture
+ title: Blah
+...
diff --git a/tests/test-citeproc.hs b/tests/test-citeproc.hs
--- a/tests/test-citeproc.hs
+++ b/tests/test-citeproc.hs
@@ -12,6 +12,7 @@
import Text.Pandoc.Definition (Inline(Span, Str))
import Text.Pandoc.Generic
import Text.Pandoc.Walk
+import qualified Text.Pandoc.UTF8 as UTF8
import Data.Maybe (mapMaybe)
import Data.Aeson
import Data.Aeson.Types (Parser)
@@ -143,7 +144,7 @@
-- this is designed to mimic the test suite's output:
inlinesToString :: [Inline] -> String
inlinesToString ils =
- writeHtmlString def{ writerWrapText = False }
+ writeHtmlString def{ writerWrapText = WrapNone }
$ bottomUp (concatMap adjustSpans)
$ Pandoc nullMeta [Plain ils]