csl-styles 1.0.1.9 → 1.0.1.10

data/vendor/styles/harvard-university-for-the-creative-arts.csl

@@ -14,31 +14,27 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>University for the Creative Arts Harvard style</summary>
-    <updated>2018-07-01T17:26:23+00:00</updated>
+    <updated>2019-10-17T09:38:49+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>
     <terms>
-      <term name="accessed">accessed on</term>
+      <term name="accessed">accessed </term>
       <term name="no date" form="short">s.d.</term>
     </terms>
   </locale>
   <macro name="cite-author">
     <choose>
       <if type="broadcast motion_picture legislation bill map legal_case" match="any">
-        <text variable="title" font-style="italic" suffix="."/>
+        <text variable="title" font-style="italic"/>
       </if>
       <else>
         <names variable="author">
-          <name font-style="normal" and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-          <label form="short" prefix=" "/>
+          <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
           <et-al font-style="italic"/>
           <substitute>
-            <names variable="editor">
-              <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-              <label form="short" plural="never" text-case="lowercase" prefix=" (" suffix=")"/>
-              <et-al font-style="italic"/>
-            </names>
+            <names variable="editor"/>
             <text variable="title" font-style="italic"/>
           </substitute>
         </names>
@@ -69,7 +65,12 @@
   <macro name="primary-title">
     <choose>
       <if type="chapter article-journal article-newspaper article-magazine paper-conference" match="any">
-        <text variable="title" prefix="'" suffix="'"/>
+        <text variable="title" prefix="'" suffix="' "/>
+        <choose>
+          <if match="any" variable="original-title">
+            <text variable="original-title" prefix="(" suffix=")."/>
+          </if>
+        </choose>
       </if>
       <else-if type="bill legal_case legislation motion_picture" match="any">
         <text variable="collection-number"/>
@@ -90,6 +91,11 @@
             <group delimiter=" ">
               <group delimiter=" ">
                 <text variable="title" font-style="italic" suffix="."/>
+                <choose>
+                  <if match="any" variable="original-title">
+                    <text variable="original-title" font-style="italic" prefix="(" suffix=")"/>
+                  </if>
+                </choose>
                 <choose>
                   <if match="any" variable="volume">
                     <text term="volume" form="short" text-case="capitalize-first"/>
@@ -102,6 +108,7 @@
                     <if type="song" match="any">
                       <text term="in" text-case="capitalize-first"/>
                       <text variable="collection-title"/>
+                      <text variable="container-title"/>
                     </if>
                   </choose>
                 </group>
@@ -150,13 +157,17 @@
         <text variable="archive" prefix=": " suffix="."/>
       </else-if>
       <else-if type="speech personal_communication" match="any">
-        <group delimiter=" " prefix="[" suffix="]">
-          <names variable="recipient" prefix="Email sent to " suffix=",">
-            <name/>
+        <group delimiter=" " prefix="[" suffix="].">
+          <names variable="recipient" prefix="Email sent to ">
+            <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
           </names>
           <text variable="genre" suffix=" "/>
-          <text variable="event-place" suffix=":"/>
-          <date form="text" variable="issued"/>
+          <text variable="event-place"/>
+          <date delimiter="/" variable="issued">
+            <date-part name="day" form="numeric-leading-zeros"/>
+            <date-part name="month" form="numeric-leading-zeros"/>
+            <date-part name="year"/>
+          </date>
         </group>
       </else-if>
     </choose>
@@ -190,8 +201,6 @@
             <et-al font-style="italic"/>
           </names>
           <text variable="section"/>
-          <text variable="volume"/>
-          <text variable="chapter-number"/>
         </group>
       </if>
     </choose>
@@ -199,14 +208,8 @@
   <macro name="publisher">
     <choose>
       <if match="any" variable="publisher">
-        <text variable="publisher" prefix=" " suffix="."/>
+        <text variable="publisher"/>
       </if>
