From 234273a46fa6514e1eb1ed39996cafdb25202551 Mon Sep 17 00:00:00 2001
From: Zeping Lee <zepinglee@gmail.com>
Date: Tue, 12 Mar 2024 16:31:41 +0800
Subject: [PATCH 1/2] Update machine formats

---
 .../machines/bugreports_SingleQuoteXml.json   | 39 +++++++++++++++++++
 .../fullstyles_ChicagoAuthorDateSimple.json   |  2 +-
 .../machines/label_EditorTranslator1.json     |  2 +-
 .../machines/label_MissingReturnsEmpty.json   |  3 +-
 processor.py                                  | 24 ++++++------
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 processor-tests/machines/bugreports_SingleQuoteXml.json

diff --git a/processor-tests/machines/bugreports_SingleQuoteXml.json b/processor-tests/machines/bugreports_SingleQuoteXml.json
new file mode 100644
index 0000000..344a29b
--- /dev/null
+++ b/processor-tests/machines/bugreports_SingleQuoteXml.json
@@ -0,0 +1,39 @@
+{
+    "abbreviations": false,
+    "bibentries": false,
+    "bibsection": false,
+    "citation_items": [
+        [
+            {
+                "id": "ITEM-1"
+            },
+            {
+                "id": "ITEM-2"
+            }
+        ]
+    ],
+    "citations": false,
+    "csl": "<?xml version='1.0' encoding='utf-8'?>\n<style xmlns='http://purl.org/net/xbiblio/csl' class='in-text' default-locale='en' version='1.0' demote-non-dropping-particle='sort-only'>\n  <info>\n    <title>NEMO-Online-en</title>\n    <id>http://www.zotero.org/styles/nemo-online</id>\n    <link href='http://www.zotero.org/styles/nemo-online' rel='self'/>\n    <author>\n      <name>Amine Beyhom, based on Chicago style by Julian Onions</name>\n    </author>\n    <category citation-format='author-date'/>\n    <category field='humanities'/>\n    <updated>2011-08-10T08:04:18+03:00</updated>\n    <summary>In progress</summary>\n    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/ </rights>\n  </info>\n  <locale xml:lang='en'>\n    <style-options punctuation-in-quote='false'/>\n    <terms>\n      <term name='editor' form='verb-short'>ed.</term>\n      <!--     <term name='container-author' form='verb'>by</term>-->\n      <term name='translator' form='verb-short'>trans.</term>\n      <term name='anonymous' form='short'>o.&#160;A.</term>     \n      <term name='editortranslator' form='verb'>\n        <single>ed. and trans. by</single>\n        <multiple>ed. and trans. by</multiple>\n      </term>\n      <term name='translator' form='short'>trans.</term>\n    </terms>\n  </locale>\n  <!-- <locale xml:lang='de'> -->\n  <!-- <terms> -->\n\n  <!-- <term name='no date' form='short'>o.&#160;J.</term> -->\n  <!-- <term name='collection-editor' form='short'>Hrsg.</term> -->\n  <!-- </terms> -->\n  <!-- </locale> -->\n\n\n  <!-- useful things:\n       non breaking space: &#160;\n       narrow no break space: uni202F / &#8239; - but this is not supported widely!\n       em dash: &#8212;\n       \n  -->\n  <!-- definition de la macro 'date' qui sera reprise dans le 'layout' - intext_date est la variable courte citee dans le texte -->\n  <macro name='intext_date'>\n    <date variable='issued'>\n      <date-part name='year'/>\n    </date>\n  </macro>\n\n\n  <macro name='date'>\n    <date variable='issued'>\n\n      <date-part name='year'/>\n      <date-part name='month' form='numeric' prefix='-' range-delimiter='/'/>\n      <date-part name='day' prefix='-' range-delimiter='/'/>\n\n    </date>\n  </macro>\n  <macro name='secondary-contributors'>\n    <!-- choisir entre differentes possibilites (sinon les options sont prises sequentiellement, ou comme un 'assignment' -->\n    <choose>\n      <if type='chapter paper-conference' match='none'>\n        <group delimiter=', '>\n          <choose>\n            <if variable='author'>\n              <names variable='editor'>\n                <label suffix=' ' strip-periods='true'/>\n                <name and='text' delimiter=', '/>\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if variable='author editor' match='any'>\n              <names variable='translator'>\n                <label suffix=' ' strip-periods='true'/>\n                <name and='text' delimiter=', '/>\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if variable='author editor' match='any'>\n              <names variable='composer' prefix='Comp. '>\n                <label suffix=' ' strip-periods='true'/>\n                <name and='text' delimiter=', '/>\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <!-- definition de la macro 'container-contributors' qui pourra etre reprise dans le 'layout' -->\n  <macro name='container-contributors'>\n    <choose>\n      <if type='chapter paper-conference' match='any'>\n        <group prefix=',' delimiter=', '>\n          <choose>\n            <if variable='author'>\n              <names variable='editor'>\n                <label form='verb-short' prefix=' ' text-case='lowercase' suffix=' ' strip-periods='false'/>\n                <name and='text' delimiter=', '/>\n              </names>\n              <choose>\n                <if variable='container-author'>\n                  <group>\n                    <names variable='container-author'>\n                      <label form='verb-short' prefix=' ' text-case='lowercase' suffix=' ' strip-periods='true'/>\n                      <name and='text' delimiter=', '/>\n                    </names>\n                  </group>\n                </if>\n              </choose>\n            </if>\n          </choose>\n          <choose>\n            <if variable='author editor' match='any'>\n              <names variable='translator'>\n                <label form='verb-short' prefix=' ' text-case='lowercase' suffix='. ' strip-periods='true'/>\n                <name and='text' delimiter=', '/>\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <!-- definition de la macro 'anon' qui permet de formater les publications anonymes avec nom d'auteur sous la forme 'Anon.' -->\n  <macro name='anon'>\n    <choose>\n      <if variable='author editor translator composer\t' match='none'>\n        <text term='anonymous' form='short' suffix='. \"hello\" ' text-case=\"capitalize-first\" strip-periods='true'/>\n\t<names variable='author'>\n   \t  <name/>\n    \t  <substitute>\n      \t    <names variable='editor'/>\n      \t    <text macro='title'/>\n    \t  </substitute>\n  \t</names>\n      </if>\n      <else>\n        <text value='Cite with a composer'/>\n      </else>\n    </choose>\n  </macro>\n  <!-- definition de la macro 'editor' qui permet de formater les noms des editeurs (d'actes de colloque, par exemple) -->\n  <macro name='editor'>\n    <names variable='editor'>\n      <name name-as-sort-order='first' and='text' sort-separator=', ' delimiter=', ' delimiter-precedes-last='never'/>\n      <label form='short' prefix=', ' suffix='.' strip-periods='true'/>\n    </names>\n  </macro>\n  <!-- definition de la macro 'translator' qui permet de formater les nom des traducteurs -->\n  <macro name='translator'>\n    <names variable='translator'>\n      <name name-as-sort-order='first' and='text' sort-separator=', ' delimiter=', ' delimiter-precedes-last='never'/>\n      <label form='verb-short' prefix=', ' suffix='.' strip-periods='true'/>\n    </names>\n  </macro>\n  <!-- definition de la macro 'recipient' qui permet de formater les nom des personnes a qui est adressee une lettre ou une communication personnelle-->\n  <macro name='recipient'>\n    <choose>\n      <if type='personal_communication'>\n        <choose>\n          <if variable='genre'>\n            <text variable='genre' text-case='capitalize-first'/>\n          </if>\n\n        </choose>\n      </if>\n    </choose>\n    <names variable='recipient' delimiter=', '>\n      <label form='verb' prefix=' ' text-case='lowercase' suffix=' '/>\n      <name and='text' delimiter=', '/>\n    </names>\n  </macro>\n  <macro name='editor-collection'>\n    <names variable='collection-editor' delimiter=' ; '>\n      <name name-as-sort-order='all' sort-separator=', ' initialize-with='. ' delimiter=' ; '\n\t    delimiter-precedes-last='always' font-variant='small-caps'/>\n      <label form='short' prefix=' (' suffix=')'/>\n      <!-- needed: Label should appear as suffix to EVERY name...!-->\n    </names>\n  </macro>\n  <!-- definition de la macro 'contributors' qui permet de formater les nom des contributeurs (par exemple pour une preface) a un livre ou autre document -->\n\n  <macro name='contributors'>\n    <names variable='author'>\n      <name and='text' name-as-sort-order='first' sort-separator=', ' delimiter=', ' delimiter-precedes-last='never'>\n        <name-part name='family' font-variant='small-caps'/>\n        <name-part name='given' />\n      </name>\n      <label form='verb-short' prefix=', ' suffix='.' text-case='lowercase' strip-periods='true'/>\n      <substitute>\n\t<text macro='editor'/>\n\t<text macro='translator'/>\n      </substitute>\n    </names>\n    <text macro='anon'/>\n    <text macro='recipient' prefix=' @&#160;'/>\n  </macro>\n  <!-- definition de la macro 'contributors-short' qui permet de formater les nom des contributeurs (variante 'courte' - sans le 'recipient' - de la precedente) -->\n  <macro name='contributors-short'>\n    <names variable='author'>\n      <name form='short' and='text' delimiter=', '/>\n      <substitute>\n        <names variable='editor'/>\n        <names variable='translator'/>\n\t<names variable='recipient'/>\n      </substitute>\n    </names>\n    <text macro='anon'/>\n  </macro>\n  <!-- definition de la macro 'interviewers' qui permet de formater les nom des intervieweurs -->\n  <macro name='interviewer'>\n    <names variable='interviewer' delimiter=', '>\n      <label form='verb' prefix=', ' suffix=' '/>\n      <name and='text' delimiter=', '/>\n    </names>\n  </macro>\n  <!-- definition de la macro 'archive' qui permet de formater le nom et le lieu de l'archive qui contient le document, quand elle existe -->\n  <macro name='archive'>\n    <group delimiter='. '>\n      <text variable='archive_location' text-case='capitalize-first'/>\n      <text variable='archive'/>\n      <text variable='archive-place'/>\n    </group>\n  </macro>\n  <!-- d finition de la macro 'publication_date' qui permet de formater la date quand le lieu n'existe pas (par defaut) -->\n  <macro name='publication_date'>\n    <group delimiter='. '>\n      <text variable='publisher-place' prefix=' ('/>\n      <date variable='issued' suffix=')'>\n\t<date-part name='year'/>\n      </date>\n    </group>\n  </macro>\n  <!-- definition de la macro 'access' qui permet de formater le lieu et l'URL du document quand il sort des normes, ainsi que le DOI 'The Digital Object Identifier (DOI ) System is for identifying content objects in the digital environment. DOI names are assigned to any entity for use on digital networks. They are used to provide current information, including where they (or information about them) can be found on the Internet. Information about a digital object may change over time, including where to find it, but its DOI name will not change', cf. http://www.doi.org/ -->\n  <macro name='access'>\n    <group delimiter='. '>\n      <choose>\n        <if type='graphic report' match='any'>\n          <text macro='archive'/>\n        </if>\n        <else-if type='bill book graphic legal_case motion_picture report song article-magazine article-newspaper thesis chapter paper-conference' match='none'>\n          <text macro='archive'/>\n        </else-if>\n      </choose>\n      <!-- <text variable='DOI' prefix='doi&#160;:'/> -->\n      <text variable='DOI' prefix='doi:&#8239;'/>\n      <choose>\n        <if type='manuscript speech webpage entry-encyclopedia motion_picture song paper-conference' match='any'>\n\t  <!--         <text variable='URL' prefix='url:&#8239;'/> -->\n        </if>\n      </choose>\n      <text variable='URL' prefix='url:&#8239;'/>\n    </group>\n  </macro>\n  <macro name='title'>\n    <choose>\n      <if variable='title' match='none'>\n        <choose>\n          <if type='personal_communication' match='none'>\n            <text variable='genre' text-case='capitalize-first'/>\n          </if>\n        </choose>\n      </if>\n      <!-- Titles in italics for books -->\n      <else-if type='bill book legal_case motion_picture report song thesis' match='any'>\n        <text variable='title' font-style='italic'/>\n      </else-if>\n      <!-- titles between quotes for articles -->\n      <else-if type='article-journal article-magazine article-newspaper paper-conference' match='any'>\n        <text variable='title' quotes='true'/>\n      </else-if>\n      <!-- titles between quotes for other publications-->\n      <else>\n        <text variable='title' quotes='true'/>\n      </else>\n    </choose>\n  </macro>\n  <!-- grouping the number of the edition with the shortened name 'ed.' -->\n  <macro name='edition'>\n    <choose>\n      <if type='bill book graphic legal_case motion_picture report song chapter paper-conference' match='any'>\n        <choose>\n          <!-- if the edition is a number, write 'number_ed.' -->\n          <if is-numeric='edition'>\n            <group delimiter=' '>\n              <number variable='edition' form='ordinal'/>\n              <text term='edition' form='short' suffix='.' strip-periods='true'/>\n            </group>\n          </if>\n          <!--else, write the string in 'edition' with a '.' as a suffix -->\n          <else>\n\t    <text term='edition' form='short' suffix='. ' strip-periods='true'/>\n            <text variable='edition' suffix=''/>\n\n          </else>\n        </choose>\n      </if>\n    </choose>\n  </macro>\n  <macro name='locators'>\n    <text variable='issue' prefix=' (' suffix=')'/>\n    <text variable='volume' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true' prefix=' '/>\n    <text variable='number' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true' prefix=' '/>\n    <choose>\n\n      <if type='article-journal'>\n        <text variable='volume' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true' prefix=' '/>\n        <number variable='number'  suffix='.&#160;'  prefix=' '/>\n      </if>\n      <else-if type='legal_case'>\n        <text variable='volume' prefix=', '/>\n\t<text variable='container-title' prefix=' '/>\n        <text variable='page' prefix=' '/>\n      </else-if>\n      <!-- integrating volume numbers in the form 'volume(numeric)/volumes(numeric)' -->\n      <else-if type='bill book graphic legal_case motion_picture report song' match='any'>\n        <group prefix=', '>\n          <group>\n            <text term='volume' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true'/>\n            <number variable='volume' form='numeric' suffix='/'/>\n          </group>\n          <group>\n            <number variable='number-of-volumes' form='numeric'/>\n\t    <text term='volume' form='short' suffix=', ' prefix=' ' plural='true'/>\n          </group>\n        </group>\n      </else-if>\n      <else-if type='chapter paper-conference' match='any'>\n        <choose>\n          <if variable='page' match='none'>\n            <group prefix=', '>\n              <text term='volume' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true'/>\n              <number variable='volume' form='numeric'/>\n            </group>\n          </if>\n        </choose>\n      </else-if>\n    </choose>\n  </macro>\n  <macro name='volume_locators'>\n    <choose>\n      <if type='article-journal'>\n\t<text variable='volume'  text-case='capitalize-first' font-style='italic'  prefix='&#160;' />\n      </if>\n      <else-if type='legal_case'>\n        <text variable='volume' prefix=', '/>\n        <text variable='container-title' prefix=' '/>\n        <text variable='page' prefix=' '/>\n      </else-if>\n      <else-if type='song'>\n        <text variable='volume' prefix=' (track ' suffix=')'/>\n        <text variable='container-title' prefix=' '/>\n        <text variable='page' prefix=' '/>\n      </else-if>\n      <!-- integrating volume numbers in the form 'volume(numeric)/volumes(numeric)' -->\n      <else-if type='bill book graphic legal_case motion_picture report entry-encyclopedia' match='any'>\n        <group prefix=' '>\n          <group>\n\t    <!-- <text term='volume' form='short' suffix='.&#160;' strip-periods='true'/> -->\n            <number variable='volume' form='numeric' suffix='/' font-style='italic'/>\n          </group>\n          <group>\n            <number variable='number-of-volumes' form='numeric' font-style='italic'/>\n\t    <text term='volume' form='short' suffix=')' prefix=' (' plural='true'/>\n          </group>\n        </group>\n      </else-if>\n      <else-if type='chapter paper-conference' match='any'>\n        <choose>\n          <if variable='page' match='none'>\n            <group prefix=', '>\n              <text term='volume' form='short' text-case='capitalize-first' suffix='.&#160;' strip-periods='true'/>\n              <number variable='volume' form='numeric'/>\n            </group>\n          </if>\n        </choose>\n      </else-if>\n    </choose>\n    <text variable='issue' font-style='italic' prefix=' ' suffix=''/>\n  </macro>\n\n  <macro name='locators-chapter'>\n    <choose>\n      <if type='chapter paper-conference' match='any'>\n        <choose>\n          <if variable='page'>\n            <group prefix=', '>\n              <text variable='volume' suffix=','/>\n            </group>\n          </if>\n        </choose>\n      </if>\n    </choose>\n  </macro>\n  <macro name='locators-article'>\n    <choose>\n      <if type='article-newspaper'>\n        <group prefix=', ' delimiter=', '>\n          <group>\n            <text variable='edition' suffix=' '/>\n            <text term='edition' prefix=' '/>\n          </group>\n          <group>\n            <text term='section' form='short' suffix='. ' strip-periods='true'/>\n            <text variable='section'/>\n          </group>\n        </group>\n      </if>\n      <!-- <else-if type='article-journal'>\n\t   <text variable='page' prefix=', '/>\n\t   </else-if> -->\n    </choose>\n  </macro>\n  <macro name='point-locators'>\n    <choose>\n      <if variable='locator'>\n        <choose>\n          <if locator='page' match='none'>\n            <choose>\n              <if type='bill book graphic legal_case motion_picture report song' match='any'>\n                <choose>\n                  <if variable='volume'>\n                    <group>\n                      <text term='volume' form='short' text-case='lowercase' suffix='.&#160;' strip-periods='true'/>\n                      <number variable='volume' prefix='v. ' form='numeric'/>\n                      <label variable='locator' form='short' prefix=', p.&#8239;' suffix=' '/>\n                    </group>\n                  </if>\n                  <else>\n                    <label variable='locator' form='short' prefix=', p.&#8239;' suffix=' '/>\n                  </else>\n                </choose>\n              </if>\n            </choose>\n          </if>\n          <else-if type='bill book graphic legal_case motion_picture report song' match='any'>\n            <number variable='volume' form='numeric' prefix='v. ' suffix=', '/>\n          </else-if>\n        </choose>\n        <text variable='locator' prefix='p.&#8239;' />\n      </if>\n    </choose>\n  </macro>\n  <macro name='container-title'>\n    <choose>\n      <if type='chapter paper-conference' match='any'>\n\t<!-- <text macro='container-prefix' suffix=' '/> -->\n      </if>\n    </choose>\n    <choose>\n      <if type='legal_case' match='none'>\n        <text variable='container-title' font-style='italic'/>\n      </if>\n    </choose>\n  </macro>\n  <macro name='publisher'>\n    <group delimiter=', '>\n      <text variable='publisher'/>\n    </group>\n  </macro>\n  <macro name='day-month'>\n    <date variable='issued'>\n      <date-part name='month'/>\n      <date-part name='day' prefix=' '/>\n    </date>\n  </macro>\n  <macro name='collection-title'>\n    <text variable='collection-title' font-style='italic'/>\n    <text variable='collection-number' prefix=' '/>\n  </macro>\n  <macro name='event'>\n    <group>\n      <text term='presented at' suffix=' '/>\n      <text variable='event'/>\n    </group>\n  </macro>\n  <macro name='description'>\n    <choose>\n      <if type='interview'>\n        <group delimiter=', '>\n          <text macro='interviewer'/>\n          <text variable='medium'/>\n        </group>\n      </if>\n      <else>\n        <text variable='medium' prefix=', '/>\n      </else>\n    </choose>\n    <choose>\n      <if variable='title' match='none'/>\n      <!-- <else-if type='thesis'/> -->\n      <else>\n        <text variable='genre' text-case='capitalize-first' prefix=', '/>\n      </else>\n    </choose>\n  </macro>\n  <macro name='issue'>\n    <choose>\n      <if type='article-journal'>\n        <text macro='day-month' prefix=' (' suffix=')'/>\n      </if>\n      <else-if type='legal_case'>\n        <text variable='authority' prefix=', '/>\n      </else-if>\n      <else-if type='speech'>\n        <group prefix=' ' delimiter=', '>\n          <text macro='event'/>\n          <text macro='day-month'/>\n          <text variable='event-place'/>\n        </group>\n      </else-if>\n      <else-if type='article-newspaper article-magazine' match='any'>\n        <text macro='day-month' prefix=', '/>\n      </else-if>\n      <else>\n        <group prefix=', ' delimiter=', '>\n          <choose>\n            <if type='thesis'>\n              <text variable='genre' text-case='capitalize-first'/>\n            </if>\n          </choose>\n          <text macro='publisher'/>\n          <text macro='day-month'/>\n        </group>\n      </else>\n    </choose>\n  </macro>\n\n  <citation et-al-min='4' et-al-use-first='1' disambiguate-add-year-suffix='true' disambiguate-add-names='true' disambiguate-add-givenname='true'>\n    <sort>\n      <key macro='contributors'/>\n      <key variable='issued' sort='ascending'/>\n    </sort>\n    <layout prefix='[' suffix=']' delimiter='&#8239;; '>\n      <group delimiter=', '>\n        <group delimiter=', '>\n          <text macro='contributors-short'/>\n          <text macro='intext_date'/>\n        </group>\n        <text macro='point-locators'/>\n      </group>\n    </layout>\n  </citation>\n  <bibliography hanging-indent='true'  et-al-min='5' et-al-use-first='3' entry-spacing='0'>\n    <sort>\n      <key macro='contributors'/>\n      <key variable='issued' sort='ascending'/>\n    </sort>\n    <layout suffix='.'>\n      <choose>\n        <if variable='author editor translator composer' match='none'>\n\t  <text macro='contributors' suffix=''/>\n      \t</if>\n      </choose>\n      <text macro='contributors' suffix='&#8239;: '/>\n      <text macro='title'/>\n      <text macro='description'/>\n      <text macro='secondary-contributors' prefix=', '/>\n      <text macro='container-title' prefix=', '/>\n      <text macro='container-contributors'/>\n      <!-- <text macro='locators-chapter'/> -->\n      <text macro='edition' prefix=', '/>\n      <!-- <text macro='locators'/> -->\n      <text macro='collection-title' prefix=', '/>\n      <text macro='volume_locators'/>\n      <choose>\n        <if variable='volume' match='none'>\n\t  <text macro='publisher' prefix=', '/>\n\t</if>\n        <else>\n\t  <text macro='publisher' prefix=', '/>\n        </else>\n      </choose>\n      <text macro='locators-article'/>\n      <choose>\n        <if variable='publisher-place' match='any'>\n\t  <text variable='publisher-place' prefix=' |' suffix=', '/>\n\t  <text macro='date' suffix='|'/>\n\t</if>\n\t<else-if variable='publisher-place' match='none'>\n\t  <text macro='date' prefix=' |' suffix='|'/>\n        </else-if>\n      </choose>\n      <text macro='access' prefix=' [' suffix=']'/>\n      <text variable='page' prefix=' p.&#8239;'/>\n    </layout>\n  </bibliography>\n</style>",
+    "input": [
+        {
+            "id": "ITEM-1",
+            "title": "Book Title",
+            "type": "book"
+        },
+        {
+            "composer": [
+                {
+                    "family": "Smith",
+                    "given": "Bob"
+                }
+            ],
+            "id": "ITEM-2",
+            "title": "Book-2 Title",
+            "type": "book"
+        }
+    ],
+    "mode": "citation",
+    "result": "[Cite with a composer ; O A. \"hello\" <i>Book Title</i>]",
+    "tags": false,
+    "version": "1.0"
+}
\ No newline at end of file
diff --git a/processor-tests/machines/fullstyles_ChicagoAuthorDateSimple.json b/processor-tests/machines/fullstyles_ChicagoAuthorDateSimple.json
index 9923536..0cb054b 100644
--- a/processor-tests/machines/fullstyles_ChicagoAuthorDateSimple.json
+++ b/processor-tests/machines/fullstyles_ChicagoAuthorDateSimple.json
@@ -4,7 +4,7 @@
     "bibsection": false,
     "citation_items": false,
     "citations": false,
