csl-styles 2.0.1 → 2.0.2

data/vendor/styles/{chicago-fullnote-bibliography-16th-edition.csl → chicago-notes-bibliography-16th-edition.csl}

@@ -1,88 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
+<style class="note" demote-non-dropping-particle="display-and-sort" page-range-format="chicago" version="1.0" xmlns="http://purl.org/net/xbiblio/csl">
   <info>
-    <title>Chicago Manual of Style 16th edition (full note)</title>
-    <id>http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition</id>
-    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition" rel="self"/>
-    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <title>Chicago Manual of Style 16th edition (notes and bibliography)</title>
+    <id>http://www.zotero.org/styles/chicago-notes-bibliography-16th-edition</id>
+    <link href="http://www.zotero.org/styles/chicago-notes-bibliography-16th-edition" rel="self"/>
+    <link href="https://web.archive.org/web/20160830192245/http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
+      <uri>https://orcid.org/0000-0001-5192-6856</uri>
     </author>
     <contributor>
       <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
+      <uri>https://orcid.org/0000-0002-9088-2443</uri>
     </contributor>
     <contributor>
       <name>Elena Razlogova</name>
-      <email>elena.razlogova@gmail.com</email>
+      <uri>https://orcid.org/0000-0001-6621-7841</uri>
     </contributor>
     <contributor>
       <name>Frank Bennett</name>
-      <email>biercenator@gmail.com</email>
+      <uri>https://github.com/fbennett</uri>
     </contributor>
     <contributor>
       <name>Andrew Dunning</name>
-      <email>andrew.dunning@utoronto.ca</email>
+      <uri>https://orcid.org/0000-0003-0464-5036</uri>
     </contributor>
     <contributor>
       <name>Brenton M. Wiernik</name>
+      <uri>https://orcid.org/0000-0001-9560-6336</uri>
     </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>Chicago format with full notes and bibliography</summary>
-    <updated>2022-01-16T14:46:01-05:00</updated>
+    <updated>2017-10-12T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
     <terms>
-      <term name="editor" form="verb-short">ed.</term>
-      <term name="translator" form="verb-short">trans.</term>
-      <term name="translator" form="short">trans.</term>
-      <term name="editortranslator" form="verb-short">ed. and trans.</term>
-      <term name="editortranslator" form="verb">Edited and translated by</term>
-      <term name="translator" form="short">trans.</term>
+      <term form="verb-short" name="editor">ed.</term>
+      <term form="verb-short" name="translator">trans.</term>
+      <term form="short" name="translator">trans.</term>
+      <term form="verb-short" name="editortranslator">ed. and trans.</term>
+      <term form="verb" name="editortranslator">Edited and translated by</term>
+      <term form="short" name="translator">trans.</term>
     </terms>
   </locale>
   <macro name="editor-translator">
     <group delimiter=", ">
       <group delimiter=" ">
         <choose>
-          <if variable="container-author reviewed-author" match="any">
+          <if match="any" variable="container-author reviewed-author">
             <group>
               <names variable="container-author reviewed-author">
-                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <label form="verb-short" suffix=" " text-case="lowercase"/>
                 <name and="text" delimiter=", "/>
               </names>
             </group>
           </if>
         </choose>
       </group>
-      <names variable="editor translator" delimiter=", ">
-        <label form="verb-short" text-case="lowercase" suffix=" "/>
+      <names delimiter=", " variable="editor translator">
+        <label form="verb-short" suffix=" " text-case="lowercase"/>
         <name and="text" delimiter=", "/>
       </names>
     </group>
   </macro>
   <macro name="secondary-contributors-note">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+      <if match="none" type="chapter entry-dictionary entry-encyclopedia paper-conference">
         <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
   <macro name="container-contributors-note">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
         <text macro="editor-translator"/>
       </if>
     </choose>
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-        <names variable="editor translator" delimiter=". ">
-          <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <if match="none" type="chapter entry-dictionary entry-encyclopedia paper-conference">
+        <names delimiter=". " variable="editor translator">
+          <label form="verb" suffix=" " text-case="capitalize-first"/>
           <name and="text" delimiter=", "/>
         </names>
       </if>
@@ -90,32 +91,32 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
         <group delimiter=", ">
           <choose>
             <if variable="author">
               <choose>
-                <if variable="container-author" match="any">
+                <if variable="container-author">
                   <names variable="container-author">
-                    <label form="verb-short" text-case="lowercase" suffix=" "/>
+                    <label form="verb-short" suffix=" " text-case="lowercase"/>
                     <name and="text" delimiter=", "/>
                   </names>
                 </if>
               </choose>
               <!--This includes page numers after the container author, e.g. for Introductions -->
               <choose>