-      <else-if type="manuscript" match="any">
-        <group delimiter=". ">
-          <text variable="archive_location"/>
-          <text variable="archive"/>
-        </group>
-      </else-if>
       <else-if match="any" variable="URL"/>
       <else>
         <text value="s.n." prefix=" (" suffix=")."/>
@@ -221,7 +224,7 @@
       <else-if type="report entry-dictionary entry-encyclopedia motion_picture chapter speech song paper-conference article-journal book" match="all" variable="URL">
         <text variable="publisher-place"/>
       </else-if>
-      <else-if type="manuscript map" match="any"/>
+      <else-if type="map motion_picture" match="any"/>
       <else>
         <text value="s.l." prefix="(" suffix=")"/>
       </else>
@@ -229,18 +232,13 @@
   </macro>
   <macro name="container">
     <choose>
-      <if type="entry-dictionary entry-encyclopedia paper-conference chapter" match="any">
+      <if type="entry-dictionary entry-encyclopedia paper-conference" match="any">
         <group>
           <text term="in" text-case="capitalize-first" suffix=": "/>
-          <names variable="editor" delimiter="." suffix=" ">
-            <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-            <label form="short" plural="never" text-case="lowercase" prefix=" (" suffix=")"/>
-            <et-al font-style="italic"/>
-          </names>
+          <text macro="editor"/>
           <group delimiter=", ">
-            <group font-style="normal" font-variant="normal" delimiter=" ">
+            <group delimiter=" ">
               <text variable="container-title" font-style="italic" suffix="."/>
-              <text variable="collection-title" font-style="italic"/>
               <group delimiter=" " suffix=".">
                 <text term="volume" form="short" text-case="capitalize-first"/>
                 <text variable="volume" text-case="uppercase"/>
@@ -260,21 +258,17 @@
           </group>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
-        <text variable="container-title" font-style="normal" suffix="."/>
-      </else-if>
-      <else-if type="legal_case">
-        <text variable="container-title"/>
-      </else-if>
       <else-if type="patent">
         <text variable="number" suffix="."/>
       </else-if>
-      <else-if type="broadcast motion_picture" match="any">
+      <else-if type="motion_picture article broadcast" match="any">
         <choose>
           <if match="any" variable="collection-title container-title">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text variable="collection-title" font-style="italic" suffix="."/>
-            <text variable="container-title" font-style="italic" suffix="."/>
+            <group suffix=" ">
+              <text term="in" text-case="capitalize-first" suffix=": "/>
+              <text variable="collection-title" font-style="italic" suffix="."/>
+              <text variable="container-title" font-style="italic" suffix="."/>
+            </group>
           </if>
         </choose>
         <names variable="author" prefix="Directed by ">
@@ -291,12 +285,22 @@
       </else-if>
       <else-if type="article" match="any"/>
       <else-if type="map" match="any">
-        <text variable="genre" prefix="[" suffix="]"/>
-        <text variable="scale" prefix=" " suffix="."/>
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="collection-title"/>
+          <text variable="genre"/>
+          <text variable="scale"/>
+        </group>
+      </else-if>
+      <else-if type="chapter" match="any">
+        <text term="in" text-case="capitalize-first" suffix=": "/>
+        <text macro="editor"/>
+        <text macro="translator"/>
+        <text variable="container-title" font-style="italic" suffix="."/>
+        <text macro="edition-no" prefix=" "/>
       </else-if>
       <else>
         <choose>
-          <if variable="volume issue page" match="any" type="article-newspaper">
+          <if variable="volume issue page" match="any" type="article-newspaper article-magazine">
             <text variable="container-title" font-style="italic" prefix="In: " suffix=" "/>
           </if>
         </choose>
@@ -329,9 +333,9 @@
           </group>
           <choose>
             <if type="article-magazine interview article-newspaper" match="any">
