diff --git a/tests/ieee.csl b/tests/ieee.csl
index af57495c8..cd7ba4943 100644
--- a/tests/ieee.csl
+++ b/tests/ieee.csl
@@ -1,129 +1,302 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="numeric" version="1.0">
-   <info>
-      <title>IEEE</title>
-      <id>http://www.zotero.org/styles/ieee</id>
-      <link href="http://www.zotero.org/styles/ieee" rel="self"/>
-      <author>
-         <name>Michael Berkowitz</name>
-         <email>mberkowi@gmu.edu</email>
-      </author>
-      <contributor>
-         <name>Julian Onions</name>
-         <email>julian.onions@gmail.com</email>
-      </contributor>
-      <contributor>
-         <name>Rintze Zelle</name>
-         <uri>http://forums.zotero.org/account/831/</uri>
-      </contributor>
-      <category field="engineering"/>
-      <category field="generic-base"/>
-      <category citation-format="numeric"/>
-      <updated>2010-02-06T06:35:40+00:00</updated>
-      <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
-   </info>
-   <macro name="author">
-      <names variable="author">
-         <name initialize-with="." delimiter=", " and="text"/>
-         <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name initialize-with="." delimiter=", " and="text" name-as-sort-order="all"/>
-         <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title" quotes="true"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher-place" suffix=": "/>
-      <text variable="publisher" suffix=", "/>
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="access">
-      <text variable="URL"/>
-   </macro>
-   <macro name="page">
-      <group>
-         <label variable="page" form="short" suffix=". " strip-periods="true"/>
-         <text variable="page"/>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <info>
+    <title>IEEE</title>
+    <id>http://www.zotero.org/styles/ieee</id>
+    <link href="http://www.zotero.org/styles/ieee" rel="self"/>
+    <author>
+      <name>Michael Berkowitz</name>
+      <email>mberkowi@gmu.edu</email>
+    </author>
+    <contributor>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Rintze Zelle</name>
+      <uri>http://twitter.com/rintzezelle</uri>
+    </contributor>
+    <contributor>
+      <name>Stephen Frank</name>
+      <uri>http://www.zotero.org/sfrank</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category field="engineering"/>
+    <category field="generic-base"/>
+    <category citation-format="numeric"/>
+    <updated>2011-09-15T07:01:02+00:00</updated>
+    <rights>
+      This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License:
+      http://creativecommons.org/licenses/by-sa/3.0/
+    </rights>
+    <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
+    <link href="http://www.ieee.org/documents/auinfo07.pdf" rel="documentation"/>
+  </info>
+  <!-- Macros -->
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" 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" text-case="capitalize-first" suffix="."/>
+	  </else>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="article-journal report" match="any">
+	<date variable="issued">
+	  <date-part name="month" form="short" suffix=" "/>
+	  <date-part name="year" form="long"/>
+	</date>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture  song thesis chapter paper-conference" match="any">
+	<date variable="issued">
+	  <date-part name="year" form="long"/>
+	</date>
+      </else-if>
+      <else>
+	<date variable="issued">
+	  <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+	  <date-part name="month" form="short" suffix="-" strip-periods="true"/>
+	  <date-part name="year" form="long"/>
+	</date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with=". " delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with=". " delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="locators">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+	<text term="volume" form="short" suffix="." strip-periods="true"/>
+	<number variable="volume" form="numeric"/>
       </group>