-    "csl": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<style xmlns=\"http://purl.org/net/xbiblio/csl\" class=\"in-text\" version=\"1.0\" page-range-format=\"chicago\">\n   <info>\n      <title>Chicago Manual of Style (Author-Date format)</title>\n      <id>http://www.zotero.org/styles/chicago-author-date</id>\n      <link href=\"http://www.zotero.org/styles/chicago-author-date\" rel=\"self\"/>\n      <author>\n         <name>Julian Onions</name>\n         <email>julian.onions@gmail.com</email>\n      </author>\n      <category citation-format=\"author-date\"/>\n      <category field=\"generic-base\"/>\n      <updated>2009-12-04T20:22:16+00:00</updated>\n      <summary>The author-date variant of the Chicago style</summary>\n      <link href=\"http://www.chicagomanualofstyle.org/tools_citationguide.html\" rel=\"documentation\"/>\n   </info>\n  <macro name=\"secondary-contributors\">\n    <choose>\n      <if match=\"none\" type=\"chapter\">\n        <group delimiter=\". \">\n          <choose>\n            <if variable=\"author\">\n              <names variable=\"editor\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"capitalize-first\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if match=\"any\" variable=\"author editor\">\n              <names variable=\"translator\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"capitalize-first\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"container-contributors\">\n    <choose>\n      <if type=\"chapter\">\n        <group delimiter=\", \" prefix=\",\">\n          <choose>\n            <if variable=\"author\">\n              <names variable=\"editor\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"lowercase\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if match=\"any\" variable=\"author editor\">\n              <names variable=\"translator\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"lowercase\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"anon\">\n    <choose>\n      <if match=\"none\" variable=\"author editor translator\">\n        <text form=\"short\" term=\"anonymous\" text-case=\"capitalize-first\" />\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"editor\">\n    <names variable=\"editor\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"short\" prefix=\", \" suffix=\".\" />\n    </names>\n  </macro>\n  <macro name=\"translator\">\n    <names variable=\"translator\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"verb-short\" prefix=\", \" suffix=\".\" />\n    </names>\n  </macro>\n  <macro name=\"recipient\">\n    <choose>\n      <if type=\"personal_communication\">\n        <choose>\n          <if variable=\"genre\">\n            <text text-case=\"capitalize-first\" variable=\"genre\" />\n          </if>\n          <else>\n            <text term=\"letter\" text-case=\"capitalize-first\" />\n          </else>\n        </choose>\n      </if>\n    </choose>\n    <names delimiter=\", \" variable=\"recipient\">\n      <label form=\"verb\" prefix=\" \" suffix=\" \" text-case=\"lowercase\" />\n      <name and=\"text\" delimiter=\", \" />\n    </names>\n  </macro>\n  <macro name=\"contributors\">\n    <names variable=\"author\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"verb-short\" prefix=\", \" suffix=\".\" text-case=\"lowercase\" />\n      <substitute>\n        <text macro=\"editor\" />\n        <text macro=\"translator\" />\n      </substitute>\n    </names>\n    <text macro=\"anon\" />\n    <text macro=\"recipient\" />\n  </macro>\n  <macro name=\"contributors-short\">\n    <names variable=\"author\">\n      <name and=\"text\" delimiter=\", \" form=\"short\" />\n      <substitute>\n        <names variable=\"editor\" />\n        <names variable=\"translator\" />\n      </substitute>\n    </names>\n    <text macro=\"anon\" />\n  </macro>\n  <macro name=\"interviewer\">\n    <names delimiter=\", \" variable=\"interviewer\">\n      <label form=\"verb\" prefix=\" \" suffix=\" \" text-case=\"capitalize-first\" />\n      <name and=\"text\" delimiter=\", \" />\n    </names>\n  </macro>\n  <macro name=\"archive\">\n    <group delimiter=\". \">\n      <text text-case=\"capitalize-first\" variable=\"archive_location\" />\n      <text variable=\"archive\" />\n      <text variable=\"archive-place\" />\n    </group>\n  </macro>\n  <macro name=\"access\">\n    <group delimiter=\". \">\n      <choose>\n        <if match=\"any\" type=\"graphic report\">\n          <text macro=\"archive\" />\n        </if>\n        <else-if match=\"none\" type=\"book thesis chapter article-journal article-newspaper article-magazine\">\n          <text macro=\"archive\" />\n        </else-if>\n      </choose>\n      <text prefix=\"doi:\" variable=\"DOI\" />\n      <text variable=\"URL\" />\n    </group>\n  </macro>\n  <macro name=\"title\">\n    <choose>\n      <if match=\"none\" variable=\"title\">\n        <choose>\n          <if match=\"none\" type=\"personal_communication\">\n            <text text-case=\"capitalize-first\" variable=\"genre\" />\n          </if>\n        </choose>\n      </if>\n      <else-if type=\"book\">\n        <text font-style=\"italic\" variable=\"title\" />\n      </else-if>\n      <else>\n        <text variable=\"title\" />\n      </else>\n    </choose>\n  </macro>\n  <macro name=\"edition\">\n    <choose>\n      <if match=\"any\" type=\"book chapter\">\n        <choose>\n          <if is-numeric=\"edition\">\n            <group delimiter=\" \">\n              <number form=\"ordinal\" variable=\"edition\" />\n              <text form=\"short\" suffix=\".\" term=\"edition\" />\n            </group>\n          </if>\n          <else>\n            <text suffix=\".\" variable=\"edition\" form=\"short\"/>\n          </else>\n        </choose>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"locators\">\n    <choose>\n      <if type=\"article-journal\">\n        <text prefix=\" \" variable=\"volume\" />\n        <text prefix=\", no. \" variable=\"issue\" />\n      </if>\n      <else-if type=\"book\">\n        <group delimiter=\". \" prefix=\". \">\n          <group>\n            <text form=\"short\" suffix=\". \" term=\"volume\" text-case=\"capitalize-first\" />\n            <number form=\"numeric\" variable=\"volume\" />\n          </group>\n          <group>\n            <number form=\"numeric\" variable=\"number-of-volumes\" />\n            <text form=\"short\" plural=\"true\" prefix=\" \" suffix=\".\" term=\"volume\" />\n          </group>\n        </group>\n      </else-if>\n    </choose>\n  </macro>\n  <macro name=\"locators-chapter\">\n    <choose>\n      <if type=\"chapter\">\n        <group prefix=\", \">\n          <text suffix=\":\" variable=\"volume\" />\n          <text variable=\"page\" />\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"locators-article\">\n    <choose>\n      <if type=\"article-newspaper\">\n        <group delimiter=\", \" prefix=\", \">\n          <group>\n            <text suffix=\" \" variable=\"edition\" />\n            <text prefix=\" \" term=\"edition\" />\n          </group>\n          <group>\n            <text form=\"short\" suffix=\". \" term=\"section\" />\n            <text variable=\"section\" />\n          </group>\n        </group>\n      </if>\n      <else-if type=\"article-journal\">\n        <text prefix=\": \" variable=\"page\" />\n      </else-if>\n    </choose>\n  </macro>\n  <macro name=\"point-locators\">\n    <group>\n      <choose>\n        <if locator=\"page\" match=\"none\">\n          <label form=\"short\" suffix=\" \" variable=\"locator\" />\n        </if>\n      </choose>\n      <text variable=\"locator\" />\n    </group>\n  </macro>\n  <macro name=\"container-prefix\">\n    <text term=\"in\" text-case=\"capitalize-first\" />\n  </macro>\n  <macro name=\"container-title\">\n    <choose>\n      <if type=\"chapter\">\n        <text macro=\"container-prefix\" suffix=\" \" />\n      </if>\n    </choose>\n    <text font-style=\"italic\" variable=\"container-title\" />\n  </macro>\n  <macro name=\"publisher\">\n    <group delimiter=\": \">\n      <text variable=\"publisher-place\" />\n      <text variable=\"publisher\" />\n    </group>\n  </macro>\n  <macro name=\"date\">\n    <date variable=\"issued\">\n      <date-part name=\"year\" />\n    </date>\n  </macro>\n  <macro name=\"day-month\">\n    <date variable=\"issued\">\n      <date-part name=\"month\" />\n      <date-part name=\"day\" prefix=\" \" />\n    </date>\n  </macro>\n  <macro name=\"collection-title\">\n    <text variable=\"collection-title\" />\n    <text prefix=\" \" variable=\"collection-number\" />\n  </macro>\n  <macro name=\"event\">\n    <group>\n      <text suffix=\" \" term=\"presented at\" />\n      <text variable=\"event\" />\n    </group>\n  </macro>\n  <macro name=\"description\">\n    <group delimiter=\". \">\n      <text macro=\"interviewer\" />\n      <text text-case=\"capitalize-first\" variable=\"medium\" />\n    </group>\n    <choose>\n      <if match=\"none\" variable=\"title\"> </if>\n      <else-if type=\"thesis\"> </else-if>\n      <else>\n        <text prefix=\". \" text-case=\"capitalize-first\" variable=\"genre\" />\n      </else>\n    </choose>\n  </macro>\n  <macro name=\"issue\">\n    <choose>\n      <if type=\"article-journal\">\n        <text macro=\"day-month\" prefix=\" (\" suffix=\")\" />\n      </if>\n      <else-if type=\"speech\">\n        <group delimiter=\", \" prefix=\" \">\n          <text macro=\"event\" />\n          <text macro=\"day-month\" />\n          <text variable=\"event-place\" />\n        </group>\n      </else-if>\n      <else-if match=\"any\" type=\"article-newspaper article-magazine\">\n        <text macro=\"day-month\" prefix=\", \" />\n      </else-if>\n      <else>\n        <group delimiter=\", \" prefix=\". \">\n          <choose>\n            <if type=\"thesis\">\n              <text text-case=\"capitalize-first\" variable=\"genre\" />\n            </if>\n          </choose>\n          <text macro=\"publisher\" />\n          <text macro=\"day-month\" />\n        </group>\n      </else>\n    </choose>\n  </macro>\n  <citation \n         disambiguate-add-givenname=\"true\"\n         disambiguate-add-names=\"true\"\n         disambiguate-add-year-suffix=\"true\"\n         et-al-min=\"4\"\n         et-al-subsequent-min=\"4\"\n         et-al-subsequent-use-first=\"1\"\n         et-al-use-first=\"1\">\n    <layout delimiter=\"; \" prefix=\"(\" suffix=\")\">\n      <group delimiter=\", \">\n        <group delimiter=\" \">\n          <text macro=\"contributors-short\" />\n          <text macro=\"date\" />\n        </group>\n        <text macro=\"point-locators\" />\n      </group>\n    </layout>\n  </citation>\n  <bibliography \n         entry-spacing=\"0\"\n         et-al-min=\"11\"\n         et-al-use-first=\"7\"\n         hanging-indent=\"true\"\n         subsequent-author-substitute=\"---\">\n    <sort>\n      <key macro=\"contributors\" />\n      <key variable=\"issued\" />\n      <key variable=\"title\" />\n    </sort>\n    <layout suffix=\".\">\n      <text macro=\"contributors\" suffix=\". \" />\n      <text macro=\"date\" suffix=\". \" />\n      <text macro=\"title\" />\n      <text macro=\"description\" />\n      <text macro=\"secondary-contributors\" prefix=\". \" />\n      <text macro=\"container-title\" prefix=\". \" />\n      <text macro=\"container-contributors\" />\n      <text macro=\"locators-chapter\" />\n      <text macro=\"edition\" prefix=\". \" />\n      <text macro=\"locators\" />\n      <text macro=\"collection-title\" prefix=\". \" />\n      <text macro=\"issue\" />\n      <text macro=\"locators-article\" />\n      <text macro=\"access\" prefix=\". \" />\n    </layout>\n  </bibliography>\n</style>",
+    "csl": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<style xmlns=\"http://purl.org/net/xbiblio/csl\" class=\"in-text\" version=\"1.0\" page-range-format=\"chicago\">\n   <info>\n      <title>Chicago Manual of Style (Author-Date format)</title>\n      <id>http://www.zotero.org/styles/chicago-author-date</id>\n      <link href=\"http://www.zotero.org/styles/chicago-author-date\" rel=\"self\"/>\n      <author>\n         <name>Julian Onions</name>\n         <email>julian.onions@gmail.com</email>\n      </author>\n      <category citation-format=\"author-date\"/>\n      <category field=\"generic-base\"/>\n      <updated>2009-12-04T20:22:16+00:00</updated>\n      <summary>The author-date variant of the Chicago style</summary>\n      <link href=\"http://www.chicagomanualofstyle.org/tools_citationguide.html\" rel=\"documentation\"/>\n   </info>\n  <macro name=\"secondary-contributors\">\n    <choose>\n      <if match=\"none\" type=\"chapter\">\n        <group delimiter=\". \">\n          <choose>\n            <if variable=\"author\">\n              <names variable=\"editor\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"capitalize-first\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if match=\"any\" variable=\"author editor\">\n              <names variable=\"translator\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"capitalize-first\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"container-contributors\">\n    <choose>\n      <if type=\"chapter\">\n        <group delimiter=\", \" prefix=\",\">\n          <choose>\n            <if variable=\"author\">\n              <names variable=\"editor\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"lowercase\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n          <choose>\n            <if match=\"any\" variable=\"author editor\">\n              <names variable=\"translator\">\n                <label form=\"verb-short\" prefix=\" \" suffix=\". \" text-case=\"lowercase\" />\n                <name and=\"text\" delimiter=\", \" />\n              </names>\n            </if>\n          </choose>\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"anon\">\n    <choose>\n      <if match=\"none\" variable=\"author editor translator\">\n        <text form=\"short\" term=\"anonymous\" text-case=\"capitalize-first\" />\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"editor\">\n    <names variable=\"editor\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"short\" prefix=\", \" suffix=\".\" />\n    </names>\n  </macro>\n  <macro name=\"translator\">\n    <names variable=\"translator\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"verb-short\" prefix=\", \" suffix=\".\" />\n    </names>\n  </macro>\n  <macro name=\"recipient\">\n    <choose>\n      <if type=\"personal_communication\">\n        <choose>\n          <if variable=\"genre\">\n            <text text-case=\"capitalize-first\" variable=\"genre\" />\n          </if>\n          <else>\n            <text term=\"letter\" text-case=\"capitalize-first\" />\n          </else>\n        </choose>\n      </if>\n    </choose>\n    <names delimiter=\", \" variable=\"recipient\">\n      <label form=\"verb\" prefix=\" \" suffix=\" \" text-case=\"lowercase\" />\n      <name and=\"text\" delimiter=\", \" />\n    </names>\n  </macro>\n  <macro name=\"contributors\">\n    <names variable=\"author\">\n      <name and=\"text\" delimiter=\", \" delimiter-precedes-last=\"always\" name-as-sort-order=\"first\" sort-separator=\", \" />\n      <label form=\"short\" prefix=\", \" suffix=\".\" text-case=\"lowercase\" />\n      <substitute>\n        <text macro=\"editor\" />\n        <text macro=\"translator\" />\n      </substitute>\n    </names>\n    <text macro=\"anon\" />\n    <text macro=\"recipient\" />\n  </macro>\n  <macro name=\"contributors-short\">\n    <names variable=\"author\">\n      <name and=\"text\" delimiter=\", \" form=\"short\" />\n      <substitute>\n        <names variable=\"editor\" />\n        <names variable=\"translator\" />\n      </substitute>\n    </names>\n    <text macro=\"anon\" />\n  </macro>\n  <macro name=\"interviewer\">\n    <names delimiter=\", \" variable=\"interviewer\">\n      <label form=\"verb\" prefix=\" \" suffix=\" \" text-case=\"capitalize-first\" />\n      <name and=\"text\" delimiter=\", \" />\n    </names>\n  </macro>\n  <macro name=\"archive\">\n    <group delimiter=\". \">\n      <text text-case=\"capitalize-first\" variable=\"archive_location\" />\n      <text variable=\"archive\" />\n      <text variable=\"archive-place\" />\n    </group>\n  </macro>\n  <macro name=\"access\">\n    <group delimiter=\". \">\n      <choose>\n        <if match=\"any\" type=\"graphic report\">\n          <text macro=\"archive\" />\n        </if>\n        <else-if match=\"none\" type=\"book thesis chapter article-journal article-newspaper article-magazine\">\n          <text macro=\"archive\" />\n        </else-if>\n      </choose>\n      <text prefix=\"doi:\" variable=\"DOI\" />\n      <text variable=\"URL\" />\n    </group>\n  </macro>\n  <macro name=\"title\">\n    <choose>\n      <if match=\"none\" variable=\"title\">\n        <choose>\n          <if match=\"none\" type=\"personal_communication\">\n            <text text-case=\"capitalize-first\" variable=\"genre\" />\n          </if>\n        </choose>\n      </if>\n      <else-if type=\"book\">\n        <text font-style=\"italic\" variable=\"title\" />\n      </else-if>\n      <else>\n        <text variable=\"title\" />\n      </else>\n    </choose>\n  </macro>\n  <macro name=\"edition\">\n    <choose>\n      <if match=\"any\" type=\"book chapter\">\n        <choose>\n          <if is-numeric=\"edition\">\n            <group delimiter=\" \">\n              <number form=\"ordinal\" variable=\"edition\" />\n              <text form=\"short\" suffix=\".\" term=\"edition\" />\n            </group>\n          </if>\n          <else>\n            <text suffix=\".\" variable=\"edition\" form=\"short\"/>\n          </else>\n        </choose>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"locators\">\n    <choose>\n      <if type=\"article-journal\">\n        <text prefix=\" \" variable=\"volume\" />\n        <text prefix=\", no. \" variable=\"issue\" />\n      </if>\n      <else-if type=\"book\">\n        <group delimiter=\". \" prefix=\". \">\n          <group>\n            <text form=\"short\" suffix=\". \" term=\"volume\" text-case=\"capitalize-first\" />\n            <number form=\"numeric\" variable=\"volume\" />\n          </group>\n          <group>\n            <number form=\"numeric\" variable=\"number-of-volumes\" />\n            <text form=\"short\" plural=\"true\" prefix=\" \" suffix=\".\" term=\"volume\" />\n          </group>\n        </group>\n      </else-if>\n    </choose>\n  </macro>\n  <macro name=\"locators-chapter\">\n    <choose>\n      <if type=\"chapter\">\n        <group prefix=\", \">\n          <text suffix=\":\" variable=\"volume\" />\n          <text variable=\"page\" />\n        </group>\n      </if>\n    </choose>\n  </macro>\n  <macro name=\"locators-article\">\n    <choose>\n      <if type=\"article-newspaper\">\n        <group delimiter=\", \" prefix=\", \">\n          <group>\n            <text suffix=\" \" variable=\"edition\" />\n            <text prefix=\" \" term=\"edition\" />\n          </group>\n          <group>\n            <text form=\"short\" suffix=\". \" term=\"section\" />\n            <text variable=\"section\" />\n          </group>\n        </group>\n      </if>\n      <else-if type=\"article-journal\">\n        <text prefix=\": \" variable=\"page\" />\n      </else-if>\n    </choose>\n  </macro>\n  <macro name=\"point-locators\">\n    <group>\n      <choose>\n        <if locator=\"page\" match=\"none\">\n          <label form=\"short\" suffix=\" \" variable=\"locator\" />\n        </if>\n      </choose>\n      <text variable=\"locator\" />\n    </group>\n  </macro>\n  <macro name=\"container-prefix\">\n    <text term=\"in\" text-case=\"capitalize-first\" />\n  </macro>\n  <macro name=\"container-title\">\n    <choose>\n      <if type=\"chapter\">\n        <text macro=\"container-prefix\" suffix=\" \" />\n      </if>\n    </choose>\n    <text font-style=\"italic\" variable=\"container-title\" />\n  </macro>\n  <macro name=\"publisher\">\n    <group delimiter=\": \">\n      <text variable=\"publisher-place\" />\n      <text variable=\"publisher\" />\n    </group>\n  </macro>\n  <macro name=\"date\">\n    <date variable=\"issued\">\n      <date-part name=\"year\" />\n    </date>\n  </macro>\n  <macro name=\"day-month\">\n    <date variable=\"issued\">\n      <date-part name=\"month\" />\n      <date-part name=\"day\" prefix=\" \" />\n    </date>\n  </macro>\n  <macro name=\"collection-title\">\n    <text variable=\"collection-title\" />\n    <text prefix=\" \" variable=\"collection-number\" />\n  </macro>\n  <macro name=\"event\">\n    <group>\n      <text suffix=\" \" term=\"presented at\" />\n      <text variable=\"event\" />\n    </group>\n  </macro>\n  <macro name=\"description\">\n    <group delimiter=\". \">\n      <text macro=\"interviewer\" />\n      <text text-case=\"capitalize-first\" variable=\"medium\" />\n    </group>\n    <choose>\n      <if match=\"none\" variable=\"title\"> </if>\n      <else-if type=\"thesis\"> </else-if>\n      <else>\n        <text prefix=\". \" text-case=\"capitalize-first\" variable=\"genre\" />\n      </else>\n    </choose>\n  </macro>\n  <macro name=\"issue\">\n    <choose>\n      <if type=\"article-journal\">\n        <text macro=\"day-month\" prefix=\" (\" suffix=\")\" />\n      </if>\n      <else-if type=\"speech\">\n        <group delimiter=\", \" prefix=\" \">\n          <text macro=\"event\" />\n          <text macro=\"day-month\" />\n          <text variable=\"event-place\" />\n        </group>\n      </else-if>\n      <else-if match=\"any\" type=\"article-newspaper article-magazine\">\n        <text macro=\"day-month\" prefix=\", \" />\n      </else-if>\n      <else>\n        <group delimiter=\", \" prefix=\". \">\n          <choose>\n            <if type=\"thesis\">\n              <text text-case=\"capitalize-first\" variable=\"genre\" />\n            </if>\n          </choose>\n          <text macro=\"publisher\" />\n          <text macro=\"day-month\" />\n        </group>\n      </else>\n    </choose>\n  </macro>\n  <citation \n         disambiguate-add-givenname=\"true\"\n         disambiguate-add-names=\"true\"\n         disambiguate-add-year-suffix=\"true\"\n         et-al-min=\"4\"\n         et-al-subsequent-min=\"4\"\n         et-al-subsequent-use-first=\"1\"\n         et-al-use-first=\"1\">\n    <layout delimiter=\"; \" prefix=\"(\" suffix=\")\">\n      <group delimiter=\", \">\n        <group delimiter=\" \">\n          <text macro=\"contributors-short\" />\n          <text macro=\"date\" />\n        </group>\n        <text macro=\"point-locators\" />\n      </group>\n    </layout>\n  </citation>\n  <bibliography \n         entry-spacing=\"0\"\n         et-al-min=\"11\"\n         et-al-use-first=\"7\"\n         hanging-indent=\"true\"\n         subsequent-author-substitute=\"---\">\n    <sort>\n      <key macro=\"contributors\" />\n      <key variable=\"issued\" />\n      <key variable=\"title\" />\n    </sort>\n    <layout suffix=\".\">\n      <text macro=\"contributors\" suffix=\". \" />\n      <text macro=\"date\" suffix=\". \" />\n      <text macro=\"title\" />\n      <text macro=\"description\" />\n      <text macro=\"secondary-contributors\" prefix=\". \" />\n      <text macro=\"container-title\" prefix=\". \" />\n      <text macro=\"container-contributors\" />\n      <text macro=\"locators-chapter\" />\n      <text macro=\"edition\" prefix=\". \" />\n      <text macro=\"locators\" />\n      <text macro=\"collection-title\" prefix=\". \" />\n      <text macro=\"issue\" />\n      <text macro=\"locators-article\" />\n      <text macro=\"access\" prefix=\". \" />\n    </layout>\n  </bibliography>\n</style>",
     "input": [
         {
             "author": [
diff --git a/processor-tests/machines/label_EditorTranslator1.json b/processor-tests/machines/label_EditorTranslator1.json
index d54f827..495d86c 100644
--- a/processor-tests/machines/label_EditorTranslator1.json
+++ b/processor-tests/machines/label_EditorTranslator1.json
@@ -58,7 +58,7 @@
         }
     ],
     "mode": "bibliography",
-    "result": "<div class=\"csl-bib-body\">\n  <div class=\"csl-entry\">1.\tИванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – 10. – 100 p.</div>\n</div>",
+    "result": "<div class=\"csl-bib-body\">\n  <div class=\"csl-entry\">1.\tИванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>\n</div>",
     "tags": false,
     "version": "1.0"
 }