-              <date delimiter=" " variable="issued">
-                <date-part name="day"/>
-                <date-part name="month"/>
+              <date delimiter="/" variable="issued">
+                <date-part name="day" form="numeric-leading-zeros"/>
+                <date-part name="month" form="numeric-leading-zeros"/>
                 <date-part name="year"/>
               </date>
             </if>
@@ -344,38 +348,29 @@
               </group>
             </if>
           </choose>
-          <choose>
-            <if variable="URL">
-              <choose>
-                <if type="article-magazine bill chapter legislation paper-conference article-journal article-newspaper entry-encyclopedia entry-dictionary" match="any">
-                  <text term="online" prefix="[" suffix="]"/>
-                </if>
-              </choose>
-            </if>
-          </choose>
         </group>
       </if>
-      <else-if type="book chapter paper-conference entry-dictionary entry-encyclopedia motion_picture report manuscript article bill map song" match="any">
-        <group>
-          <text variable="event" suffix=". "/>
-          <group delimiter=":" suffix=".">
+      <else-if type="book chapter paper-conference entry-dictionary entry-encyclopedia motion_picture report article map song" match="any">
+        <group delimiter=". ">
+          <text variable="event"/>
+          <group delimiter=": " suffix=".">
             <text macro="publisher-place"/>
             <text macro="publisher"/>
           </group>
           <group>
-            <label prefix="  " variable="page" form="short"/>
+            <label prefix=" " variable="page" form="short"/>
             <text variable="page" suffix="."/>
           </group>
         </group>
       </else-if>
       <else-if type="broadcast">
-        <group delimiter=" ">
+        <group>
           <text variable="event"/>
-          <text macro="publisher"/>
-          <group>
-            <date delimiter=" " variable="issued" suffix=".">
-              <date-part name="day"/>
-              <date-part name="month"/>
+          <group suffix=".">
+            <text macro="publisher"/>
+            <date delimiter="/" variable="issued" prefix=" ">
+              <date-part name="day" form="numeric-leading-zeros"/>
+              <date-part name="month" form="numeric-leading-zeros"/>
               <date-part name="year"/>
             </date>
           </group>
@@ -385,6 +380,13 @@
       <else-if type="thesis" match="any">
         <text variable="publisher" suffix="."/>
       </else-if>
+      <else-if type="manuscript" match="any">
+        <group delimiter=" " suffix=".">
+          <text variable="archive_location" suffix="."/>
+          <text variable="archive-place" suffix=":"/>
+          <text variable="archive"/>
+        </group>
+      </else-if>
     </choose>
   </macro>
   <macro name="online-access">
@@ -393,11 +395,11 @@
         <group>
           <text value="At: " prefix=" "/>
           <text variable="URL"/>
-          <group prefix=" (" suffix=")">
-            <text term="accessed" text-case="capitalize-first" suffix=" "/>
-            <date delimiter="" variable="accessed">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" range-delimiter="" suffix=" "/>
+          <group prefix=" (" suffix=").">
+            <text term="accessed" plural="true" text-case="capitalize-first" suffix=" "/>
+            <date delimiter="/" variable="accessed">
+              <date-part name="day" form="numeric-leading-zeros"/>
+              <date-part name="month" form="numeric-leading-zeros" range-delimiter=""/>
               <date-part name="year" range-delimiter="-"/>
             </date>
           </group>
@@ -412,17 +414,25 @@
       </if>
       <else>
         <names variable="author">
-          <name form="short" font-style="normal" and="text" delimiter-precedes-last="never" initialize-with="."/>
+          <name form="short" and="text" delimiter-precedes-last="never" initialize-with="."/>
           <et-al font-style="italic"/>
           <substitute>
+            <names variable="editor"/>
             <text variable="title"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter="," suffix=" ">
+      <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year-suffix" et-al-min="3" et-al-use-first="1">
-    <layout delimiter=";" prefix="(" suffix=")">
+    <layout delimiter="; " prefix="(" suffix=")">
       <group delimiter=":">
         <group delimiter=", ">
           <text macro="author-short"/>