-                <if variable="container-author author" match="all">
+                <if variable="container-author author">
                   <group delimiter=". ">
                     <text variable="page"/>
-                    <names variable="editor translator" delimiter=", ">
+                    <names delimiter=", " variable="editor translator">
                       <label form="verb" suffix=" "/>
                       <name and="text" delimiter=", "/>
                     </names>
                   </group>
                 </if>
                 <else>
-                  <names variable="editor translator" delimiter=", ">
-                    <label form="verb" text-case="lowercase" suffix=" "/>
+                  <names delimiter=", " variable="editor translator">
+                    <label form="verb" suffix=" " text-case="lowercase"/>
                     <name and="text" delimiter=", "/>
                   </names>
                 </else>
@@ -127,15 +128,15 @@
     </choose>
   </macro>
   <macro name="recipient-note">
-    <names variable="recipient" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
+    <names delimiter=", " variable="recipient">
+      <label form="verb" suffix=" " text-case="lowercase"/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="contributors-note">
     <group delimiter=" ">
       <names variable="author">
-        <name and="text" sort-separator=", " delimiter=", "/>
+        <name and="text" delimiter=", " sort-separator=", "/>
         <label form="short" prefix=", "/>
         <substitute>
           <names variable="editor"/>
@@ -147,13 +148,13 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", "/>
       <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", "/>
       <label form="verb-short" prefix=", "/>
     </names>
   </macro>
@@ -163,7 +164,7 @@
         <if type="personal_communication">
           <choose>
             <if variable="genre">
-              <text variable="genre" text-case="capitalize-first"/>
+              <text text-case="capitalize-first" variable="genre"/>
             </if>
             <else>
               <text term="letter" text-case="capitalize-first"/>
@@ -177,12 +178,12 @@
   <macro name="contributors">
     <group delimiter=". ">
       <names variable="author">
-        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", "/>
         <substitute>
           <text macro="editor"/>
           <text macro="translator"/>
           <choose>
-            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
+            <if match="any" type="article-magazine article-newspaper webpage post-weblog">
               <text variable="container-title"/>
             </if>
           </choose>
@@ -193,14 +194,14 @@
   </macro>
   <macro name="recipient-short">
     <names variable="recipient">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name form="short" and="text" delimiter=", "/>
+      <label form="verb" suffix=" " text-case="lowercase"/>
+      <name and="text" delimiter=", " form="short"/>
     </names>
   </macro>
   <macro name="contributors-short">
     <group delimiter=" ">
       <names variable="author">
-        <name form="short" and="text" delimiter=", "/>
+        <name and="text" delimiter=", " form="short"/>
         <substitute>
           <names variable="editor"/>
           <names variable="translator"/>
@@ -211,7 +212,7 @@
   </macro>
   <macro name="contributors-sort">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=", "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -220,102 +221,102 @@
     </names>
   </macro>
   <macro name="interviewer-note">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
+    <names delimiter=", " variable="interviewer">
+      <label form="verb" suffix=" " text-case="lowercase"/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="capitalize-first" suffix=" "/>
+    <names delimiter=", " variable="interviewer">
+      <label form="verb" suffix=" " text-case="capitalize-first"/>
       <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="title-note">
     <choose>
-      <if variable="title" match="none">
+      <if match="none" variable="title">
         <text variable="genre"/>
       </if>
-      <else-if type="book graphic motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
+      <else-if match="any" type="book graphic motion_picture report song">
+        <text font-style="italic" text-case="title" variable="title"/>
         <group delimiter=" " prefix=", ">
-          <text term="version"/>
+          <label variable="version"/>
           <text variable="version"/>
         </group>
       </else-if>
-      <else-if type="legal_case interview patent" match="any">
+      <else-if match="any" type="legal_case interview patent">
         <text variable="title"/>
       </else-if>
       <else-if variable="reviewed-author">
-        <text variable="title" font-style="italic" prefix="review of "/>
+        <text font-style="italic" prefix="review of " variable="title"/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" quotes="true"/>
+        <text quotes="true" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if variable="title" match="none">
+      <if match="none" variable="title">
         <choose>
-          <if type="personal_communication" match="none">
-            <text variable="genre" text-case="capitalize-first"/>
+          <if match="none" type="personal_communication">
+            <text text-case="capitalize-first" variable="genre"/>
           </if>
         </choose>
       </if>
-      <else-if type="book graphic motion_picture song" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text term="version"/>
+      <else-if match="any" type="book graphic motion_picture report song">
+        <text font-style="italic" text-case="title" variable="title"/>
+        <group delimiter=" " prefix=" (" suffix=")">
+          <label variable="version"/>
           <text variable="version"/>
         </group>
       </else-if>
       <else-if variable="reviewed-author">
         <group delimiter=", ">