\ No newline at end of file
diff --git a/processor-tests/machines/label_MissingReturnsEmpty.json b/processor-tests/machines/label_MissingReturnsEmpty.json
index beaab91..77eda6f 100644
--- a/processor-tests/machines/label_MissingReturnsEmpty.json
+++ b/processor-tests/machines/label_MissingReturnsEmpty.json
@@ -10,7 +10,7 @@
         ]
     ],
     "citations": false,
-    "csl": "<style \n      xmlns=\"http://purl.org/net/xbiblio/csl\"\n      class=\"note\"\n      version=\"1.0\">\n  <info>\n    <id />\n    <title />\n    <updated>2009-08-10T04:49:00+09:00</updated>\n  </info>\n  <!-- locale>\n    <term name=\"number\">nummie</term>\n  </locale -->\n  <macro name=\"author\">\n    <names variable=\"author\">\n      <name form=\"short\" />\n    </names>\n  </macro>\n  <citation>\n    <layout delimiter=\"; \">\n      <text macro=\"author\" />\n      <group delimiter=\" \" prefix=\", \">\n        <text term=\"number\"/>\n        <number variable=\"collection-number\"/>\n      </group>\n    </layout>\n  </citation>\n</style>",
+    "csl": "<style \n      xmlns=\"http://purl.org/net/xbiblio/csl\"\n      class=\"note\"\n      version=\"1.0\">\n  <info>\n    <id />\n    <title />\n    <updated>2009-08-10T04:49:00+09:00</updated>\n  </info>\n  <!-- locale>\n    <term name=\"number\">nummie</term>\n  </locale -->\n  <macro name=\"author\">\n    <names variable=\"author\">\n      <name form=\"short\" />\n      <label form=\"long\" prefix=\", \"/>\n    </names>\n  </macro>\n  <citation>\n    <layout delimiter=\"; \">\n      <text macro=\"author\" />\n    </layout>\n  </citation>\n</style>",
     "input": [
         {
             "author": [
@@ -19,7 +19,6 @@
                     "given": "Alan"
                 }
             ],
-            "collection-number": 23,
             "id": "ITEM-1",
             "type": "book"
         }