@@ -460,11 +470,6 @@
         </group>
         <text macro="legal-detail"/>
         <text macro="locator"/>
-        <choose>
-          <if type="map" match="any">
-            <text variable="collection-title" prefix="(" suffix=")"/>
-          </if>
-        </choose>
       </group>
       <text macro="online-access"/>
     </layout>

data/vendor/styles/harvard-university-of-bath.csl

@@ -6,51 +6,80 @@
     <id>http://www.zotero.org/styles/harvard-university-of-bath</id>
     <link href="http://www.zotero.org/styles/harvard-university-of-bath" rel="self"/>
     <link href="http://www.zotero.org/styles/harvard-bournemouth-university" rel="template"/>
-    <link href="http://www.bath.ac.uk/library/infoskills/referencing-plagiarism/harvard-bath-style.html" rel="documentation"/>
+    <link href="https://library.bath.ac.uk/referencing/harvard-bath" rel="documentation"/>
+    <link href="https://github.com/alex-ball/bathbib/" rel="documentation"/>
     <author>
       <name>Rob Fuller</name>
       <email>rob.fuller1@gmail.com</email>
     </author>
+    <author>
+      <name>Alex Ball</name>
+      <email>ab318@bath.ac.uk</email>
+    </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>Adaptation of Harvard referencing style used at the University of Bath. This template has been developed by a student: it is not an official template provided by the university.</summary>
-    <updated>2017-03-12T20:34:54+00:00</updated>
+    <summary>Adaptation of Harvard referencing style used at the University of Bath.</summary>
+    <updated>2019-09-15T20:13:55+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="available at">available from</term>
+      <term name="chapter" form="short">
+        <single>c.</single>
+        <multiple>cc.</multiple>
+      </term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="number" form="long">number</term>
+      <term name="number" form="short">no.</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="version" form="short">v.</term>
+    </terms>
+  </locale>
   <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with=". " delimiter=", "/>
+    <names variable="editor">
+      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
       <label form="short" prefix=", " text-case="lowercase"/>
     </names>
   </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" initialize-with="." name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" " text-case="lowercase"/>
       <substitute>
-        <names variable="editor"/>
-        <text macro="anon"/>
+        <names variable="editor">
+          <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+          <label form="short" prefix=", " text-case="lowercase"/>
+        </names>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
+      <name form="short" and="text" delimiter-precedes-last="never" initialize-with="."/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text macro="anon"/>
+        <text macro="title-short"/>
       </substitute>
     </names>
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <text value="Available from:" suffix=" "/>
-        <text variable="URL"/>
+      <if variable="URL DOI" match="any">
+        <text term="available at" text-case="capitalize-first" suffix=": "/>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else>
+            <text variable="URL"/>
+          </else>
+        </choose>
         <group prefix=" [" suffix="]">
           <text term="accessed" text-case="capitalize-first" suffix=" "/>
           <date variable="accessed">
@@ -62,19 +91,99 @@
       </if>
     </choose>
   </macro>
+  <macro name="archive">
+    <choose>
+      <if type="graphic">
+        <text variable="archive-place" prefix="At: " suffix=". "/>
+        <text variable="archive"/>
+      </if>
+      <else>
+        <text variable="archive" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="credits">
+    <group delimiter=". ">
+      <names variable="composer">
+        <label form="verb" text-case="capitalize-first" suffix=" "/>
+        <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="."/>
+      </names>
+      <names variable="director">
+        <label form="verb" text-case="capitalize-first" suffix=" "/>
+        <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="."/>
+      </names>
+      <names variable="interviewer">
+        <label form="verb" text-case="capitalize-first" suffix=" "/>
+        <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="."/>
+      </names>
+      <names variable="illustrator">
+        <label form="verb" text-case="capitalize-first" suffix=" "/>
+        <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="."/>
+      </names>
+    </group>
+  </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song webpage thesis" match="any">
+      <if type="bill broadcast book dataset graphic legal_case map motion_picture musical_score patent report song speech webpage thesis" match="any">
         <text variable="title" font-style="italic"/>
       </if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="container-title">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="title"/>
       </else>
     </choose>
