packages feed

pandoc-citeproc 0.9 → 0.9.1

raw patch · 61 files changed

+190/−144 lines, 61 filesdep ~aesondep ~pandoc

Dependency ranges changed: aeson, pandoc

Files

changelog view
@@ -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.
chicago-author-date.csl view
@@ -116,7 +116,7 @@         <substitute>           <names variable="editor"/>           <names variable="translator"/>-          <names variable="director"/>          +          <names variable="director"/>           <text macro="substitute-title"/>           <text macro="title"/>         </substitute>@@ -130,7 +130,7 @@       <substitute>         <names variable="editor"/>         <names variable="translator"/>-        <names variable="director"/>          +        <names variable="director"/>         <text macro="substitute-title"/>         <text macro="title"/>       </substitute>
locales/locales-af-ZA.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">onder redaksie van</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">red</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ar.xml view
@@ -69,7 +69,7 @@     <term name="page-range-delimiter">–</term>      <!-- ORDINALS -->-    <term name="ordinal"/>+    <term name="ordinal"></term>      <!-- LONG ORDINALS -->     <term name="long-ordinal-01">الاول</term>@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">تحرير</term>     <term name="editorial-director" form="verb">اعداد</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">اعداد وترجمة</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">تحرير</term>     <term name="editorial-director" form="verb-short">اشرف على الطبعة</term>
locales/locales-bg-BG.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">редактиран от</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ред</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ca-AD.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">per</term>     <term name="director" form="verb">dirigit per</term>     <term name="editor" form="verb">editat per</term>     <term name="editorial-director" form="verb">editat per</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">editat i traduït per</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">per</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-cs-CZ.xml view
@@ -251,6 +251,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">řídil</term>     <term name="editor" form="verb">editoval</term>     <term name="editorial-director" form="verb">editoval</term>@@ -262,7 +263,6 @@     <term name="editortranslator" form="verb">editoval a přeložil</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"></term>     <term name="director" form="verb-short">řed.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-cy-GB.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">gan</term>     <term name="director" form="verb">cyfarwyddwyd gan</term>     <term name="editor" form="verb">golygwyd gan</term>     <term name="editorial-director" form="verb">cyfarwyddwyd a golygwyd gan</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">golygwyd a chyfieithwyd gan</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">gan</term>     <term name="director" form="verb-short">cyf. gan</term>     <term name="editor" form="verb-short">gol. gan</term>     <term name="editorial-director" form="verb-short">cyf.-gol. gan</term>
locales/locales-da-DK.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">af</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">redigeret af</term>     <term name="editorial-director" form="verb">redigeret af</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">redigeret &amp; oversat af</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">af</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">red.</term>     <term name="editorial-director" form="verb-short">red.</term>
locales/locales-de-AT.xml view
@@ -199,20 +199,24 @@      <!-- LONG ROLE FORMS -->     <term name="director">-      <single>director</single>-      <multiple>directors</multiple>+      <single>Regisseur</single>+      <multiple>Regisseure</multiple>     </term>     <term name="editor">       <single>Herausgeber</single>       <multiple>Herausgeber</multiple>     </term>+    <term name="collection-editor">+      <single>Reihenherausgeber</single>+      <multiple>Reihenherausgeber</multiple>+    </term>     <term name="editorial-director">       <single>Herausgeber</single>       <multiple>Herausgeber</multiple>     </term>     <term name="illustrator">-      <single>illustrator</single>-      <multiple>illustrators</multiple>+      <single>Illustrator</single>+      <multiple>Illustratoren</multiple>     </term>     <term name="translator">       <single>Übersetzer</single>@@ -232,6 +236,10 @@       <single>Hrsg.</single>       <multiple>Hrsg.</multiple>     </term>+    <term name="collection-editor" form="short">+      <single>Hrsg.</single>+      <multiple>Hrsg.</multiple>+    </term>     <term name="editorial-director" form="short">       <single>Hrsg.</single>       <multiple>Hrsg.</multiple>@@ -250,10 +258,12 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">von</term>     <term name="director" form="verb">Regie von</term>     <term name="editor" form="verb">herausgegeben von</term>+    <term name="collection-editor" form="verb">herausgegeben von</term>     <term name="editorial-director" form="verb">herausgegeben von</term>-    <term name="illustrator" form="verb">illustriert by</term>+    <term name="illustrator" form="verb">illustriert von</term>     <term name="interviewer" form="verb">interviewt von</term>     <term name="recipient" form="verb">an</term>     <term name="reviewed-author" form="verb">von</term>@@ -261,9 +271,9 @@     <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">von</term>     <term name="director" form="verb-short">Reg.</term>     <term name="editor" form="verb-short">hg. von</term>+    <term name="collection-editor" form="verb-short">hg. von</term>     <term name="editorial-director" form="verb-short">hg. von</term>     <term name="illustrator" form="verb-short">illus. von</term>     <term name="translator" form="verb-short">übers. von</term>
locales/locales-de-CH.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">von</term>     <term name="director" form="verb">Regie von</term>     <term name="editor" form="verb">herausgegeben von</term>     <term name="editorial-director" form="verb">herausgegeben von</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">von</term>     <term name="director" form="verb-short">Reg.</term>     <term name="editor" form="verb-short">hg. von</term>     <term name="editorial-director" form="verb-short">hg. von</term>
locales/locales-de-DE.xml view
@@ -258,6 +258,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">von</term>     <term name="director" form="verb">Regie von</term>     <term name="editor" form="verb">herausgegeben von</term>     <term name="collection-editor" form="verb">herausgegeben von</term>@@ -270,7 +271,6 @@     <term name="editortranslator" form="verb">herausgegeben und übersetzt von</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">von</term>     <term name="director" form="verb-short">Reg.</term>     <term name="editor" form="verb-short">hg. von</term>     <term name="collection-editor" form="verb-short">hg. von</term>
locales/locales-el-GR.xml view
@@ -252,6 +252,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">στον συλλ. τόμο</term>     <term name="director" form="verb">διεύθυνση</term>     <term name="editor" form="verb">επιμέλεια</term>     <term name="editorial-director" form="verb">διεύθυνση σειράς</term>@@ -263,7 +264,6 @@     <term name="editortranslator" form="verb">μετάφραση και επιμέλεια</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">στον συλλ. τόμο</term>     <term name="director" form="verb-short">διευθ.</term>     <term name="editor" form="verb-short">επιμέλ.</term>     <term name="editorial-director" form="verb-short">δ/νση σειράς</term>
locales/locales-en-GB.xml view
@@ -2,7 +2,7 @@ <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-GB">   <info>     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>-    <updated>2015-09-21T23:31:02+00:00</updated>+    <updated>2015-10-10T23:31:02+00:00</updated>   </info>   <style-options punctuation-in-quote="false"/>   <date form="text">@@ -136,7 +136,7 @@     </term>     <term name="paragraph">       <single>paragraph</single>-      <multiple>paragraph</multiple>+      <multiple>paragraphs</multiple>     </term>     <term name="part">       <single>part</single>@@ -292,6 +292,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">edited by</term>@@ -303,7 +304,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir. by</term>     <term name="editor" form="verb-short">ed. by</term>     <term name="editorial-director" form="verb-short">ed. by</term>
locales/locales-en-US.xml view
@@ -2,7 +2,7 @@ <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="en-US">   <info>     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>-    <updated>2015-09-21T23:31:02+00:00</updated>+    <updated>2015-10-10T23:31:02+00:00</updated>   </info>   <style-options punctuation-in-quote="true"/>   <date form="text">@@ -136,7 +136,7 @@     </term>     <term name="paragraph">       <single>paragraph</single>-      <multiple>paragraph</multiple>+      <multiple>paragraphs</multiple>     </term>     <term name="part">       <single>part</single>@@ -292,6 +292,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">edited by</term>@@ -303,7 +304,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir. by</term>     <term name="editor" form="verb-short">ed. by</term>     <term name="editorial-director" form="verb-short">ed. by</term>
locales/locales-es-CL.xml view
@@ -254,6 +254,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">de</term>     <term name="director" form="verb">dirigido por</term>     <term name="editor" form="verb">editado por</term>     <term name="editorial-director" form="verb">coordinado por</term>@@ -265,7 +266,6 @@     <term name="editortranslator" form="verb">editado y traducido por</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">de</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">coord.</term>
locales/locales-es-ES.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">de</term>     <term name="director" form="verb">dirigido por</term>     <term name="editor" form="verb">editado por</term>     <term name="editorial-director" form="verb">editado por</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">editado y traducido por</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">de</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-es-MX.xml view
@@ -295,6 +295,7 @@     </term>          <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">de</term>     <term name="director" form="verb">dirigido por</term>     <term name="editor" form="verb">editado por</term>     <term name="editorial-director" form="verb">coordinado por</term>@@ -306,7 +307,6 @@     <term name="editortranslator" form="verb">editado y traducido por</term>          <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">de</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">coord.</term>
locales/locales-et-EE.xml view
@@ -21,9 +21,9 @@     <term name="and others">ja teised</term>     <term name="anonymous">anonüümne</term>     <term name="anonymous" form="short">anon</term>-    <term name="at"/>+    <term name="at"></term>     <term name="available at">available at</term>-    <term name="by"/>+    <term name="by"></term>     <term name="circa">umbes</term>     <term name="circa" form="short">u</term>     <term name="cited">tsiteeritud</term>@@ -34,9 +34,9 @@     <term name="edition" form="short">tr</term>     <term name="et-al">et al.</term>     <term name="forthcoming">ilmumisel</term>-    <term name="from"/>+    <term name="from"></term>     <term name="ibid">ibid.</term>-    <term name="in"/>+    <term name="in"></term>     <term name="in press">trükis</term>     <term name="internet">internet</term>     <term name="interview">intervjuu</term>@@ -250,18 +250,18 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">toimetanud</term>     <term name="editorial-director" form="verb">toimetanud</term>     <term name="illustrator" form="verb">illustrated by</term>     <term name="interviewer" form="verb">intervjueerinud</term>-    <term name="recipient" form="verb"/>+    <term name="recipient" form="verb"></term>     <term name="reviewed-author" form="verb">by</term>     <term name="translator" form="verb">tõlkinud</term>     <term name="editortranslator" form="verb">toimetanud &amp; tõlkinud</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">toim</term>     <term name="editorial-director" form="verb-short">toim</term>
locales/locales-eu.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">-(e)k argitaratua</term>     <term name="editorial-director" form="verb">-(e)k argitaratua</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">-(e)k argitaratu eta itzulia</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">arg.</term>     <term name="editorial-director" form="verb-short">arg.</term>
locales/locales-fa-IR.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">توسط</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">ویراسته‌ی</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">ترجمه و ویراسته‌ی</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">توسط</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ویراسته‌ی</term>     <term name="editorial-director" form="verb-short">ویراسته‌ی</term>
locales/locales-fi-FI.xml view
@@ -250,18 +250,18 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">ohjannut</term>     <term name="editor" form="verb">toimittanut</term>     <term name="editorial-director" form="verb">toimittanut</term>     <term name="illustrator" form="verb">kuvittanut</term>     <term name="interviewer" form="verb">haastatellut</term>     <term name="recipient" form="verb">vastaanottaja</term>-    <term name="reviewed-author" form="verb"/>+    <term name="reviewed-author" form="verb"></term>     <term name="translator" form="verb">kääntänyt</term>     <term name="editortranslator" form="verb">toimittanut ja kääntänyt</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">ohj.</term>     <term name="editor" form="verb-short">toim.</term>     <term name="editorial-director" form="verb-short">toim.</term>
locales/locales-fr-CA.xml view
@@ -261,6 +261,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">par</term>     <term name="director" form="verb">réalisé par</term>     <term name="editor" form="verb">édité par</term>     <term name="editorial-director" form="verb">sous la direction de</term>@@ -272,7 +273,6 @@     <term name="editortranslator" form="verb">édité et traduit par</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">par</term>     <term name="director" form="verb-short">réal. par</term>     <term name="editor" form="verb-short">éd. par</term>     <term name="editorial-director" form="verb-short">ss la dir. de</term>
locales/locales-fr-FR.xml view
@@ -261,6 +261,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">par</term>     <term name="director" form="verb">réalisé par</term>     <term name="editor" form="verb">édité par</term>     <term name="editorial-director" form="verb">sous la direction de</term>@@ -272,7 +273,6 @@     <term name="editortranslator" form="verb">édité et traduit par</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">par</term>     <term name="director" form="verb-short">réal. par</term>     <term name="editor" form="verb-short">éd. par</term>     <term name="editorial-director" form="verb-short">ss la dir. de</term>
locales/locales-he-IL.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">בוים ע"י</term>     <term name="editor" form="verb">נערך ע"י</term>     <term name="editorial-director" form="verb">בוים ע"י</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-hr-HR.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">priredio</term>     <term name="editorial-director" form="verb">priredio</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">priredio &amp; preveo by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">prir.</term>     <term name="editorial-director" form="verb-short">prir.</term>
locales/locales-hu-HU.xml view
@@ -21,7 +21,7 @@     <term name="and others">és mások</term>     <term name="anonymous">szerző nélkül</term>     <term name="anonymous" form="short">sz. n.</term>-    <term name="at"/>+    <term name="at"></term>     <term name="available at">elérhető</term>     <term name="by">by</term>     <term name="circa">körülbelül</term>@@ -254,6 +254,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">szerkesztette</term>     <term name="editorial-director" form="verb">edited by</term>@@ -265,7 +266,6 @@     <term name="editortranslator" form="verb">szerkesztette &amp; fordította</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">ig.</term>     <term name="editor" form="verb-short">szerk.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-id-ID.xml view
@@ -256,7 +256,8 @@     </term>      <!-- VERB ROLE FORMS -->-    <term name="director" form="verb">directed by</term>+    <term name="container-author" form="verb">oleh</term>+    <term name="director" form="verb">diarahkan oleh</term>     <term name="editor" form="verb">diedit oleh</term>     <term name="editorial-director" form="verb">diedit oleh</term>     <term name="illustrator" form="verb">diilustrasi oleh</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">disunting &amp; diterjemahkan oleh</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">oleh</term>     <term name="director" form="verb-short">dir. oleh</term>     <term name="editor" form="verb-short">ed. oleh</term>     <term name="editorial-director" form="verb-short">ed. oleh</term>
locales/locales-is-IS.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">eftir</term>     <term name="director" form="verb">leikstýrt af</term>     <term name="editor" form="verb">ritstýrt af</term>     <term name="editorial-director" form="verb">ritstýrt af</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">ritstýrt og þýtt af</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">eftir</term>     <term name="director" form="verb-short">leikstj.</term>     <term name="editor" form="verb-short">ritstj.</term>     <term name="editorial-director" form="verb-short">ritstj.</term>
locales/locales-it-IT.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">di</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">a cura di</term>     <term name="editorial-director" form="verb">edited by</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">a cura di e tradotto da</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">di</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">a c. di</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ja-JP.xml view
@@ -36,7 +36,7 @@     <term name="forthcoming">近刊</term>     <term name="from">から</term>     <term name="ibid">前掲</term>-    <term name="in"/>+    <term name="in"></term>     <term name="in press">in press</term>     <term name="internet">internet</term>     <term name="interview">interview</term>@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">編集者:</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">編集者:</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-km-KH.xml view
@@ -213,7 +213,7 @@       <multiple>editors</multiple>     </term>     <term name="editorial-director">-      <single/>+      <single></single>       <multiple>editors</multiple>     </term>     <term name="illustrator">@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ko-KR.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">편집자:</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-lt-LT.xml view
@@ -28,9 +28,9 @@     <term name="and others">ir kt.</term>     <term name="anonymous">anonimas</term>     <term name="anonymous" form="short">anon.</term>-    <term name="at"/>+    <term name="at"></term>     <term name="available at">available at</term>-    <term name="by"/>+    <term name="by"></term>     <term name="circa">circa</term>     <term name="circa" form="short">ca.</term>     <term name="cited">cituojama pagal</term>@@ -41,9 +41,9 @@     <term name="edition" form="short">leid.</term>     <term name="et-al">et al.</term>     <term name="forthcoming">ruošiamas</term>-    <term name="from"/>+    <term name="from"></term>     <term name="ibid">ibid.</term>-    <term name="in"/>+    <term name="in"></term>     <term name="in press">spaudoje</term>     <term name="internet">prieiga per internetą</term>     <term name="interview">interviu</term>@@ -257,6 +257,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">sudarė</term>     <term name="editorial-director" form="verb">parengė</term>@@ -268,7 +269,6 @@     <term name="editortranslator" form="verb">sudarė ir vertė</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">sud.</term>     <term name="editorial-director" form="verb-short">pareng.</term>
locales/locales-lv-LV.xml view
@@ -27,10 +27,10 @@     <term name="and others">un citi</term>     <term name="anonymous">anonīms</term>     <term name="anonymous" form="short">anon.</term>-    <term name="at"/>+    <term name="at"></term>     <term name="available at">pieejams</term>     <term name="bc">p.m.ē.</term>-    <term name="by"/>+    <term name="by"></term>     <term name="circa">apmēram</term>     <term name="circa" form="short">apm.</term>     <term name="cited">citēts</term>@@ -305,6 +305,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="composer" form="verb">sastādīja</term>     <term name="director" form="verb">vadīja</term>     <term name="editor" form="verb">sagatavoja</term>@@ -316,7 +317,6 @@     <term name="translator" form="verb">tulkoja</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">sast.</term>     <term name="editor" form="verb-short">sag.</term>     <term name="editorial-director" form="verb-short">sag.</term>
locales/locales-mn-MN.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-nb-NO.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">av</term>     <term name="director" form="verb">regissert av</term>     <term name="editor" form="verb">redigert av</term>     <term name="editorial-director" form="verb">redigert av</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">redigert &amp; oversatt av</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">av</term>     <term name="director" form="verb-short">regi</term>     <term name="editor" form="verb-short">red.</term>     <term name="editorial-director" form="verb-short">red.</term>
locales/locales-nl-NL.xml view
@@ -272,6 +272,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">door</term>     <term name="director" form="verb">geregisseerd door</term>     <term name="editor" form="verb">bewerkt door</term>     <term name="editorial-director" form="verb">bewerkt door</term>@@ -283,7 +284,6 @@     <term name="editortranslator" form="verb">bewerkt &amp; vertaald door</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">door</term>     <term name="director" form="verb-short">geregisseerd door</term>     <term name="editor" form="verb-short">bewerkt door</term>     <term name="editorial-director" form="verb-short">bewerkt door</term>
locales/locales-nn-NO.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">av</term>     <term name="director" form="verb">regissert av</term>     <term name="editor" form="verb">redigert av</term>     <term name="editorial-director" form="verb">redigert av</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">redigert &amp; omsett av</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">av</term>     <term name="director" form="verb-short">regi</term>     <term name="editor" form="verb-short">red.</term>     <term name="editorial-director" form="verb-short">red.</term>
locales/locales-pl-PL.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">przez</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">zredagowane przez</term>     <term name="editorial-director" form="verb">zredagowane przez</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">zredagowane i przetłumaczone przez</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">przez</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">red.</term>     <term name="editorial-director" form="verb-short">red.</term>
locales/locales-pt-BR.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">por</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">organizado por</term>     <term name="editorial-director" form="verb">editado por</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">editado &amp; traduzido por</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">por</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">org.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-pt-PT.xml view
@@ -264,6 +264,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">por</term>     <term name="director" form="verb">dirigido por</term>     <term name="editor" form="verb">editado por</term>     <term name="editorial-director" form="verb">editorial de</term>@@ -275,7 +276,6 @@     <term name="editortranslator" form="verb">editado &amp; traduzido por</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">por</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ro-RO.xml view
@@ -74,7 +74,7 @@      <!-- ORDINALS -->     <term name="ordinal">-lea</term>-    <term name="ordinal-01" match="whole-number"/>+    <term name="ordinal-01" match="whole-number"></term>      <!-- LONG ORDINALS -->     <term name="long-ordinal-01">primul</term>@@ -255,6 +255,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">de</term>     <term name="director" form="verb">coordonat de</term>     <term name="editor" form="verb">ediție de</term>     <term name="editorial-director" form="verb">ediție de</term>@@ -266,7 +267,6 @@     <term name="editortranslator" form="verb">ediție &amp; traducere de</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">de</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-ru-RU.xml view
@@ -27,7 +27,7 @@     <term name="anonymous" form="short">анон.</term>     <term name="at">на</term>     <term name="available at">доступно на</term>-    <term name="by"/>+    <term name="by"></term>     <term name="circa">около</term>     <term name="circa" form="short">ок.</term>     <term name="cited">цитируется по</term>@@ -264,18 +264,18 @@      <!-- VERB ROLE FORMS -->     <!-- В этом и следующем разделе приведены наиболее широко используемые термины (например, "под редакцией" вместо "отредактировано"). Единственным недостатком является то, что разные термины требует разного падежа для последующих фамилий -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">режиссировано</term>     <term name="editor" form="verb">под редакцией</term>     <term name="editorial-director" form="verb">под ответственной редакцией</term>     <term name="illustrator" form="verb">иллюстрировано</term>     <term name="interviewer" form="verb">интервью проведено</term>     <term name="recipient" form="verb">к</term>-    <term name="reviewed-author" form="verb"/>+    <term name="reviewed-author" form="verb"></term>     <term name="translator" form="verb">переведено</term>     <term name="editortranslator" form="verb">под редакцией и переведено</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">реж.</term>     <term name="editor" form="verb-short">под ред.</term>     <term name="editorial-director" form="verb-short">под отв. ред.</term>
locales/locales-sk-SK.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">zostavil</term>     <term name="editorial-director" form="verb">zostavil</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">zostavil &amp; preložil</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-sl-SI.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">režiral</term>     <term name="editor" form="verb">uredil</term>     <term name="editorial-director" form="verb">uredil</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">uredil &amp; prevedel</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"></term>     <term name="director" form="verb-short">rež.</term>     <term name="editor" form="verb-short">ured.</term>     <term name="editorial-director" form="verb-short">ured.</term>
locales/locales-sr-RS.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">уредио</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ур.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-sv-SE.xml view
@@ -254,6 +254,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">av</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">redigerad av</term>     <term name="editorial-director" form="verb">edited by</term>@@ -265,7 +266,6 @@     <term name="editortranslator" form="verb">redigerad &amp; översatt av</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">av</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">red.</term>     <term name="editorial-director" form="verb-short">ed.</term>@@ -288,18 +288,18 @@     <term name="month-12">december</term>      <!-- SHORT MONTH FORMS -->-    <term name="month-01" form="short">jan</term>-    <term name="month-02" form="short">feb</term>-    <term name="month-03" form="short">mar</term>-    <term name="month-04" form="short">apr</term>+    <term name="month-01" form="short">jan.</term>+    <term name="month-02" form="short">feb.</term>+    <term name="month-03" form="short">mar.</term>+    <term name="month-04" form="short">apr.</term>     <term name="month-05" form="short">maj</term>-    <term name="month-06" form="short">jun</term>-    <term name="month-07" form="short">jul</term>-    <term name="month-08" form="short">aug</term>-    <term name="month-09" form="short">sep</term>-    <term name="month-10" form="short">okt</term>-    <term name="month-11" form="short">nov</term>-    <term name="month-12" form="short">dec</term>+    <term name="month-06" form="short">juni</term>+    <term name="month-07" form="short">juli</term>+    <term name="month-08" form="short">aug.</term>+    <term name="month-09" form="short">sep.</term>+    <term name="month-10" form="short">okt.</term>+    <term name="month-11" form="short">nov.</term>+    <term name="month-12" form="short">dec.</term>      <!-- SEASONS -->     <term name="season-01">vår</term>
locales/locales-th-TH.xml view
@@ -69,7 +69,7 @@     <term name="page-range-delimiter">–</term>      <!-- ORDINALS -->-    <term name="ordinal"/>+    <term name="ordinal"></term>      <!-- LONG ORDINALS -->     <term name="long-ordinal-01">หนึ่ง</term>@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">โดย</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">เรียบเรียงโดย</term>     <term name="editorial-director" form="verb">เรียบเรียงโดย</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">แปลและเรียบเรียงโดย</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">โดย</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">โดย</term>     <term name="editorial-director" form="verb-short">โดย</term>
locales/locales-tr-TR.xml view
@@ -250,6 +250,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb"></term>     <term name="director" form="verb">direktör</term>     <term name="editor" form="verb">editör</term>     <term name="editorial-director" form="verb">düzenleyen</term>@@ -261,7 +262,6 @@     <term name="editortranslator" form="verb">düzenleyen &amp; çeviren by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short"/>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed.</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-uk-UA.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">by</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">edited by</term>     <term name="editorial-director" form="verb">edited by</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">edited &amp; translated by</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">by</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">ed</term>     <term name="editorial-director" form="verb-short">ed.</term>
locales/locales-vi-VN.xml view
@@ -256,6 +256,7 @@     </term>      <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">bởi</term>     <term name="director" form="verb">directed by</term>     <term name="editor" form="verb">biên tập bởi</term>     <term name="editorial-director" form="verb">biên tập bởi</term>@@ -267,7 +268,6 @@     <term name="editortranslator" form="verb">biên tập &amp; biên dịch bởi</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">bởi</term>     <term name="director" form="verb-short">dir.</term>     <term name="editor" form="verb-short">b.t</term>     <term name="editorial-director" form="verb-short">b.t</term>
locales/locales-zh-CN.xml view
@@ -139,6 +139,7 @@     <term name="editortranslator" form="short">编译</term>          <!-- VERB ROLE FORMS -->+    <term name="container-author" form="verb">著</term>     <term name="director" form="verb">指导</term>     <term name="editor" form="verb">编辑</term>     <term name="editorial-director" form="verb">主编</term>@@ -150,7 +151,6 @@     <term name="editortranslator" form="verb">编译</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">著</term>     <term name="director" form="verb-short">导</term>     <term name="editor" form="verb-short">编</term>     <term name="editorial-director" form="verb-short">主编</term>
locales/locales-zh-TW.xml view
@@ -148,6 +148,7 @@      <!-- VERB ROLE FORMS -->     <term name="author" form="verb">著</term>+    <term name="container-author" form="verb">著</term>     <term name="director" form="verb">指導</term>     <term name="editor" form="verb">編輯</term>     <term name="collection-editor" form="verb">點校</term>@@ -160,7 +161,6 @@     <term name="editortranslator" form="verb">編譯</term>      <!-- SHORT VERB ROLE FORMS -->-    <term name="container-author" form="verb-short">著</term>     <term name="director" form="verb-short">導</term>     <term name="editor" form="verb-short">編</term>     <term name="collection-editor" form="verb-short">校</term>
pandoc-citeproc.cabal view
@@ -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
src/Text/CSL/Eval.hs view
@@ -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
src/Text/CSL/Pandoc.hs view
@@ -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
src/Text/CSL/Reference.hs view
@@ -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 ) 
stack.yaml view
@@ -8,4 +8,4 @@ packages: - '.' extra-deps: []-resolver: lts-3.20+resolver: lts-5.8
+ tests/biblio2yaml/video.biblatex view
@@ -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+...
tests/test-citeproc.hs view
@@ -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]