diff --git a/processor.py b/processor.py
index ea31281..838a801 100755
--- a/processor.py
+++ b/processor.py
@@ -60,7 +60,7 @@ def fixEndings(s):
 class ApplyLicense:
 
     def __init__(self):
-        self.rex = "(?sm)^^(/\*.*?^\s*\*/\n*)(.*)"
+        self.rex = r"(?sm)^^(/\*.*?^\s*\*/\n*)(.*)"
         m = re.match(self.rex, fixEndings(open( os.path.join("src","load.js")).read()) )
         if m:
             self.license = "%s\n" % m.group(1).strip()
@@ -227,7 +227,7 @@ def __init__(self,opt,cp,hpath,testname,pos=0):
         self.CREATORS = ["author","editor","translator","recipient","interviewer"]
         self.CREATORS += ["composer","original-author","container-author","collection-editor"]
         self.RE_ELEMENT = '(?sm)^(.*>>=[^\n]*%s[^\n]+)(.*)(\n<<=.*%s.*)'
-        self.RE_FILENAME = '^[a-z]+_[a-zA-Z0-9]+\.txt$'
+        self.RE_FILENAME = r"^[a-z]+_[a-zA-Z0-9]+\.txt$"
         self.script = os.path.split(sys.argv[0])[1]
         self.pickle = ".".join((os.path.splitext( self.script )[0], "pkl"))
         self.data = {}