-          <text variable="title" font-style="italic" prefix="Review of "/>
+          <text font-style="italic" prefix="Review of " variable="title"/>
           <names variable="reviewed-author">
-            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <label form="verb-short" suffix=" " text-case="lowercase"/>
             <name and="text" delimiter=", "/>
           </names>
         </group>
       </else-if>
-      <else-if type="bill legislation legal_case interview patent" match="any">
+      <else-if match="any" type="bill legislation legal_case interview patent">
         <text variable="title"/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" quotes="true"/>
+        <text quotes="true" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
   <macro name="title-short">
     <choose>
-      <if variable="title" match="none">
+      <if match="none" variable="title">
         <choose>
           <if type="interview">
             <text term="interview"/>
           </if>
-          <else-if type="manuscript speech" match="any">
-            <text variable="genre" form="short"/>
+          <else-if match="any" type="manuscript speech">
+            <text form="short" variable="genre"/>
           </else-if>
           <else-if type="personal_communication">
             <text macro="issued"/>
           </else-if>
         </choose>
       </if>
-      <else-if type="book graphic motion_picture song" match="any">
-        <text variable="title" text-case="title" form="short" font-style="italic"/>
+      <else-if match="any" type="book graphic motion_picture report song">
+        <text font-style="italic" form="short" text-case="title" variable="title"/>
       </else-if>
-      <else-if type="legal_case" variable="title-short" match="all">
-        <text variable="title" font-style="italic" form="short"/>
+      <else-if type="legal_case" variable="title-short">
+        <text font-style="italic" form="short" variable="title"/>
       </else-if>
-      <else-if type="patent interview" match="any">
-        <text variable="title" form="short"/>
+      <else-if match="any" type="patent interview">
+        <text form="short" variable="title"/>
       </else-if>
-      <else-if type="legal_case bill legislation" match="any">
+      <else-if match="any" type="legal_case bill legislation">
         <text variable="title"/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" form="short" quotes="true"/>
+        <text form="short" quotes="true" text-case="title" variable="title"/>
       </else>
     </choose>
   </macro>
@@ -331,8 +332,8 @@
       <text macro="interviewer-note"/>
       <text variable="medium"/>
       <choose>
-        <if variable="title" match="none"/>
-        <else-if type="manuscript thesis speech" match="any"/>
+        <if match="none" variable="title"/>
+        <else-if match="any" type="manuscript thesis speech"/>
         <else-if type="patent">
           <group delimiter=" ">
             <text variable="authority"/>
@@ -349,11 +350,11 @@
     <group delimiter=", ">
       <group delimiter=". ">
         <text macro="interviewer"/>
-        <text variable="medium" text-case="capitalize-first"/>
+        <text text-case="capitalize-first" variable="medium"/>
       </group>
       <choose>
-        <if variable="title" match="none"/>
-        <else-if type="thesis speech" match="any"/>
+        <if match="none" variable="title"/>
+        <else-if match="any" type="thesis speech"/>
         <else-if type="patent">
           <group delimiter=" ">
             <text variable="authority"/>
@@ -361,7 +362,7 @@
           </group>
         </else-if>
         <else>
-          <text variable="genre" text-case="capitalize-first"/>
+          <text text-case="capitalize-first" variable="genre"/>
         </else>
       </choose>
     </group>
@@ -369,13 +370,13 @@
   <macro name="container-title-note">
     <group delimiter=" ">
       <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
           <text term="in"/>
         </if>
       </choose>
       <choose>
-        <if type="bill legislation legal_case" match="none">
-          <text variable="container-title" text-case="title" font-style="italic"/>
+        <if match="none" type="bill legislation legal_case">
+          <text font-style="italic" text-case="title" variable="container-title"/>
         </if>
       </choose>
     </group>
@@ -383,13 +384,13 @@
   <macro name="container-title">
     <group delimiter=" ">
       <choose>
-        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
           <text term="in" text-case="capitalize-first"/>
         </if>
       </choose>
       <choose>
-        <if type="bill legislation legal_case" match="none">
-          <text variable="container-title" text-case="title" font-style="italic"/>
+        <if match="none" type="bill legislation legal_case">
+          <text font-style="italic" text-case="title" variable="container-title"/>
         </if>
       </choose>
     </group>
@@ -398,15 +399,15 @@
     <choose>
       <if match="none" type="article-journal">
         <choose>
-          <if match="none" is-numeric="collection-number">
+          <if is-numeric="collection-number" match="none">
             <group delimiter=", ">