+    <text variable="original-title" prefix=" [" suffix="]"/>
+    <group prefix=" (" suffix=")">
+      <text term="version" form="short"/>
+      <text variable="version"/>
+    </group>
+    <choose>
+      <if type="thesis motion_picture broadcast" match="any"/>
+      <else-if type="report" variable="number"/>
+      <else-if type="patent" variable="number"/>
+      <else>
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="bill broadcast book dataset graphic map motion_picture musical_score patent report song webpage thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="legislation legal_case" match="any">
+        <choose>
+          <if variable="container-title">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="translator">
+    <names variable="translator" prefix="(" suffix=")">
+      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
   </macro>
   <macro name="online">
     <choose>
-      <if variable="URL" match="any">
+      <if variable="URL DOI" match="any">
         <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
       </if>
     </choose>
@@ -88,9 +197,20 @@
   <macro name="year-date">
     <choose>
       <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <choose>
+          <if type="post">
+            <date variable="issued">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </if>
+          <else>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else>
+        </choose>
       </if>
       <else>
         <text term="no date" form="short"/>
@@ -117,7 +237,20 @@
     <choose>
       <if variable="collection-title">
         <text variable="collection-title"/>
-        <text variable="number" prefix=" no. "/>
+        <text variable="number" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="series-genre">
+    <choose>
+      <if variable="collection-title genre number" match="any">
+        <group delimiter=", ">
+          <text variable="collection-title"/>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+        </group>
       </if>
     </choose>
   </macro>
@@ -130,10 +263,8 @@
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="author-short"/>
-          <text macro="year-date"/>
-        </group>
+        <text macro="author-short"/>
+        <text macro="year-date"/>
         <group>
           <label variable="locator" form="short"/>
           <text variable="locator"/>
@@ -148,40 +279,278 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author" suffix=","/>
-      <date variable="issued" prefix=" " suffix=".">
-        <date-part name="year"/>
-      </date>
       <choose>
