From 83f9a64efc75cba0f61dab795bf986e21655de76 Mon Sep 17 00:00:00 2001
From: Julian Onions <julian.onions@gmail.com>
Date: Tue, 18 Dec 2007 23:03:38 +0000
Subject: [PATCH] First style to use the new number/datatype directives to more
 properly format edition

---
 csl/chicago-author-date.csl | 410 +++++++++++++++++++-----------------
 1 file changed, 215 insertions(+), 195 deletions(-)

diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
index c17252ec2..95daf9fd2 100644
--- a/csl/chicago-author-date.csl
+++ b/csl/chicago-author-date.csl
@@ -1,195 +1,215 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Chicago Manual of Style (Author-Date format)</title>
-    <id>http://www.zotero.org/styles/chicago-author-date</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated/>
-    <summary>The author-date variant of the Chicago style</summary>
-    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text variable="URL"/>
-      <group prefix=" (" suffix=")">
-	<text term="accessed" text-case="capitalize-first" suffix=" "/>
-	<date variable="accessed">
-	  <date-part name="month" suffix=" "/>
-	  <date-part name="day" suffix=", "/>
-	  <date-part name="year"/>
-	</date>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="day-month">
-    <date variable="issued">
-      <date-part name="month"/>
-      <date-part name="day" prefix=" "/>
-    </date>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </group>
-      <choose>
-	<if type="article-newspaper article-magazine" match="any">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	  </group>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first"/>
-		<text variable="container-title" font-style="italic"/>
-	      </group>
-	      <text macro="editor" prefix=" "/>
-	      <group delimiter=" ">
-		<text variable="volume" prefix="Vol. " suffix=" of"/>
-		<text variable="collection-title" font-style="italic"/>
-		<text macro="series-editor"/>
-	      </group>
-	      <text variable="page"/>
-	      <text macro="publisher" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=":">
-	      <group delimiter=", ">
-		<text variable="volume" />
-		<text variable="issue" prefix="no. "/>
-	      </group>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Chicago Manual of Style (Author-Date format)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated/>
+    <summary>The author-date variant of the Chicago style</summary>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text variable="URL"/>
+      <group prefix=" (" suffix=")">
+	<text term="accessed" text-case="capitalize-first" suffix=" "/>
+	<date variable="accessed">
+	  <date-part name="month" suffix=" "/>
+	  <date-part name="day" suffix=", "/>
+	  <date-part name="year"/>
+	</date>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if datatype="number" variable="edition">
+	<group delimiter=" ">
+	  <number variable="edition" form="ordinal"/>
+	  <text term="edition" form="short" suffix="."/>
+	</group>
+      </if>
+      <else>
+	  <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volumes">
+    <group delimiter=" ">
+      <number variable="number-of-volumes" form="numeric"/>
+      <text term="volume" form="short" suffix="." plural="true"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </group>
+      <choose>
+	<if type="article-newspaper article-magazine" match="any">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	  </group>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text macro="edition"/>
+	    <text macro="volumes"/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first"/>
+		<text variable="container-title" font-style="italic"/>
+	      </group>
+	      <text macro="editor" prefix=" "/>
+	      <group delimiter=" ">
+		<text variable="volume" prefix="Vol. " suffix=" of"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text macro="series-editor"/>
+	      </group>
+	      <text variable="page"/>
+	      <text macro="publisher" prefix=" "/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=":">
+	      <group delimiter=", ">
+		<text variable="volume" />
+		<text variable="issue" prefix="no. "/>
+	      </group>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>