@@ -330,7 +330,7 @@ def validate(self):
         tfd,tfilename = tempfile.mkstemp(dir=".")
         os.write(tfd,self.data["csl"].encode('utf8'))
         os.close(tfd)
-        
+
         jfh = os.popen("%s %s -c %s %s" % (self.cp.get("jing", "command"), self.cp.get("jing", "path"),rnc_path,tfilename))
         success = True
         plural = ""
@@ -344,13 +344,13 @@ def validate(self):
                 sys.exit()
             m = re.match(".*:([0-9]+):([0-9]+):  *error:(.*)",line)
             if m:
-              if success:
-                  print("\n##")
-                  print("#### Error%s in CSL for test: %s" % (plural,self.hp))
-                  print("##\n")
-                  success = False
-              print("  %s @ line %s" %(m.group(3).upper(),m.group(1)))
-              plural = "s"
+                if success:
+                    print("\n##")
+                    print("#### Error%s in CSL for test: %s" % (plural,self.hp))
+                    print("##\n")
+                    success = False
+                print("  %s @ line %s" %(m.group(3).upper(),m.group(1)))
+                plural = "s"
         jfh.close()
         os.unlink(tfilename)
         if not success:
@@ -370,8 +370,8 @@ def validate(self):
 
             pickler.dump( (opt, self.pos) )
             sys.exit()
