citeproc-ruby 0.0.4 → 0.0.5

data/resource/style/chicago-author-date-de.csl

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <info>
+    <title>Chicago Manual of Style (author-date, German)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date-de</id>
+    <link href="http://www.zotero.org/styles/chicago-author-date-de" rel="self"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Peter Baumgartner</name>
+      <email>peter.baumgartner@donau-uni.ac.at</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2008-01-01T11:11:12+00:00</updated>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <summary>The author-date variant of the Chicago style adapted for German. I addition to the online reference I've used:
+	Turabian, K. L. (2007). A Manual for Writers of Research Papers, Theses, and Dissertations. Chicago Style for Students and Researchers. University Of Chicago Press.
+	Especially figure 18.1 pp 218-220 --
+	NOTE: check all the details and special cases of chapter 19: "Parethetical Citations-Reference List Style: Citing Specific Types of Sources --
+	I used as template the Chicago Manual of Style (author-date) Revision 3195 --
+	Code changes to adapt for a valid German version: --
+	* replaced delimiter-precedes-last="always" with "never" to get rid of the last comma in author names --
+	* added colon as suffix of the term "in" --
+	* added colon as suffix of the termin "accessed" --
+	* changed variable "issue" of "article-journal from "no." to "Nr." --
+	* changed "month day" to "day. month" for blog posts (and other entry types? which ones else?)
+	I also changed some script logic which in noted in the code: --
+	* do not add day-month at the end of a book, even it is provided in the date field of the zotero database (as it sometimes come from amazon) --
+	* added access date for material with URL. --
+	* not all archive items should end with a fullstop. A doi is followed by a comma and space, a URL just by a space before the date comes. --
+	NOTE: this should be checked more in detail --
+	* if there is just a secondary contributor (e.g. editor of a book) then this is the primary contributor and the generated output should not repeat the name as secondary contributor.
+    </summary>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <group delimiter=". ">
+          <choose>
+            <if variable="author">
+              <names variable="editor">
+                <label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+          <choose>
+            <if variable="author editor" match="any">
+              <names variable="translator">
+                <label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix="," delimiter=", ">
+          <choose>
+            <if variable="author">
+              <names variable="editor">
+                <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+          <choose>
+            <if variable="author editor" match="any">
+              <names variable="translator">
+                <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="anon">
+    <choose>
+      <if variable="author editor translator" match="none">
+        <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <label form="short" prefix=", " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+      <substitute>
+        <text macro="editor"/>
+        <text macro="translator"/>
+      </substitute>
+    </names>
+    <text macro="anon"/>
+    <text macro="recipient"/>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="anon"/>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+    </group>
+    <!-- not all items of archive should end with a fullstop. I've transfered end of the delimiter="." group at this place  -->
+    <text variable="DOI" prefix="doi:" suffix=", "/>
+    <text variable="URL"/>
+    <!-- added date for material on the web -->
+    <group prefix=" (" suffix=")">
+      <text term="accessed" text-case="capitalize-first" suffix=": "/>
+      <date variable="accessed">
+        <date-part name="day" suffix=". "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume" prefix=" "/>
+        <text variable="issue" prefix=", Nr. "/>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix=", ">
+          <text variable="volume" suffix=":"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="edition" suffix=" "/>
+            <text term="edition" prefix=" "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=". " strip-periods="true"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <text variable="page" prefix=": "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <label variable="locator" form="short" suffix=" "/>
+          </if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first" suffix=":"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <text variable="container-title" font-style="italic"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="day" suffix=". "/>
+      <date-part name="month"/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <group delimiter=". ">
+      <text macro="interviewer"/>
+      <text variable="medium" text-case="capitalize-first"/>
+    </group>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis"/>
+      <else>
+        <text variable="genre" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="article-journal">
+        <text macro="day-month" prefix=" (" suffix=")"/>
+      </if>
+      <else-if type="speech">
+        <group prefix=" " delimiter=", ">
+          <text macro="event"/>
+          <text macro="day-month"/>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+      <!-- do not add day-month at the end of a book, even it is provided in the date field of the zotero database (as it sometimes come from amazon) -->
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text macro="publisher" prefix=". "/>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+          <text macro="day-month"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-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="contributors-short"/>
+          <text macro="date"/>
+        </group>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="---" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="contributors" suffix=". "/>
+      <text macro="date" suffix=". "/>
+      <text macro="title"/>
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
+      <text macro="locators-chapter"/>
+      <text macro="edition" prefix=". "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>