-        <if type="bill book graphic legal_case legislation motion_picture song" match="any">
-          <group prefix=" " suffix="." delimiter=". ">
+        <if type="legislation">
+          <group suffix=".">
+            <group delimiter=" ">
+              <text macro="author"/>
+              <choose>
+                <if variable="container-title">
+                  <text macro="year-date" prefix="[" suffix="]"/>
+                </if>
+                <else>
+                  <text macro="year-date" font-style="italic"/>
+                </else>
+              </choose>
+            </group>
+            <text macro="title" prefix=", "/>
+            <text macro="online" prefix=" "/>
+            <choose>
+              <if variable="container-title">
+                <group prefix=" " delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <group>
+                    <text variable="collection-title"/>
+                    <group delimiter="/">
+                      <number variable="volume"/>
+                      <text variable="page"/>
+                    </group>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <choose>
+                  <if variable="collection-title">
+                    <group prefix=" (" suffix=")" delimiter=", ">
+                      <text variable="collection-title"/>
+                      <group>
+                        <text term="chapter" form="short"/>
+                        <number variable="chapter-number"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <group prefix=", ">
+                      <text term="chapter" form="short"/>
+                      <number variable="chapter-number"/>
+                    </group>
+                  </else>
+                </choose>
+                <group prefix=", ">
+                  <text term="number" form="short" text-case="capitalize-first"/>
+                  <number variable="number"/>
+                </group>
+                <choose>
+                  <if variable="number">
+                    <text prefix=", " macro="publisher"/>
+                  </if>
+                  <else>
+                    <text prefix=". " macro="publisher"/>
+                  </else>
+                </choose>
+              </else>
+            </choose>
+          </group>
+        </if>
+        <else-if type="legal_case">
+          <choose>
+            <if variable="number">
+              <group suffix="." delimiter=" ">
+                <text macro="author"/>
+                <text variable="number" prefix="(" suffix=")"/>
+                <text macro="year-date" prefix="[" suffix="]"/>
+                <text macro="title"/>
+                <text macro="online"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="container-title" font-style="italic"/>
+                    <group>
+                      <text variable="collection-title"/>
+                      <group delimiter="/">
+                        <text variable="volume"/>
+                        <text variable="page"/>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <text variable="collection-title"/>
+                    <group delimiter="&#8211;">
+                      <text variable="volume"/>
+                      <text variable="page"/>
+                    </group>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group suffix="." delimiter=". ">
+                <text macro="author"/>
+                <choose>
+                  <if variable="volume">
+                    <text macro="year-date" prefix="(" suffix=")"/>
+                  </if>
+                  <else>
+                    <text macro="year-date" prefix="[" suffix="]"/>
+                  </else>
+                </choose>
+                <group delimiter=" ">
+                  <text macro="title"/>
+                  <text macro="online"/>
+                </group>
+                <choose>
+                  <if variable="container-title">
+                    <group delimiter=" ">
+                      <text variable="container-title" font-style="italic"/>
+                      <group>
+                        <text variable="collection-title"/>
+                        <group delimiter="/">
+                          <text variable="volume"/>
+                          <text variable="page"/>
+                        </group>
+                      </group>
+                    </group>
+                  </if>
+                  <else>
+                    <text variable="volume"/>
+                    <group delimiter=" ">
+                      <text variable="collection-title"/>
+                      <text variable="page"/>
+                    </group>
+                  </else>
+                </choose>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="author" suffix=","/>
+          <text macro="year-date" prefix=" " suffix="."/>
+        </else>
+      </choose>
+      <choose>
+        <if type="legislation legal_case" match="any"/>
+        <else-if type="book motion_picture musical_score song speech" match="any">
+          <group prefix=" " suffix="." delimiter=" ">
             <text macro="title"/>
+            <choose>
+              <if variable="author editor" match="any">
+                <text macro="online"/>
+              </if>
+            </choose>
+            <text macro="translator"/>
+          </group>
+          <group prefix=" " suffix="." delimiter=". ">
             <text macro="edition"/>
             <text macro="series"/>
+            <choose>
+              <if type="motion_picture">
+                <group delimiter=" ">
+                  <text variable="genre"/>
+                  <choose>
+                    <if variable="author editor" match="none">
+                      <text macro="online"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
             <text macro="editor"/>
+            <text macro="credits"/>
           </group>
           <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="report webpage" match="any">
+        </else-if>
+        <else-if type="article-journal" match="any">
+          <group prefix=" " suffix="." delimiter=". ">
+            <text macro="title"/>
+          </group>
+          <group prefix=" " suffix="." delimiter=", ">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="online"/>
+            </group>
+            <group>
+              <text variable="volume"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+            <group>
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="article-magazine article-newspaper" match="any">
+          <group prefix=" " suffix="." delimiter=". ">
+            <text macro="title"/>
+          </group>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" font-style="italic"/>
+            <text prefix=" " macro="online"/>
+            <group prefix=", ">
+              <text variable="volume"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+            <date variable="issued" prefix=", ">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month"/>
+            </date>
+            <group prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="bill report webpage" match="any">
           <group prefix=" " suffix="." delimiter=" ">
             <text macro="title"/>
-            <text macro="online"/>
+            <choose>
+              <if variable="archive" match="none">
+                <text macro="online"/>
+              </if>
+            </choose>
           </group>
           <group prefix=" " suffix="." delimiter=". ">