-              <text variable="collection-title" text-case="title"/>
+              <text text-case="title" variable="collection-title"/>
               <text variable="collection-number"/>
             </group>
           </if>
           <else>
             <group delimiter=" ">
-              <text variable="collection-title" text-case="title"/>
+              <text text-case="title" variable="collection-title"/>
               <text variable="collection-number"/>
             </group>
           </else>
@@ -426,12 +427,12 @@
   </macro>
   <macro name="edition-note">
     <choose>
-      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+      <if match="any" type="book chapter graphic motion_picture paper-conference report song">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
+              <number form="ordinal" variable="edition"/>
+              <label form="short" variable="edition"/>
             </group>
           </if>
           <else>
@@ -443,16 +444,16 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+      <if match="any" type="book chapter graphic motion_picture paper-conference report song">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
+              <number form="ordinal" variable="edition"/>
+              <label form="short" variable="edition"/>
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
+            <text suffix="." text-case="capitalize-first" variable="edition"/>
           </else>
         </choose>
       </if>
@@ -460,7 +461,7 @@
   </macro>
   <macro name="locators-note-join-with-space">
     <choose>
-      <if type="article-journal" variable="volume" match="all">
+      <if type="article-journal" variable="volume">
         <choose>
           <if match="none" variable="collection-title">
             <text macro="locators-note"/>
@@ -471,15 +472,15 @@
   </macro>
   <macro name="locators-note-join-with-comma">
     <choose>
-      <if type="article-journal" match="none">
+      <if match="none" type="article-journal">
         <text macro="locators-note"/>
       </if>
       <else-if type="article-journal">
         <choose>
-          <if variable="volume" match="none">
+          <if match="none" variable="volume">
             <text macro="locators-note"/>
           </if>
-          <else-if match="any" variable="collection-title">
+          <else-if variable="collection-title">
             <text macro="locators-note"/>
           </else-if>
         </choose>
@@ -493,26 +494,26 @@
           <text macro="collection-title-journal"/>
           <number variable="volume"/>
           <group delimiter=" ">
-            <text term="issue" form="short"/>
+            <label form="short" variable="issue"/>
             <number variable="issue"/>
           </group>
         </group>
       </if>
-      <else-if type="bill legislation legal_case" match="any">
+      <else-if match="any" type="bill legislation legal_case">
         <text macro="legal-cites"/>
       </else-if>
-      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
+      <else-if match="any" type="book chapter graphic motion_picture paper-conference report song">
         <group delimiter=", ">
           <text macro="edition-note"/>
           <group delimiter=" ">
-            <text term="volume" form="short"/>
-            <number variable="volume" form="numeric"/>
+            <label form="short" variable="volume"/>
+            <number form="numeric" variable="volume"/>
           </group>
           <choose>
-            <if variable="locator" match="none">
+            <if match="none" variable="locator">
               <group delimiter=" ">
-                <number variable="number-of-volumes" form="numeric"/>
-                <text term="volume" form="short" plural="true"/>
+                <number form="numeric" variable="number-of-volumes"/>
+                <text form="short" plural="true" term="volume"/>
               </group>
             </if>
           </choose>
@@ -522,7 +523,7 @@
   </macro>
   <macro name="legal-cites">
     <choose>
-      <if type="legal_case" match="any">
+      <if type="legal_case">
         <group delimiter=" ">
           <choose>
             <if variable="container-title">
@@ -530,26 +531,26 @@
               <text variable="container-title"/>
               <group delimiter=" ">
                 <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
+                <text form="symbol" term="section"/>
                 <text variable="section"/>
               </group>
               <text variable="page"/>
             </if>
             <else>
-              <text variable="number" prefix="No. "/>
+              <text prefix="No. " variable="number"/>
             </else>
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if match="any" type="bill legislation">
         <group delimiter=", ">
           <choose>
             <if variable="number">
               <!--There's a public law number-->
-              <text variable="number" prefix="Pub. L. No. "/>
+              <text prefix="Pub. L. No. " variable="number"/>
               <group delimiter=" ">
                 <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
+                <text form="symbol" term="section"/>
                 <text variable="section"/>
               </group>
               <group delimiter=" ">
@@ -563,7 +564,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <!--change to label variable="section" as that becomes available -->
-                <text term="section" form="symbol"/>
+                <text form="symbol" term="section"/>
                 <text variable="section"/>
               </group>
             </else>
@@ -574,7 +575,7 @@
   </macro>
   <macro name="locators-join-with-space">
     <choose>
-      <if type="article-journal" variable="volume" match="all">
+      <if type="article-journal" variable="volume">
         <choose>
           <if match="none" variable="collection-title">
             <text macro="locators"/>