data/resource/style/chicago-author-date.csl

@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="chicago">
-   <info>
-      <title>Chicago Manual of Style (Author-Date format)</title>
-      <id>http://www.zotero.org/styles/chicago-author-date</id>
-      <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
-      <author>
-         <name>Julian Onions</name>
-         <email>julian.onions@gmail.com</email>
-      </author>
-      <category citation-format="author-date"/>
-      <category field="generic-base"/>
-      <updated>2009-12-04T20:22:16+00:00</updated>
-      <summary>The author-date variant of the Chicago style</summary>
-      <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-   </info>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <info>
+    <title>Chicago Manual of Style (author-date)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date</id>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2010-03-15T01:24:16+00:00</updated>
+    <summary>The author-date variant of the Chicago style</summary>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
   <macro name="secondary-contributors">
     <choose>
-      <if match="none" type="chapter">
+      <if type="chapter paper-conference" match="none">
         <group delimiter=". ">
           <choose>
             <if variable="author">
               <names variable="editor">
-                <label form="verb-short" prefix=" " suffix=". " text-case="capitalize-first" />
-                <name and="text" delimiter=", " />
+                <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
               </names>
             </if>
           </choose>
           <choose>
-            <if match="any" variable="author editor">
+            <if variable="author editor" match="any">
               <names variable="translator">
-                <label form="verb-short" prefix=" " suffix=". " text-case="capitalize-first" />
-                <name and="text" delimiter=", " />
+                <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
               </names>
             </if>
           </choose>
@@ -40,21 +44,31 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="chapter">
-        <group delimiter=", " prefix=",">
+      <if type="chapter paper-conference" match="any">
+        <group prefix="," delimiter=", ">
           <choose>
             <if variable="author">
               <names variable="editor">
-                <label form="verb-short" prefix=" " suffix=". " text-case="lowercase" />
-                <name and="text" delimiter=", " />
+                <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
               </names>
+              <choose>
+                <if variable="container-author">
+                  <group>
+                    <names variable="container-author">
+                      <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
+                      <name and="text" delimiter=", "/>
+                    </names>
+                  </group>
+                </if>
+              </choose>
             </if>
           </choose>
           <choose>
-            <if match="any" variable="author editor">
+            <if variable="author editor" match="any">
               <names variable="translator">
-                <label form="verb-short" prefix=" " suffix=". " text-case="lowercase" />
-                <name and="text" delimiter=", " />
+                <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
               </names>
             </if>
           </choose>
@@ -63,22 +77,18 @@
     </choose>
   </macro>
   <macro name="anon">
-    <choose>
-      <if match="none" variable="author editor translator">
-        <text form="short" term="anonymous" text-case="capitalize-first" />
-      </if>
-    </choose>
+    <text term="anonymous" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="short" prefix=", " suffix="." />
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." strip-periods="true"/>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." />
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
     </names>
   </macro>
   <macro name="recipient">
@@ -86,97 +96,101 @@
       <if type="personal_communication">
         <choose>
           <if variable="genre">
-            <text text-case="capitalize-first" variable="genre" />
+            <text variable="genre" text-case="capitalize-first"/>
           </if>
           <else>
-            <text term="letter" text-case="capitalize-first" />
+            <text term="letter" text-case="capitalize-first"/>
           </else>
         </choose>
       </if>
     </choose>
-    <names delimiter=", " variable="recipient">
-      <label form="verb" prefix=" " suffix=" " text-case="lowercase" />
-      <name and="text" delimiter=", " />
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="contributors">
     <names variable="author">
-      <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
       <substitute>
-        <text macro="editor" />
-        <text macro="translator" />
+        <text macro="editor"/>
+        <text macro="translator"/>
+        <text macro="anon"/>
       </substitute>
     </names>
-    <text macro="anon" />
-    <text macro="recipient" />
+    <text macro="recipient"/>
   </macro>
   <macro name="contributors-short">
     <names variable="author">
-      <name and="text" delimiter=", " form="short" />
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
-        <names variable="editor" />
-        <names variable="translator" />
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
       </substitute>
     </names>
-    <text macro="anon" />
   </macro>
   <macro name="interviewer">