-   </macro>
-   <citation et-al-min="3" et-al-use-first="1" collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout delimiter=",">
-         <text variable="citation-number" prefix="[" suffix="]"/>
-      </layout>
-   </citation>
-   <bibliography entry-spacing="0" second-field-align="flush">
-      <layout suffix=".">
-         <text variable="citation-number" prefix="[" suffix="]"/>
-         <text macro="author" prefix=" " suffix=", "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text macro="publisher"/>
-               </group>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="editor"/>
-                  <text macro="publisher"/>
-                  <text macro="page"/>
-               </group>
-            </else-if>
-            <else-if type="patent">
-               <text macro="title" suffix=", "/>
-               <text variable="number" prefix="U.S. Patent "/>
-               <date variable="issued" prefix=", ">
-                  <date-part name="month" suffix=" "/>
-                  <date-part name="day" suffix=", "/>
-                  <date-part name="year"/>
-               </date>
-            </else-if>
-            <else-if type="thesis">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="genre"/>
-                  <text variable="publisher"/>
-                  <date variable="issued">
-                     <date-part name="year"/>
-                  </date>
-               </group>
-            </else-if>
-            <else>
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text variable="volume" prefix="vol. "/>
-                  <date variable="issued">
-                     <date-part name="month" form="short" suffix=". " strip-periods="true"/>
-                     <date-part name="year"/>
-                  </date>
-                  <text macro="page"/>
-               </group>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
+      <group delimiter=" ">
+	<number variable="number-of-volumes" form="numeric"/>
+	<text term="volume" form="short" suffix="." plural="true" strip-periods="true"/>
+      </group>
+      <group delimiter=" ">
+	<text term="issue" form="short" suffix="." strip-periods="true"/>
+	<number variable="issue" form="numeric"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture song" match="any">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture  song chapter paper-conference" match="any">
+	<text variable="publisher-place" suffix=": "/>
+	<text variable="publisher"/>
+      </if>
+      <else>
+	<group delimiter=", ">
+	  <text variable="publisher"/>
+	  <text variable="publisher-place"/>
+	</group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if type="paper-conference">
+	<choose>
+	  <!-- Published Conference Paper -->
+	  <if variable="container-title">
+	    <group delimiter=", ">
+	      <text variable="container-title" prefix="in " font-style="italic"/>
+	      <text variable="event-place"/>
+	    </group>
+	  </if>
+	  <!-- Unpublished Conference Paper -->
+	  <else>
+	    <group delimiter=", ">
+	      <text variable="event" prefix="presented at the "/>
+	      <text variable="event-place"/>
+	    </group>
+	  </else>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage">
+	<choose>
+	  <if variable="URL">
+	    <group delimiter=". ">
+	      <text value="[Online]"/>
+	      <text variable="URL" prefix="Available: "/>
+	      <group prefix="[" suffix="]">
+		<date variable="accessed" prefix="Accessed: ">
+		  <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
+		  <date-part name="month" form="short" suffix="-" strip-periods="true"/>
+		  <date-part name="year" form="long"/>
+		</date>
+	      </group>
+	    </group>
+	  </if>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="page">
+    <group>
+      <label variable="page" form="short" suffix=". " strip-periods="true"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <!-- Citation -->
+  <citation  collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter="], [">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <!-- Bibliography -->
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout suffix=".">
+      <!-- Citation Number -->
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <!-- Author(s) -->
+      <text macro="author" prefix=" " suffix=", "/>
+      <!-- Rest of Citation -->
+      <choose>
+	<!-- Specific Formats -->
+	<if type="article-journal">
+	  <group delimiter=", ">
+	    <text macro="title"/>
+	    <text variable="container-title" font-style="italic" form="short"/>
+	    <text macro="locators"/>
+	    <text macro="page"/>
+	    <text macro="issued"/>
+	  </group>
+	</if>
+	<else-if type="paper-conference">
+	  <group delimiter=", ">
+	    <text macro="title"/>
+	    <text macro="event"/>
+	    <text macro="issued"/>
+	    <text macro="locators"/>
+	    <text macro="page"/>
+	  </group>
+	</else-if>
+	<else-if type="report">
+	  <group delimiter=", "> 
+	    <text macro="title"/>
+	    <text macro="publisher"/>
+	    <group delimiter=" ">
+	      <text variable="genre"/>
+	      <text variable="number"/>
+	    </group>
+	    <text macro="issued"/>
+	  </group>
+	</else-if>
+	<else-if type="thesis">
+	  <group delimiter=", ">
+	    <text macro="title"/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	  </group>
+	</else-if>
+	<else-if type="webpage">
+	  <group delimiter=", " suffix=". ">
+	    <text macro="title"/>
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="issued"/>
+	  </group>
+	  <text macro="access"/>
+	</else-if>
+	<else-if type="patent">
+	  <text macro="title" suffix=", "/>
+	  <text variable="number" prefix="U.S. Patent "/>
+	  <text macro="issued"/>
+	</else-if>
+	<!-- Generic/Fallback Formats -->
+	<else-if type="bill book graphic legal_case motion_picture report song" match="any">
+	  <group delimiter=", " suffix=". ">
+	    <text macro="title"/>
+	    <text macro="locators"/>
+	  </group>
+	  <group delimiter=", ">
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	    <text macro="page"/>
+	  </group>
+	</else-if>
+	<else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+	  <group delimiter=", ">
+	    <text macro="title"/>
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="locators"/>
+	    <text macro="publisher"/>
+	    <text macro="page"/>
+	    <text macro="issued"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter paper-conference" match="any">
+	  <group delimiter=", " suffix=", ">
+	    <text macro="title"/>
+	    <text variable="container-title" prefix="in " font-style="italic"/>
+	    <text macro="locators"/>
+	  </group>
+	  <text macro="editor" suffix=" "/>
+	  <group delimiter=", ">
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	    <text macro="page"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group delimiter=", " suffix=". ">
+	    <text macro="title"/>
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="locators"/>
+	  </group>
+	  <group delimiter=", ">
+	    <text macro="publisher"/>
+	    <text macro="page"/>
+	    <text macro="issued"/>
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
 </style>