@@ -585,15 +586,15 @@
   </macro>
   <macro name="locators-join-with-comma">
     <choose>
-      <if type="bill chapter legislation legal_case paper-conference" match="any">
+      <if match="any" type="bill chapter legislation legal_case paper-conference">
         <text macro="locators"/>
       </if>
       <else-if type="article-journal">
         <choose>
-          <if variable="volume" match="none">
+          <if match="none" variable="volume">
             <text macro="locators"/>
           </if>
-          <else-if match="any" variable="collection-title">
+          <else-if variable="collection-title">
             <text macro="locators"/>
           </else-if>
         </choose>
@@ -602,7 +603,7 @@
   </macro>
   <macro name="locators-join-with-period">
     <choose>
-      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
+      <if match="none" type="bill legislation legal_case article-journal chapter paper-conference">
         <text macro="locators"/>
       </if>
     </choose>
@@ -614,35 +615,35 @@
           <text macro="collection-title-journal"/>
           <number variable="volume"/>
           <group delimiter=" ">
-            <text term="issue" form="short"/>
+            <label form="short" variable="issue"/>
             <number variable="issue"/>
           </group>
         </group>
       </if>
-      <else-if type="bill legislation legal_case" match="any">
+      <else-if match="any" type="bill legislation legal_case">
         <text macro="legal-cites"/>
       </else-if>
-      <else-if type="book graphic motion_picture report song" match="any">
+      <else-if match="any" type="book graphic motion_picture report song">
         <group delimiter=". ">
           <text macro="edition"/>
           <group delimiter=" ">
-            <text term="volume" form="short" text-case="capitalize-first"/>
-            <number variable="volume" form="numeric"/>
+            <label form="short" variable="volume" text-case="capitalize-first"/>
+            <number form="numeric" variable="volume"/>
           </group>
           <group delimiter=" ">
-            <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" plural="true"/>
+            <number form="numeric" variable="number-of-volumes"/>
+            <text form="short" plural="true" term="volume"/>
           </group>
         </group>
       </else-if>
-      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <else-if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
         <group delimiter=". ">
           <text macro="edition"/>
           <choose>
-            <if variable="page" match="none">
+            <if match="none" variable="page">
               <group delimiter=" ">
-                <text term="volume" form="short" text-case="capitalize-first"/>
-                <number variable="volume" form="numeric"/>
+                <label form="short" variable="volume" text-case="capitalize-first"/>
+                <number form="numeric" variable="volume"/>
               </group>
             </if>
           </choose>
@@ -656,10 +657,10 @@
         <group delimiter=", ">
           <group delimiter=" ">
             <number variable="edition"/>
-            <text term="edition"/>
+            <label variable="edition"/>
           </group>
           <group delimiter=" ">
-            <text term="section" form="short"/>
+            <label form="short" variable="section"/>
             <text variable="section"/>
           </group>
         </group>
@@ -698,16 +699,16 @@
         <text variable="original-publisher-place"/>
         <text variable="original-publisher"/>
       </group>
-      <date variable="original-date" form="text" date-parts="year"/>
+      <date date-parts="year" form="text" variable="original-date"/>
     </group>
   </macro>
   <macro name="reprint-note">
     <!--needs localization-->
     <choose>
-      <if variable="original-date issued" match="all">
+      <if variable="original-date issued">
         <choose>
           <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear-->
-          <if variable="original-publisher original-publisher-place" match="none">
+          <if match="none" variable="original-publisher original-publisher-place">
             <text value="repr."/>
           </if>
         </choose>
@@ -717,8 +718,8 @@
   <macro name="reprint">
     <!--needs localization-->
     <choose>
-      <if variable="original-date issued" match="all">
-        <text value="reprint" text-case="capitalize-first"/>
+      <if variable="original-date issued">
+        <text text-case="capitalize-first" value="reprint"/>
       </if>
     </choose>
   </macro>
@@ -742,24 +743,24 @@
     <choose>
       <if variable="issued">
         <choose>
-          <if type="graphic report" match="any">
-            <date variable="issued" form="text"/>
+          <if match="any" type="graphic report">
+            <date form="text" variable="issued"/>
           </if>
           <else-if type="legal_case">
             <group delimiter=" ">
               <text variable="authority"/>
               <choose>
-                <if variable="container-title" match="any">
+                <if variable="container-title">
                   <!--Only print year for cases published in reporters-->
-                  <date variable="issued" form="numeric" date-parts="year"/>
+                  <date date-parts="year" form="numeric" variable="issued"/>
                 </if>
                 <else>
-                  <date variable="issued" form="text"/>
+                  <date form="text" variable="issued"/>
                 </else>
               </choose>
             </group>
           </else-if>