-    <names delimiter=", " variable="interviewer">
-      <label form="verb" prefix=" " suffix=" " text-case="capitalize-first" />
-      <name and="text" delimiter=", " />
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
     </names>
   </macro>
   <macro name="archive">
     <group delimiter=". ">
-      <text text-case="capitalize-first" variable="archive_location" />
-      <text variable="archive" />
-      <text variable="archive-place" />
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
     </group>
   </macro>
   <macro name="access">
     <group delimiter=". ">
       <choose>
-        <if match="any" type="graphic report">
-          <text macro="archive" />
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
         </if>
-        <else-if match="none" type="book thesis chapter article-journal article-newspaper article-magazine">
-          <text macro="archive" />
+        <else-if type="article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
+          <text macro="archive"/>
         </else-if>
       </choose>
-      <text prefix="doi:" variable="DOI" />
-      <text variable="URL" />
+      <text variable="DOI" prefix="doi:"/>
+      <choose>
+        <if type="legal_case" match="none">
+          <text variable="URL"/>
+        </if>
+      </choose>
     </group>
   </macro>
   <macro name="title">
     <choose>
-      <if match="none" variable="title">
+      <if variable="title" match="none">
         <choose>
-          <if match="none" type="personal_communication">
-            <text text-case="capitalize-first" variable="genre" />
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
           </if>
         </choose>
       </if>
-      <else-if type="book">
-        <text font-style="italic" variable="title" />
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
       </else-if>
       <else>
-        <text variable="title" />
+        <text variable="title" text-case="title" quotes="true"/>
       </else>
     </choose>
   </macro>
   <macro name="edition">
     <choose>
-      <if match="any" type="book chapter">
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
-              <number form="ordinal" variable="edition" />
-              <text form="short" suffix="." term="edition" />
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
             </group>
           </if>
           <else>
-            <text suffix="." variable="edition" />
+            <text variable="edition" suffix="."/>
           </else>
         </choose>
       </if>
@@ -185,185 +199,227 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-        <text prefix=" " variable="volume" />
-        <text prefix=", no. " variable="issue" />
+        <text variable="volume" prefix=" "/>
+        <text variable="issue" prefix=" (" suffix=")"/>
       </if>
-      <else-if type="book">
-        <group delimiter=". " prefix=". ">
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
           <group>
-            <text form="short" suffix=". " term="volume" text-case="capitalize-first" />
-            <number form="numeric" variable="volume" />
+            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="volume" form="numeric"/>
           </group>
           <group>
-            <number form="numeric" variable="number-of-volumes" />
-            <text form="short" plural="true" prefix=" " suffix="." term="volume" />
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
           </group>
         </group>
       </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
     </choose>
   </macro>
   <macro name="locators-chapter">
     <choose>
-      <if type="chapter">
-        <group prefix=", ">
-          <text suffix=":" variable="volume" />
-          <text variable="page" />
-        </group>
+      <if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <text variable="volume" suffix=":"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
   <macro name="locators-article">
     <choose>
       <if type="article-newspaper">
-        <group delimiter=", " prefix=", ">
+        <group prefix=", " delimiter=", ">
           <group>
-            <text suffix=" " variable="edition" />
-            <text prefix=" " term="edition" />
+            <text variable="edition" suffix=" "/>
+            <text term="edition" prefix=" "/>
           </group>
           <group>
-            <text form="short" suffix=". " term="section" />
-            <text variable="section" />
+            <text term="section" form="short" suffix=". " strip-periods="true"/>
+            <text variable="section"/>
           </group>
         </group>
       </if>
       <else-if type="article-journal">
-        <text prefix=": " variable="page" />
+        <text variable="page" prefix=": "/>
       </else-if>
     </choose>
   </macro>
   <macro name="point-locators">
-    <group>
-      <choose>
-        <if locator="page" match="none">
-          <label form="short" suffix=" " variable="locator" />
-        </if>
-      </choose>
-      <text variable="locator" />
-    </group>
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
+                  </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix=":"/>
+          </else-if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
   </macro>
   <macro name="container-prefix">
-    <text term="in" text-case="capitalize-first" />
+    <text term="in" text-case="capitalize-first"/>
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="chapter">
-        <text macro="container-prefix" suffix=" " />
+      <if type="chapter paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="legal_case" match="none">
+        <text variable="container-title" text-case="title" font-style="italic"/>
       </if>
     </choose>