\ No newline at end of file
diff --git a/tests/mhra.csl b/tests/mhra.csl
index 4749cdcd7..fe34c8f84 100644
--- a/tests/mhra.csl
+++ b/tests/mhra.csl
@@ -1,390 +1,399 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0">
-   <info>
-      <title>Modern Humanities Research Association (Note with Bibliography)</title>
-      <id>http://www.zotero.org/styles/mhra</id>
-      <link href="http://www.zotero.org/styles/mhra" rel="self"/>
-      <link href="http://www.mhra.org.uk/Publications/Books/StyleGuide/download.shtml" rel="documentation"/>
-      <author>
-         <name>Rintze Zelle</name>
-         <uri>http://forums.zotero.org/account/831/</uri>
-      </author>
-      <contributor>
-         <name>Sebastian Karcher</name>
-      </contributor>
-      <summary>MHRA format with full notes and bibliography</summary>
-      <category field="generic-base"/>
-      <category citation-format="note"/>
-      <updated>2009-12-15T12:42:52+00:00</updated>
-   </info>
-   <locale xml:lang="en">
-      <terms>
-         <term name="et-al">and others</term>
-         <term name="editor" form="verb-short">ed. by</term>
-         <term name="edition" form="short">edn</term>
-         <term name="translator" form="verb-short">trans. by</term>
-      </terms>
-   </locale>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="short" prefix=", " suffix="." strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title-note"/>
-         </substitute>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
+  <info>
+    <title>Modern Humanities Research Association (Note with Bibliography)</title>
+    <id>http://www.zotero.org/styles/mhra</id>
+    <link href="http://www.zotero.org/styles/mhra" rel="self"/>
+    <link href="http://www.mhra.org.uk/Publications/Books/StyleGuide/download.shtml" rel="documentation"/>
+    <author>
+      <name>Rintze Zelle</name>
+      <uri>http://twitter.com/rintzezelle</uri>
+    </author>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <summary>MHRA format with full notes and bibliography</summary>
+    <category field="generic-base"/>
+    <category citation-format="note"/>
+    <updated>2011-08-18T16:08:33+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="et-al">and others</term>
+      <term name="editor" form="verb-short">ed. by</term>
+      <term name="edition" form="short">edn</term>
+      <term name="translator" form="verb-short">trans. by</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="title-note"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+	<text variable="title" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+	<text variable="title" prefix="‘" suffix="’" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if disambiguate="true">
+	<choose>
+	  <if type="bill book graphic legal_case motion_picture report song" match="any">
+	    <text variable="title" font-style="italic" text-case="title" form="short"/>
+	  </if>
+	  <else>
+	    <text variable="title" prefix="‘" suffix="’" text-case="title" form="short"/>
+	  </else>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <names variable="editor" delimiter=", ">
+	<label form="verb-short" text-case="lowercase" suffix=" "/>
+	<name and="text" delimiter=", " delimiter-precedes-last="never"/>
       </names>
-   </macro>
-   <macro name="contributors-note">
-      <names variable="author">
-         <name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-      </names>
-      <text macro="recipient-note"/>
-   </macro>
-   <macro name="title-note">
       <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title" prefix="‘" suffix="’"/>
-         </else>
+	<if variable="author editor" match="any">
+	  <names variable="translator" delimiter=", ">
+	    <label form="verb-short" text-case="lowercase" suffix=" "/>
+	    <name and="text" delimiter=", " delimiter-precedes-last="never"/>
+	  </names>
+	</if>
       </choose>