-        
- 
+
+
 if __name__ == "__main__":
 
     from optparse import OptionParser

From cd1c065170a03b8b0d6aba66a086dc89873ccc30 Mon Sep 17 00:00:00 2001
From: Zeping Lee <zepinglee@gmail.com>
Date: Tue, 12 Mar 2024 16:13:48 +0800
Subject: [PATCH 2/2] Fixup two failing tests

---
 processor-tests/humans/label_EditorTranslator1.txt      | 3 +--
 processor-tests/humans/label_MissingReturnsEmpty.txt    | 5 ++---
 processor-tests/machines/label_EditorTranslator1.json   | 2 +-
 processor-tests/machines/label_MissingReturnsEmpty.json | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/processor-tests/humans/label_EditorTranslator1.txt b/processor-tests/humans/label_EditorTranslator1.txt
index 1a26bab..178627f 100644
--- a/processor-tests/humans/label_EditorTranslator1.txt
+++ b/processor-tests/humans/label_EditorTranslator1.txt
@@ -6,7 +6,7 @@ bibliography
 
 >>===== RESULT =====>>
 <div class="csl-bib-body">
-  <div class="csl-entry">1.	Иванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>
+  <div class="csl-entry">1.	Иванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>
 </div>
 <<===== RESULT =====<<
 