-          <else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
+          <else-if match="any" type="book bill chapter graphic legislation motion_picture paper-conference report song thesis">
             <date variable="issued">
               <date-part name="year"/>
             </date>
@@ -769,37 +770,37 @@
               <group delimiter=" ">
                 <!--Needs Localization-->
                 <text value="filed"/>
-                <date variable="submitted" form="text"/>
+                <date form="text" variable="submitted"/>
               </group>
               <group delimiter=" ">
                 <choose>
-                  <if variable="issued submitted" match="all">
+                  <if variable="issued submitted">
                     <text term="and"/>
                   </if>
                 </choose>
                 <!--Needs Localization-->
                 <text value="issued"/>
-                <date variable="issued" form="text"/>
+                <date form="text" variable="issued"/>
               </group>
             </group>
           </else-if>
           <else>
-            <date variable="issued" form="text"/>
+            <date form="text" variable="issued"/>
           </else>
         </choose>
       </if>
       <else-if variable="status">
         <text variable="status"/>
       </else-if>
-      <else-if variable="accessed URL" match="all"/>
+      <else-if variable="accessed URL"/>
       <else>
-        <text term="no date" form="short"/>
+        <text form="short" term="no date"/>
       </else>
     </choose>
   </macro>
   <macro name="point-locators-subsequent">
     <choose>
-      <if type="legal_case" variable="locator" match="all">
+      <if type="legal_case" variable="locator">
         <choose>
           <if locator="page">
             <group delimiter=":">
@@ -809,7 +810,7 @@
           </if>
           <else>
             <group delimiter=" ">
-              <label variable="locator" form="short"/>
+              <label form="short" variable="locator"/>
               <text variable="locator"/>
             </group>
           </else>
@@ -820,32 +821,32 @@
           <if locator="page" match="none">
             <group delimiter=" ">
               <choose>
-                <if type="book graphic motion_picture report song" match="any">
+                <if match="any" type="book graphic motion_picture report song">
                   <choose>
                     <if variable="volume">
                       <group delimiter=", ">
                         <group delimiter=" ">
-                          <text term="volume" form="short"/>
-                          <number variable="volume" form="numeric"/>
+                          <label form="short" variable="volume"/>
+                          <number form="numeric" variable="volume"/>
                         </group>
-                        <label variable="locator" form="short"/>
+                        <label form="short" variable="locator"/>
                       </group>
                     </if>
                     <else>
-                      <label variable="locator" form="short"/>
+                      <label form="short" variable="locator"/>
                     </else>
                   </choose>
                 </if>
                 <else>
-                  <label variable="locator" form="short"/>
+                  <label form="short" variable="locator"/>
                 </else>
               </choose>
               <text variable="locator"/>
             </group>
           </if>
-          <else-if type="book graphic motion_picture report song" match="any">
+          <else-if match="any" type="book graphic motion_picture report song">
             <group delimiter=":">
-              <number variable="volume" form="numeric"/>
+              <number form="numeric" variable="volume"/>
               <text variable="locator"/>
             </group>
           </else-if>
@@ -860,9 +861,9 @@
     <choose>
       <if type="article-journal">
         <choose>
-          <if variable="locator page" match="any">
+          <if match="any" variable="locator page">
             <choose>
-              <if variable="volume issue" match="any">
+              <if match="any" variable="volume issue">
                 <text macro="point-locators"/>
               </if>
             </choose>
@@ -873,19 +874,19 @@
   </macro>
   <macro name="point-locators-join-with-comma">
     <choose>
-      <if type="article-journal" match="none">
+      <if match="none" type="article-journal">
         <text macro="point-locators"/>
       </if>
-      <else-if variable="volume issue" match="none">
+      <else-if match="none" variable="volume issue">
         <text macro="point-locators"/>
       </else-if>
     </choose>
   </macro>
   <macro name="point-locators">
     <choose>
-      <if variable="locator" match="none">
+      <if match="none" variable="locator">
         <choose>
-          <if type="article-journal chapter paper-conference" match="any">
+          <if match="any" type="article-journal chapter paper-conference">
             <text variable="page"/>
           </if>
         </choose>
@@ -894,7 +895,7 @@
         <group delimiter=" ">
           <choose>
             <if locator="page" match="none">
-              <label variable="locator" form="short" suffix=" "/>
+              <label form="short" suffix=" " variable="locator"/>
             </if>
           </choose>
           <text variable="locator"/>
@@ -905,7 +906,7 @@
         <group delimiter=" ">
           <choose>
             <if locator="page" match="none">
-              <label variable="locator" form="short"/>
+              <label form="short" variable="locator"/>
             </if>
           </choose>
           <text variable="locator"/>