-   </macro>
-   <macro name="editor-translator">
+    </group>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title" text-case="title"/>
+    <text variable="collection-number" prefix=", "/>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+	<text variable="volume"/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+	<group delimiter=", ">
+	  <text macro="edition-note"/>
+	  <group>
+	    <number variable="number-of-volumes" form="numeric"/>
+	    <text term="volume" form="short" prefix=" " plural="true"/>
+	  </group>
+	</group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <choose>
+      <if type="article-journal">
+	<text variable="volume"/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+	<group delimiter=", ">
+	  <text macro="edition-note"/>
+	  <group>
+	    <number variable="number-of-volumes" form="numeric"/>
+	    <text term="volume" form="short" prefix=" " plural="true"/>
+	  </group>
+	</group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="article-journal">
+	<choose>
+	  <if variable="volume">
+	    <text macro="issued" prefix=" (" suffix=")"/>
+	  </if>
+	  <else>
+	    <text macro="issued" prefix=", "/>
+	  </else>
+	</choose>
+      </if>
+      <else-if variable="publisher-place publisher" match="any">
+	<group prefix=" (" suffix=")" delimiter=", ">
+	  <group delimiter=" ">
+	    <choose>
+	      <if variable="title" match="none"/>
+	      <else-if type="thesis speech" match="any">
+		<text variable="genre" prefix="unpublished "/>
+	      </else-if>
+	    </choose>
+	    <text macro="event"/>
+	  </group>
+	  <text macro="publisher"/>
+	  <text macro="issued"/>
+	</group>
+      </else-if>
+      <else>
+	<text macro="issued" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-specific-note">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+	<choose>
+	  <if is-numeric="volume">
+	    <number variable="volume" form="roman" font-variant="small-caps"/>
+	  </if>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+	<text term="in" text-case="lowercase" suffix=" "/>
+      </if>
+    </choose>
+    <text variable="container-title" font-style="italic" text-case="title"/>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+	<choose>
+	  <if is-numeric="edition">
+	    <group delimiter=" ">
+	      <number variable="edition" form="ordinal"/>
+	      <text term="edition" form="short"/>
+	    </group>
+	  </if>
+	  <else>
+	    <text variable="edition"/>
+	  </else>
+	</choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor-note">
+    <names variable="editor">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <label form="short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="translator-note">
+    <names variable="translator">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <label form="verb-short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+	<group delimiter=", ">
+	  <group>
+	    <text variable="edition" suffix=" "/>
+	    <text term="edition" prefix=" "/>
+	  </group>
+	  <group>
+	    <text term="section" suffix=" "/>
+	    <text variable="section"/>
+	  </group>
+	</group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report article-newspaper" match="any">
+	<date variable="issued">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" "/>
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </else-if>
+      <else>
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal">
+	<text variable="page" prefix=", "/>
+      </if>
+      <else>
+	<choose>
+	  <if variable="volume">
+	    <text variable="page" prefix=", "/>
+	  </if>
+	  <else>
+	    <label variable="page" form="short" prefix=", " suffix=" "/>
+	    <text variable="page"/>
+	  </else>
+	</choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <text macro="pages"/>
+    <choose>
+      <if variable="page">
+	<group prefix=" (" suffix=")">
+	  <label variable="locator" form="short" suffix=" "/>
+	  <text variable="locator"/>
+	</group>
+      </if>
+      <else>
+	<label variable="locator" form="short" prefix=", " suffix=" "/>
+	<text variable="locator"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+	<if type="graphic report" match="any">
+	  <text macro="archive-note" prefix=", "/>
+	</if>
+	<else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
+	  <text macro="archive-note" prefix=", "/>
+	</else-if>
+      </choose>
+    </group>
+    <choose>
+      <if variable="DOI">
+	<text variable="DOI" prefix=" &lt;doi:" suffix="&gt;"/>
+      </if>
+      <else>
+	<choose>
+	  <if variable="URL">
+	    <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
+	    <group prefix=" [" suffix="]">
+	      <text term="accessed" text-case="lowercase"/>
+	      <date variable="accessed">
+		<date-part name="day" prefix=" "/>
+		<date-part name="month" prefix=" "/>
+		<date-part name="year" prefix=" "/>
+	      </date>
+	    </group>
+	  </if>
+	</choose>
+      </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-names="true" disambiguate-add-givenname="true">
+    <layout prefix="" suffix="." delimiter="; ">
+      <choose>
+	<if position="subsequent">
+	  <text macro="contributors-short"/>
+	  <text macro="title-short" prefix=", "/>
+	  <text macro="locators-specific-note" prefix=", "/>
+	  <text macro="point-locators"/>
+	</if>
+	<else>
+	  <group delimiter=", ">
+	    <text macro="contributors-note"/>
+	    <text macro="title-note"/>
+	    <text macro="container-title-note"/>
+	    <text macro="editor-translator"/>
+	    <text macro="collection-title"/>
+	    <text macro="locators-note"/>
+	  </group>
+	  <text macro="issue-note"/>
+	  <text macro="locators-specific-note" prefix=", "/>
+	  <text macro="locators-newspaper" prefix=", "/>
+	  <text macro="point-locators"/>
+	  <text macro="access-note"/>
+	</else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" subsequent-author-substitute="---">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
       <group delimiter=", ">