-            <text macro="edition" suffix=". "/>
-            <text macro="series" suffix=". "/>
-            <text macro="editor" suffix=". "/>
+            <text macro="edition"/>
+            <choose>
+              <if variable="number" match="none">
+                <text macro="series"/>
+              </if>
+            </choose>
+            <text macro="editor"/>
+            <choose>
+              <if variable="number">
+                <text macro="series-genre" prefix="(" suffix=")"/>
+              </if>
+            </choose>
+            <text macro="publisher"/>
           </group>
-          <text prefix=" " suffix="." macro="publisher"/>
+          <choose>
+            <if variable="archive">
+              <group prefix=" " suffix="." delimiter=" ">
+                <text macro="archive"/>
+                <text macro="online"/>
+              </group>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="patent" match="any">
+          <group prefix=" " suffix="." delimiter=" ">
+            <text macro="title"/>
+            <text macro="online"/>
+          </group>
+          <text macro="series-genre" prefix=" " suffix="."/>
+          <text macro="publisher" prefix=" " suffix="."/>
         </else-if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" " suffix="."/>
           <group prefix=" " delimiter=" ">
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="italic" suffix="."/>
+            <choose>
+              <if variable="editor">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <text macro="editor" suffix="."/>
+              </if>
+            </choose>
+            <group suffix="." delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="online" prefix=" "/>
+              <text variable="event"/>
+              <date variable="event-date">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+              <text variable="event-place"/>
+            </group>
             <text variable="collection-title" suffix="."/>
-            <text variable="event" suffix="."/>
             <group suffix="." delimiter=", ">
               <text macro="publisher" prefix=" "/>
               <text macro="pages"/>
@@ -195,30 +564,85 @@
             <text macro="publisher"/>
           </group>
         </else-if>
+        <else-if type="graphic map" match="any">
+          <group prefix=" " suffix="." delimiter=" ">
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text variable="scale"/>
+            </group>
+            <text macro="online"/>
+          </group>
+          <group prefix=" " suffix="." delimiter=". ">
+            <text macro="edition"/>
+            <text macro="series"/>
+            <text macro="editor"/>
+          </group>
+          <text prefix=" " suffix="." macro="publisher"/>
+          <text prefix=" " suffix="." macro="archive"/>
+        </else-if>
+        <else-if type="broadcast">
+          <group prefix=" " suffix="." delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="author editor" match="any">
+                <text macro="online"/>
+              </if>
+            </choose>
+          </group>
+          <text macro="series-genre" prefix=" " suffix="."/>
+          <group prefix=" " suffix="." delimiter=" ">
+            <text variable="medium"/>
+            <choose>
+              <if variable="author editor" match="none">
+                <text macro="online"/>
+              </if>
+            </choose>
+          </group>
+          <group prefix=" " suffix="." delimiter=", ">
+            <text macro="publisher"/>
+            <date variable="issued">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month"/>
+            </date>
+          </group>
+        </else-if>
         <else>
           <group prefix=" " suffix="." delimiter=" ">
             <text macro="title"/>
-            <text macro="online"/>
+            <choose>
+              <if variable="container-title" match="none">
+                <text macro="online"/>
+              </if>
+            </choose>
           </group>
           <group prefix=" " suffix="." delimiter=". ">
             <text macro="series"/>
             <text macro="status"/>
             <text macro="editor"/>
           </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic"/>
-            <group prefix=", ">
+          <group prefix=" " suffix="." delimiter=", ">
+            <choose>
+              <if variable="container-title">
+                <group delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="online"/>
+                </group>
+              </if>
+            </choose>
+            <group>
               <text variable="volume"/>
               <text variable="issue" prefix="(" suffix=")"/>
             </group>
-            <group prefix=", ">
+            <group>
               <label variable="page" form="short"/>
               <text variable="page"/>
             </group>
           </group>
+          <text prefix=" " suffix="." macro="publisher"/>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix="."/>
+      <text variable="annote" prefix=" " suffix="."/>
+      <text macro="access" prefix=" " suffix="."/>
     </layout>
   </bibliography>
 </style>