@@ -915,13 +916,13 @@
   </macro>
   <macro name="locators-chapter">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if match="any" type="chapter entry-dictionary entry-encyclopedia paper-conference">
         <choose>
-          <if variable="author container-author" match="all"/>
+          <if variable="author container-author"/>
           <else>
             <choose>
               <if variable="page">
-                <number variable="volume" suffix=":"/>
+                <number suffix=":" variable="volume"/>
                 <text variable="page"/>
               </if>
             </choose>
@@ -934,7 +935,7 @@
     <choose>
       <if type="article-journal">
         <choose>
-          <if variable="volume issue" match="any">
+          <if match="any" variable="volume issue">
             <text variable="page"/>
           </if>
         </choose>
@@ -945,7 +946,7 @@
     <choose>
       <if type="article-journal">
         <choose>
-          <if variable="volume issue" match="none">
+          <if match="none" variable="volume issue">
             <text variable="page"/>
           </if>
         </choose>
@@ -957,7 +958,7 @@
       <if type="thesis">
         <group delimiter=" ">
           <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
+          <text prefix="(" suffix=")" variable="archive_location"/>
         </group>
       </if>
       <else>
@@ -974,12 +975,12 @@
       <if type="thesis">
         <group delimiter=" ">
           <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
+          <text prefix="(" suffix=")" variable="archive_location"/>
         </group>
       </if>
       <else>
         <group delimiter=". ">
-          <text variable="archive_location" text-case="capitalize-first"/>
+          <text text-case="capitalize-first" variable="archive_location"/>
           <text variable="archive"/>
           <text variable="archive-place"/>
         </group>
@@ -988,15 +989,15 @@
   </macro>
   <macro name="issue-note-join-with-space">
     <choose>
-      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
+      <if match="any" type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher">
         <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
         <choose>
-          <if type="article-newspaper" match="none">
+          <if match="none" type="article-newspaper">
             <choose>
-              <if type="article-journal" match="none">
+              <if match="none" type="article-journal">
                 <text macro="issue-note"/>
               </if>
-              <else-if variable="issue volume" match="any">
+              <else-if match="any" variable="issue volume">
                 <text macro="issue-note"/>
               </else-if>
             </choose>
@@ -1007,7 +1008,7 @@
   </macro>
   <macro name="issue-note-join-with-comma">
     <choose>
-      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
+      <if match="none" type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher">
         <text macro="issue-note"/>
       </if>
       <else-if type="article-newspaper">
@@ -1015,7 +1016,7 @@
       </else-if>
       <else-if type="article-journal">
         <choose>
-          <if variable="volume issue" match="none">
+          <if match="none" variable="volume issue">
             <text macro="issue-note"/>
           </if>
         </choose>
@@ -1024,12 +1025,12 @@
   </macro>
   <macro name="issue-note">
     <choose>
-      <if type="bill legislation legal_case" match="any">
+      <if match="any" type="bill legislation legal_case">
         <text macro="issued" prefix="(" suffix=")"/>
       </if>
       <else-if type="article-journal">
         <choose>
-          <if variable="volume issue" match="any">
+          <if match="any" variable="volume issue">
             <text macro="issued" prefix="(" suffix=")"/>
           </if>
           <else>
@@ -1040,11 +1041,11 @@
       <else-if type="article-newspaper">
         <text macro="issued"/>
       </else-if>
-      <else-if variable="publisher-place event-place publisher genre" match="any">
-        <group prefix="(" suffix=")" delimiter=", ">
+      <else-if match="any" variable="publisher-place event-place publisher genre">
+        <group delimiter=", " prefix="(" suffix=")">
           <choose>
-            <if variable="title" match="none"/>
-            <else-if type="manuscript thesis speech" match="any">
+            <if match="none" variable="title"/>
+            <else-if match="any" type="manuscript thesis speech">
               <text variable="genre"/>
             </else-if>
           </choose>
@@ -1066,23 +1067,23 @@
   </macro>
   <macro name="issue-join-with-space">
     <choose>
-      <if type="article-journal" match="any">
+      <if type="article-journal">
         <choose>
-          <if variable="issue volume" match="any">
+          <if match="any" variable="issue volume">
             <text macro="issue"/>
           </if>
         </choose>
       </if>
-      <else-if type="bill legislation legal_case" match="any">
+      <else-if match="any" type="bill legislation legal_case">
         <text macro="issue"/>
       </else-if>
     </choose>
   </macro>
   <macro name="issue-join-with-period">
     <choose>
-      <if type="article-journal bill legislation legal_case" match="none">
+      <if match="none" type="article-journal bill legislation legal_case">
         <choose>