-         <names variable="editor" delimiter=", ">
-            <label form="verb-short" text-case="lowercase" suffix=" " strip-periods="true"/>
-            <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-         </names>
-         <choose>
-            <if variable="author editor" match="any">
-               <names variable="translator" delimiter=", ">
-                  <label form="verb-short" text-case="lowercase" suffix=" " strip-periods="true"/>
-                  <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-               </names>
-            </if>
-         </choose>
+	<text macro="author"/>
+	<text macro="title-note"/>
+	<text macro="container-title-note"/>
+	<text macro="editor-translator"/>
+	<text macro="collection-title"/>
+	<text macro="volume"/>
       </group>
-   </macro>
-   <macro name="collection-title">
-      <text variable="collection-title"/>
-      <text variable="collection-number" prefix=", "/>
-   </macro>
-   <macro name="locators-note">
-      <choose>
-         <if type="article-journal">
-            <text variable="volume"/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group delimiter=", ">
-               <text macro="edition-note"/>
-               <group>
-                  <number variable="number-of-volumes" form="numeric"/>
-                  <text term="volume" form="short" prefix=" " plural="true" strip-periods="true"/>
-               </group>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="volume">
-      <choose>
-         <if type="article-journal">
-            <text variable="volume"/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group delimiter=", ">
-               <text macro="edition-note"/>
-               <group>
-                  <number variable="number-of-volumes" form="numeric"/>
-                  <text term="volume" form="short" prefix=" " plural="true" strip-periods="true"/>
-               </group>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="issue-note">
-      <choose>
-         <if type="article-journal">
-            <choose>
-               <if variable="volume">
-                  <text macro="issued" prefix=" (" suffix=")"/>
-               </if>
-               <else>
-                  <text macro="issued" prefix=", "/>
-               </else>
-            </choose>
-         </if>
-         <else-if variable="publisher-place publisher" match="any">
-            <group prefix=" (" suffix=")" delimiter=", ">
-               <group delimiter=" ">
-                  <choose>
-                     <if variable="title" match="none"/>
-                     <else-if type="thesis speech" match="any">
-                        <text variable="genre" prefix="unpublished "/>
-                     </else-if>
-                  </choose>
-                  <text macro="event"/>
-               </group>
-               <text macro="publisher"/>
-               <text macro="issued"/>
-            </group>
-         </else-if>
-         <else>
-            <text macro="issued" prefix=", "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators-specific-note">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <choose>
-               <if is-numeric="volume">
-                  <number variable="volume" form="roman" font-variant="small-caps"/>
-               </if>
-            </choose>
-         </if>
-      </choose>
-   </macro>
-   <macro name="container-title-note">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text term="in" text-case="lowercase" suffix=" "/>
-         </if>
-      </choose>
-      <text variable="container-title" font-style="italic"/>
-   </macro>
-   <macro name="edition-note">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <choose>
-               <if is-numeric="edition">
-                  <group delimiter=" ">
-                     <number variable="edition" form="ordinal"/>
-                     <text term="edition" form="short" strip-periods="true"/>
-                  </group>
-               </if>
-               <else>
-                  <text variable="edition"/>
-               </else>
-            </choose>
-         </if>
-      </choose>
-   </macro>
-   <macro name="editor-note">
-      <names variable="editor">
-         <name and="text" sort-separator=", " delimiter=", "/>
-         <label form="short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="translator-note">
-      <names variable="translator">
-         <name and="text" sort-separator=", " delimiter=", "/>
-         <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="recipient-note">
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="recipient-short">
-      <names variable="recipient">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name form="short" and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="contributors-short">
-      <names variable="author">
-         <name form="short" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-      <text macro="recipient-short"/>
-   </macro>
-   <macro name="interviewer-note">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="locators-newspaper">
-      <choose>
-         <if type="article-newspaper">
-            <group delimiter=", ">
-               <group>
-                  <text variable="edition" suffix=" "/>
-                  <text term="edition" prefix=" "/>
-               </group>
-               <group>
-                  <text term="section" suffix=" "/>
-                  <text variable="section"/>
-               </group>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="event">
-      <group>
-         <text term="presented at" suffix=" "/>
-         <text variable="event"/>
-      </group>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher-place"/>
-         <text variable="publisher"/>
-      </group>
-   </macro>
-   <macro name="issued">
-      <choose>
-         <if type="graphic report article-newspaper" match="any">
-            <date variable="issued">
-               <date-part name="day" suffix=" "/>
-               <date-part name="month" suffix=" "/>
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else-if>
-         <else>
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else>
-      </choose>
-   </macro>
-   <macro name="pages">
-      <choose>
-         <if type="article-journal">
-            <text variable="page" prefix=", "/>
-         </if>
-         <else>
-            <choose>
-               <if variable="volume">
-                  <text variable="page" prefix=", "/>
-               </if>
-               <else>
-                  <label variable="page" form="short" prefix=", " suffix=" "/>
-                  <text variable="page"/>
-               </else>
-            </choose>
-         </else>
-      </choose>
-   </macro>
-   <macro name="point-locators">
+      <text macro="issue-note"/>
+      <text macro="locators-specific-note" prefix=", "/>
+      <text macro="locators-newspaper" prefix=", "/>
       <text macro="pages"/>