@@ -610,4 +610,3 @@ _______________________________________________________________________________
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/processor-tests/humans/label_MissingReturnsEmpty.txt b/processor-tests/humans/label_MissingReturnsEmpty.txt
index 41471d4..3e2aaa5 100644
--- a/processor-tests/humans/label_MissingReturnsEmpty.txt
+++ b/processor-tests/humans/label_MissingReturnsEmpty.txt
@@ -3,7 +3,7 @@ citation
 <<==== MODE ====<<
 
 >>==== RESULT ====>>
-Aalto, 23
+Aalto
 <<==== RESULT ====<<
 
 >>==== CITATION-ITEMS ====>>
@@ -17,7 +17,7 @@ Aalto, 23
 <<==== CITATION-ITEMS ====<<
 
 >>==== CSL ====>>
-<style 
+<style
       xmlns="http://purl.org/net/xbiblio/csl"
       class="note"
       version="1.0">
@@ -63,4 +63,3 @@ Aalto, 23
 >>===== VERSION =====>>
 1.0
 <<===== VERSION =====<<
-
diff --git a/processor-tests/machines/label_EditorTranslator1.json b/processor-tests/machines/label_EditorTranslator1.json
index 495d86c..52a8761 100644
--- a/processor-tests/machines/label_EditorTranslator1.json
+++ b/processor-tests/machines/label_EditorTranslator1.json
@@ -58,7 +58,7 @@
         }
     ],
     "mode": "bibliography",