-          <if type="speech" variable="publisher publisher-place" match="any">
+          <if match="any" type="speech" variable="publisher publisher-place">
             <text macro="issue"/>
           </if>
         </choose>
@@ -1091,16 +1092,16 @@
   </macro>
   <macro name="issue-join-with-comma">
     <choose>
-      <if type="bill legislation legal_case" match="none">
+      <if match="none" type="bill legislation legal_case">
         <choose>
-          <if type="article-journal" match="none">
+          <if match="none" type="article-journal">
             <choose>
-              <if type="speech" variable="publisher publisher-place" match="none">
+              <if match="none" type="speech" variable="publisher publisher-place">
                 <text macro="issue"/>
               </if>
             </choose>
           </if>
-          <else-if variable="volume issue" match="none">
+          <else-if match="none" variable="volume issue">
             <text macro="issue"/>
           </else-if>
         </choose>
@@ -1109,12 +1110,12 @@
   </macro>
   <macro name="issue">
     <choose>
-      <if type="bill legislation legal_case" match="any">
+      <if match="any" type="bill legislation legal_case">
         <text macro="issued" prefix="(" suffix=")"/>
       </if>
       <else-if type="article-journal">
         <choose>
-          <if variable="issue volume" match="any">
+          <if match="any" variable="issue volume">
             <text macro="issued" prefix="(" suffix=")"/>
           </if>
           <else>
@@ -1126,9 +1127,9 @@
         <group delimiter=", ">
           <group delimiter=" ">
             <choose>
-              <if variable="title" match="none"/>
+              <if match="none" variable="title"/>
               <else>
-                <text variable="genre" text-case="capitalize-first"/>
+                <text text-case="capitalize-first" variable="genre"/>
               </else>
             </choose>
             <text macro="event"/>
@@ -1141,11 +1142,11 @@
       <else-if type="article-newspaper">
         <text macro="issued"/>
       </else-if>
-      <else-if variable="publisher-place publisher" match="any">
+      <else-if match="any" variable="publisher-place publisher">
         <group delimiter=", ">
           <choose>
             <if type="thesis">
-              <text variable="genre" text-case="capitalize-first"/>
+              <text text-case="capitalize-first" variable="genre"/>
             </if>
           </choose>
           <group delimiter=". ">
@@ -1166,26 +1167,26 @@
   <macro name="access-note">
     <group delimiter=", ">
       <choose>
-        <if type="graphic report" match="any">
+        <if match="any" type="graphic report">
           <text macro="archive-note"/>
         </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+        <else-if match="none" type="article-journal bill book chapter legal_case legislation motion_picture paper-conference">
           <text macro="archive-note"/>
         </else-if>
       </choose>
       <choose>
-        <if variable="issued" match="none">
+        <if match="none" variable="issued">
           <group delimiter=" ">
             <text term="accessed"/>
-            <date variable="accessed" form="text"/>
+            <date form="text" variable="accessed"/>
           </group>
         </if>
       </choose>
       <choose>
-        <if type="legal_case" match="none">
+        <if match="none" type="legal_case">
           <choose>
             <if variable="DOI">
-              <text variable="DOI" prefix="doi:"/>
+              <text prefix="doi:" variable="DOI"/>
             </if>
             <else>
               <text variable="URL"/>
@@ -1198,26 +1199,26 @@
   <macro name="access">
     <group delimiter=". ">
       <choose>
-        <if type="graphic report" match="any">
+        <if match="any" type="graphic report">
           <text macro="archive"/>
         </if>
-        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+        <else-if match="none" type="article-journal bill book chapter legal_case legislation motion_picture paper-conference">
           <text macro="archive"/>
         </else-if>
       </choose>
       <choose>
-        <if variable="issued" match="none">
+        <if match="none" variable="issued">
           <group delimiter=" ">
             <text term="accessed" text-case="capitalize-first"/>
-            <date variable="accessed" form="text"/>
+            <date form="text" variable="accessed"/>
           </group>
         </if>
       </choose>
       <choose>
-        <if type="legal_case" match="none">
+        <if match="none" type="legal_case">
           <choose>
             <if variable="DOI">
-              <text variable="DOI" prefix="doi:"/>
+              <text prefix="doi:" variable="DOI"/>
             </if>
             <else>
               <text variable="URL"/>
@@ -1255,8 +1256,8 @@
       </if>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout suffix="." delimiter="; ">
+  <citation disambiguate-add-names="true" et-al-min="4" et-al-use-first="1">
+    <layout delimiter="; " suffix=".">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -1322,7 +1323,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+  <bibliography entry-spacing="0" et-al-min="11" et-al-use-first="7" hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>