-    <text font-style="italic" variable="container-title" />
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
-      <text variable="publisher-place" />
-      <text variable="publisher" />
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
     </group>
   </macro>
   <macro name="date">
     <date variable="issued">
-      <date-part name="year" />
+      <date-part name="year"/>
     </date>
   </macro>
   <macro name="day-month">
     <date variable="issued">
-      <date-part name="month" />
-      <date-part name="day" prefix=" " />
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
     </date>
   </macro>
   <macro name="collection-title">
-    <text variable="collection-title" />
-    <text prefix=" " variable="collection-number" />
+    <text variable="collection-title" text-case="title"/>
+    <text variable="collection-number" prefix=" "/>
   </macro>
   <macro name="event">
     <group>
-      <text suffix=" " term="presented at" />
-      <text variable="event" />
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
     </group>
   </macro>
   <macro name="description">
-    <group delimiter=". ">
-      <text macro="interviewer" />
-      <text text-case="capitalize-first" variable="medium" />
-    </group>
     <choose>
-      <if match="none" variable="title"> </if>
-      <else-if type="thesis"> </else-if>
+      <if type="interview">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis"/>
       <else>
-        <text prefix=". " text-case="capitalize-first" variable="genre" />
+        <text variable="genre" text-case="capitalize-first" prefix=". "/>
       </else>
     </choose>
   </macro>
   <macro name="issue">
     <choose>
       <if type="article-journal">
-        <text macro="day-month" prefix=" (" suffix=")" />
+        <text macro="day-month" prefix=" (" suffix=")"/>
       </if>
+      <else-if type="legal_case">
+        <text variable="authority" prefix=". "/>
+      </else-if>
       <else-if type="speech">
-        <group delimiter=", " prefix=" ">
-          <text macro="event" />
-          <text macro="day-month" />
-          <text variable="event-place" />
+        <group prefix=" " delimiter=", ">
+          <text macro="event"/>
+          <text macro="day-month"/>
+          <text variable="event-place"/>
         </group>
       </else-if>
-      <else-if match="any" type="article-newspaper article-magazine">
-        <text macro="day-month" prefix=", " />
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
       </else-if>
       <else>
-        <group delimiter=", " prefix=". ">
+        <group prefix=". " delimiter=", ">
           <choose>
             <if type="thesis">
-              <text text-case="capitalize-first" variable="genre" />
+              <text variable="genre" text-case="capitalize-first"/>
             </if>
           </choose>
-          <text macro="publisher" />
-          <text macro="day-month" />
+          <text macro="publisher"/>
         </group>
       </else>
     </choose>
   </macro>
-  <citation 
-         disambiguate-add-givenname="true"
-         disambiguate-add-names="true"
-         disambiguate-add-year-suffix="true"
-         et-al-min="4"
-         et-al-subsequent-min="4"
-         et-al-subsequent-use-first="1"
-         et-al-use-first="1">
-    <layout delimiter="; " prefix="(" suffix=")">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
+    <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
-          <text macro="contributors-short" />
-          <text macro="date" />
+          <text macro="contributors-short"/>
+          <text macro="date"/>
         </group>
-        <text macro="point-locators" />
+        <text macro="point-locators"/>
       </group>
     </layout>
   </citation>
-  <bibliography 
-         entry-spacing="0"
-         et-al-min="11"
-         et-al-use-first="7"
-         hanging-indent="true"
-         subsequent-author-substitute="---">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
     <sort>
-      <key macro="contributors" />
-      <key variable="issued" />
-      <key variable="title" />
+      <key macro="contributors"/>
+      <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <text macro="contributors" suffix=". " />
-      <text macro="date" suffix=". " />
-      <text macro="title" />
-      <text macro="description" />
-      <text macro="secondary-contributors" prefix=". " />
-      <text macro="container-title" prefix=". " />
-      <text macro="container-contributors" />
-      <text macro="locators-chapter" />
-      <text macro="edition" prefix=". " />
-      <text macro="locators" />
-      <text macro="collection-title" prefix=". " />
-      <text macro="issue" />
-      <text macro="locators-article" />
-      <text macro="access" prefix=". " />
+      <text macro="contributors" suffix=". "/>
+      <text macro="date" suffix=". "/>
+      <text macro="title"/>
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
+      <text macro="locators-chapter"/>
+      <text macro="edition" prefix=". "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>