-      <choose>
-         <if variable="page">
-            <group prefix=" (" suffix=")">
-               <label variable="locator" form="short" suffix=" "/>
-               <text variable="locator"/>
-            </group>
-         </if>
-         <else>
-            <label variable="locator" form="short" prefix=", " suffix=" "/>
-            <text variable="locator"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="archive-note">
-      <group delimiter=", ">
-         <text variable="archive_location"/>
-         <text variable="archive"/>
-         <text variable="archive-place"/>
-      </group>
-   </macro>
-   <macro name="access-note">
-      <group delimiter=", ">
-         <choose>
-            <if type="graphic report" match="any">
-               <text macro="archive-note" prefix=", "/>
-            </if>
-            <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
-               <text macro="archive-note" prefix=", "/>
-            </else-if>
-         </choose>
-      </group>
-      <choose>
-         <if variable="DOI">
-            <text variable="DOI" prefix=" &lt;doi:" suffix="&gt;"/>
-         </if>
-         <else>
-            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-            <choose>
-              <if variable="accessed">
-                <group prefix=" [" suffix="]">
-                  <text term="accessed" text-case="lowercase"/>
-                  <date variable="accessed">
-                    <date-part name="day" prefix=" "/>
-                    <date-part name="month" prefix=" "/>
-                    <date-part name="year" prefix=" "/>
-                  </date>
-                </group>
-			  </if>
-			</choose>
-         </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-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="by-cite">
-      <layout prefix="" suffix="." delimiter="; ">
-         <choose>
-            <if position="subsequent">
-               <group delimiter=", ">
-                 <text macro="contributors-short"/>
-                 <choose>
-                   <if disambiguate="true">
-                     <text variable="title" form="short"/>
-		  		   </if>
-			     </choose>
-			   </group>
-               <text macro="locators-specific-note" prefix=", "/>
-               <text macro="point-locators"/>
-            </if>
-            <else>
-               <group delimiter=", ">
-                  <text macro="contributors-note"/>
-                  <text macro="title-note"/>
-                  <text macro="container-title-note"/>
-                  <text macro="editor-translator"/>
-                  <text macro="collection-title"/>
-                  <text macro="locators-note"/>
-               </group>
-               <text macro="issue-note"/>
-               <text macro="locators-specific-note" prefix=", "/>
-               <text macro="locators-newspaper" prefix=", "/>
-               <text macro="point-locators"/>
-               <text macro="access-note"/>
-            </else>
-         </choose>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" subsequent-author-substitute="---">
-      <sort>
-         <key macro="author"/>
-         <key variable="title"/>
-      </sort>
-      <layout suffix=".">
-         <group delimiter=", ">
-            <text macro="author"/>
-            <text macro="title-note"/>
-            <text macro="container-title-note"/>
-            <text macro="editor-translator"/>
-            <text macro="collection-title"/>
-            <text macro="volume"/>
-         </group>
-         <text macro="issue-note"/>
-         <text macro="locators-specific-note" prefix=", "/>
-         <text macro="locators-newspaper" prefix=", "/>
-         <text macro="pages"/>
-         <text macro="access-note"/>
-      </layout>
-   </bibliography>
+      <text macro="access-note"/>
+    </layout>
+  </bibliography>
 </style>
\ No newline at end of file