-    "result": "<div class=\"csl-bib-body\">\n  <div class=\"csl-entry\">1.\tИванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>\n</div>",
+    "result": "<div class=\"csl-bib-body\">\n  <div class=\"csl-entry\">1.\tИванов И.И. Пример оформления книги с редактором и переводчиком в одном лице : вид издания : in 5 vols. Vol. 2 / И.И. Иванов, П.П. Петров, С.С. Сидоров; ed &#38; trans. Р.Р. Романов Дополнительно. – Тюмень: Дом, 2013. – No. 10. – 100 p.</div>\n</div>",
     "tags": false,
     "version": "1.0"
 }
\ No newline at end of file
diff --git a/processor-tests/machines/label_MissingReturnsEmpty.json b/processor-tests/machines/label_MissingReturnsEmpty.json
index 77eda6f..9ed46fd 100644
--- a/processor-tests/machines/label_MissingReturnsEmpty.json
+++ b/processor-tests/machines/label_MissingReturnsEmpty.json
@@ -10,7 +10,7 @@
         ]
     ],
     "citations": false,
-    "csl": "<style \n      xmlns=\"http://purl.org/net/xbiblio/csl\"\n      class=\"note\"\n      version=\"1.0\">\n  <info>\n    <id />\n    <title />\n    <updated>2009-08-10T04:49:00+09:00</updated>\n  </info>\n  <!-- locale>\n    <term name=\"number\">nummie</term>\n  </locale -->\n  <macro name=\"author\">\n    <names variable=\"author\">\n      <name form=\"short\" />\n      <label form=\"long\" prefix=\", \"/>\n    </names>\n  </macro>\n  <citation>\n    <layout delimiter=\"; \">\n      <text macro=\"author\" />\n    </layout>\n  </citation>\n</style>",
+    "csl": "<style\n      xmlns=\"http://purl.org/net/xbiblio/csl\"\n      class=\"note\"\n      version=\"1.0\">\n  <info>\n    <id />\n    <title />\n    <updated>2009-08-10T04:49:00+09:00</updated>\n  </info>\n  <!-- locale>\n    <term name=\"number\">nummie</term>\n  </locale -->\n  <macro name=\"author\">\n    <names variable=\"author\">\n      <name form=\"short\" />\n      <label form=\"long\" prefix=\", \"/>\n    </names>\n  </macro>\n  <citation>\n    <layout delimiter=\"; \">\n      <text macro=\"author\" />\n    </layout>\n  </citation>\n</style>",
     "input": [
         {
             "author": [
@@ -24,7 +24,7 @@
         }
     ],
     "mode": "citation",
-    "result": "Aalto, 23",
+    "result": "Aalto",
     "tags": false,
     "version": "1.0"
 }
\ No newline at end of file