From 0a29fe95a8a7e4cd53d8e844f93b429420fe9e51 Mon Sep 17 00:00:00 2001
From: Julian Onions <julian.onions@gmail.com>
Date: Fri, 30 Nov 2007 12:29:04 +0000
Subject: [PATCH] Updated to work correctly with the ibid styles, also
 corrected the spurious "," and some occasional oddities in the chapter
 selection.

---
 csl/chicago-fullnote-bibliography.csl | 502 +++++++++++++-------------
 csl/chicago-note-bibliography.csl     | 230 ++++++------
 csl/chicago-note.csl                  | 308 ++++++++--------
 3 files changed, 524 insertions(+), 516 deletions(-)

diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index f855d9e05..8c62b92b1 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -130,7 +130,7 @@
       <text variable="publisher"/>
     </group>
   </macro>
-    <macro name="archive">
+  <macro name="archive">
     <group delimiter=", ">
       <text variable="archive"/>
       <text variable="archive-place"/>
@@ -139,27 +139,27 @@
   <macro name="issued">
     <choose>
       <if type="graphic report" match="any">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </if>
       <else-if type="book chapter thesis" match="any">
-    <date variable="issued">
+	<date variable="issued">
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else-if>
       <else>
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else>
     </choose>
   </macro>
-<citation>
+  <citation>
     <option name="et-al-min" value="4"/>
     <option name="et-al-use-first" value="1"/>
     <option name="et-al-subsequent-min" value="4"/>
@@ -168,160 +168,162 @@
     <option name="disambiguate-add-names" value="true"/>
     <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
-	<choose>
-  <if position="subsequent">
-    <group delimiter=", ">
-      <group>
-	<text macro="author-short"/>      
-	<text macro="recipient-short"/>
-      </group>
-	<text macro="title-short"/>
       <choose>
-	<if type="interview">
-	  <text value="interview" text-case="lowercase"/>
+	<if position="ibid-with-locator">
+	  <group delimiter=", ">
+	    <text term="ibid" text-case="capitalize-first"/>
+	    <text variable="locator"/>
+	  </group>
 	</if>
-	<else-if  variable="recipient">
-	  <text macro="issued"/>
+	<else-if position="ibid">
+	  <text term="ibid" text-case="capitalize-first"/>
 	</else-if>
-      </choose>
-	<text variable="locator"/>
-    </group>
-  </if> 
-  <else-if position="ibid-with-locator">
-    <group delimiter=", ">
-      <text term="ibid" text-case="capitalize-first"/>
-      <text variable="locator"/>
-    </group>
-  </else-if>
-  <else-if position="ibid">
-    <text term="ibid" text-case="capitalize-first"/>
-  </else-if>
-  <else>
-    <group delimiter=", ">
-      <group>
-	<text macro="author"/>      
-	<text macro="recipient"/>
+	<else-if position="subsequent">
+	  <group delimiter=", ">
+	    <group>
+	      <text macro="author-short"/>      
+	      <text macro="recipient-short"/>
+	    </group>
+	    <text macro="title-short"/>
+	    <choose>
+	      <if type="interview">
+		<text value="interview" text-case="lowercase"/>
+	      </if>
+	      <else-if  variable="recipient">
+		<text macro="issued"/>
+	      </else-if>
+	    </choose>
+	    <text variable="locator"/>
 	  </group>
-	<text macro="title"/>
-	</group>
-	<choose>
-	  <if type="thesis">
-	    <group prefix=" (" delimiter=", " suffix=")">
-	      <text variable="genre"/>
-	      <text variable="publisher"/>
-	      <text macro="issued"/>
+	</else-if> 
+	<else>
+	  <group delimiter=", ">
+	    <group>
+	      <text macro="author"/>      
+	      <text macro="recipient"/>
 	    </group>
-	  </if>
-	  <else-if type="chapter">
-	    <group class="container" prefix=", ">
-	      <text term="in" text-case="lowercase"/>
-	      <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	    </group>
-	    <text macro="editor-translator"/>
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	      <text macro="publisher"/>
-	      <text macro="issued"/>
-	    </group>
-	  </else-if>
-	  <else-if type="article-journal">
-	    <group class="container" prefix=", ">
-	      <text variable="container-title" font-style="italic" prefix=" "/>
-	      <text macro="publisher"/>
-	      <text variable="volume" prefix=" "/>
-	      <text variable="issue" prefix=", no. "/>
-	      <text macro="issued" prefix=" (" suffix=")"/>
-	    </group>
-	  </else-if>
-	  <else-if type="article-newspaper article-magazine" match="any">
-	    <group prefix=", " delimiter=", ">
-	      <text macro="editor-translator"/>
-	      <text variable="container-title" font-style="italic"/>
-	      <text macro="issued"/>
-	    </group>
-	  </else-if>
-	<else-if type="paper-conference">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="genre" prefix=", " suffix=" presented at the "/>
-	  <text macro="event" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="interview">
-	  <group prefix=", " delimiter=", ">
-	    <text macro="interviewer"/>
-	    <text variable="medium"/>
-	    <text macro="issued"/>
+	    <text macro="title"/>
 	  </group>
-	</else-if>
-	<else-if type="personal_communication">
-	  <group prefix=", " delimiter=", ">
-	    <text variable="genre"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="graphic">
-	  <group prefix=", " delimiter=", ">
-	    <text variable="medium"/>
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="report">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="genre" prefix=", "/>
 	  <choose>
-	    <if variable="publisher publisher-place" match="all">
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	  <text macro="publisher"/>
-	  <text macro="issued"/>
-	    </group>
+	    <if type="thesis">
+	      <group prefix=" (" delimiter=", " suffix=")">
+		<text variable="genre"/>
+		<text variable="publisher"/>
+		<text macro="issued"/>
+	      </group>
 	    </if>
+	    <else-if type="chapter">
+	      <group delimiter=", ">
+		<group class="container" prefix=", " delimiter=" ">
+		  <text term="in" text-case="lowercase"/>
+		  <text variable="container-title" font-style="italic"/>
+		</group>
+		<text macro="editor-translator"/>
+	      </group>
+	      <group prefix=" (" suffix=")" delimiter=", ">
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="article-journal">
+	      <group class="container" prefix=", ">
+		<text variable="container-title" font-style="italic" prefix=" "/>
+		<text macro="publisher"/>
+		<text variable="volume" prefix=" "/>
+		<text variable="issue" prefix=", no. "/>
+		<text macro="issued" prefix=" (" suffix=")"/>
+	      </group>
+	    </else-if>
+	    <else-if type="article-newspaper article-magazine" match="any">
+	      <group prefix=", " delimiter=", ">
+		<text macro="editor-translator"/>
+		<text variable="container-title" font-style="italic"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="paper-conference">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="genre" prefix=", " suffix=" presented at the "/>
+	      <text macro="event" suffix=", "/>
+	      <text macro="issued"/>
+	    </else-if>
+	    <else-if type="interview">
+	      <group prefix=", " delimiter=", ">
+		<text macro="interviewer"/>
+		<text variable="medium"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="personal_communication">
+	      <group prefix=", " delimiter=", ">
+		<text variable="genre"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="graphic">
+	      <group prefix=", " delimiter=", ">
+		<text variable="medium"/>
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="report">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="genre" prefix=", "/>
+	      <choose>
+		<if variable="publisher publisher-place" match="all">
+		  <group prefix=" (" suffix=")" delimiter=", ">
+		    <text macro="publisher"/>
+		    <text macro="issued"/>
+		  </group>
+		</if>
+		<else>
+		  <text macro="issued" prefix=", "/>
+		</else>
+	      </choose>
+	    </else-if>
+	    <else-if type="book">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="collection-title" prefix=", "/>
+	      <group prefix=" (" suffix=")" delimiter=", ">
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
 	    <else>
-	  <text macro="issued" prefix=", "/>
+	      <group class="container"  prefix=", " delimiter=", ">
+		<text macro="editor-translator"/>
+		<text variable="container-title" font-style="italic"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text variable="genre"/>
+		<text variable="medium"/>
+		<text macro="issued"/>
+	      </group>
 	    </else>
 	  </choose>
-	</else-if>
-	<else-if type="book">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="collection-title" prefix=", "/>
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	  <text macro="publisher"/>
-	  <text macro="issued"/>
-	    </group>
-	</else-if>
-	  <else>
-	    <group class="container"  prefix=", " delimiter=", ">
-	  <text macro="editor-translator"/>
-	  <text variable="container-title" font-style="italic"/>
-	  <text variable="collection-title" font-style="italic"/>
-	  <text variable="genre"/>
-	  <text variable="medium"/>
-	  <text macro="issued"/>
-	    </group>
-	  </else>
-	</choose>
-	<choose>
-	  <if type="article-journal">
-	<text variable="locator" prefix=": "/>
-	  </if>
-	  <else>
-	<text variable="locator" prefix=", "/>
-	  </else>
-	</choose>
-	<choose>
-	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-	<group prefix=", " delimiter=", ">
-	  <text variable="archive_location"/>
-	  <text macro="archive"/>
-	</group>
-	  </if>
-	</choose>
-	<choose>
-	  <if variable="page" match="none">
-      <text variable="URL" prefix=", "/>
-	  </if>
-	</choose>
-	  </else>
-	</choose>
+	  <choose>
+	    <if type="article-journal">
+	      <text variable="locator" prefix=": "/>
+	    </if>
+	    <else>
+	      <text variable="locator" prefix=", "/>
+	    </else>
+	  </choose>
+	  <choose>
+	    <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	      <group prefix=", " delimiter=", ">
+		<text variable="archive_location"/>
+		<text macro="archive"/>
+	      </group>
+	    </if>
+	  </choose>
+	  <choose>
+	    <if variable="page" match="none">
+	      <text variable="URL" prefix=", "/>
+	    </if>
+	  </choose>
+	</else>
+      </choose>
     </layout>
   </citation> 
   <bibliography>
@@ -330,113 +332,117 @@
     <option name="et-al-use-first" value="6"/>
     <option name="subsequent-author-substitute" value="---"/>
     <layout suffix=".">
-	  <group delimiter=". ">
-      <text macro="author-bib"/>
-	  <text macro="title"/>
-      <choose>
-	<if type="thesis">
-	  <group delimiter=", ">
-	    <text variable="genre"/>
-	    <text variable="publisher"/>
+      <group delimiter=". ">
+	<text macro="author-bib"/>
+	<text macro="title"/>
+	<choose>
+	  <if type="thesis">
+	    <group delimiter=", ">
+	      <text variable="genre"/>
+	      <text variable="publisher"/>
+	      <text macro="issued"/>
+	    </group>
+	  </if>
+	  <else-if type="chapter">
+	    <group class="container">
+	      <group delimiter=". ">
+		<group delimiter=" ">
+		  <text term="in" text-case="capitalize-first"/>
+		  <text variable="container-title" font-style="italic" />
+		</group>
+		<text variable="collection-title"/>
+		<text macro="editor-translator" />
+	      </group>
+	      <text variable="page" prefix=", "/>
+	      <text macro="publisher" prefix=". "/>
+	      <text macro="issued" prefix=", "/>
+	    </group>
+	  </else-if>
+	  <else-if type="article-journal">
+	    <text macro="editor-translator" suffix=". "/>
+	    <group class="container">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="volume"  prefix=" "/>
+	      <text variable="issue" prefix=", no. "/>
+	      <text macro="issued" prefix=" (" suffix=")"/>
+	      <text variable="page" prefix=": "/>
+	    </group>
+	  </else-if>
+	  <else-if type="article-newspaper article-magazine" match="any">
+	    <text macro="editor-translator" suffix=". "/>
+	    <group delimiter=", ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else-if>
+	  <else-if type="paper-conference">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
+	    <text variable="event" suffix=", "/>
+	    <text variable="event-place" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group class="container">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" font-style="italic" prefix=" "/>
-	    <text variable="collection-title" prefix=". "/>
-	    <text macro="editor-translator" prefix=". "/>
-	    <text variable="page" prefix=", "/>
-	    <text macro="publisher" prefix=". "/>
-	    <text macro="issued" prefix=", "/>
-	  </group>
-	</else-if>
-	<else-if type="article-journal">
-	  <text macro="editor-translator" suffix=". "/>
-	  <group class="container">
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="volume"  prefix=" "/>
-	    <text variable="issue" prefix=", no. "/>
-	    <text macro="issued" prefix=" (" suffix=")"/>
-	    <text variable="page" prefix=": "/>
-	  </group>
-	</else-if>
-	<else-if type="article-newspaper article-magazine" match="any">
-	  <text macro="editor-translator" suffix=". "/>
-	  <group delimiter=", ">
-	    <text variable="container-title" font-style="italic"/>
+	  </else-if>
+	  <else-if type="interview">
+	    <group delimiter=". " suffix=".">
+	      <text macro="interviewer"/>
+	      <text variable="medium" text-case="capitalize-first"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else-if>
+	  <else-if type="personal_communication">
+	    <choose>
+	      <if variable="genre">
+		<text variable="genre" text-case="capitalize-first"/>
+	      </if>
+	      <else>
+		<text value="letter" text-case="capitalize-first"/>
+	      </else>
+	    </choose>
+	    <text macro="recipient" prefix=" "/>
+	    <text macro="issued" prefix=". "/>
+	  </else-if>
+	  <else-if type="graphic">
+	    <text variable="medium" text-case="capitalize-first" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="paper-conference">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
-	  <text variable="event" suffix=", "/>
-	  <text variable="event-place" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="interview">
-	  <group delimiter=". " suffix=".">
-	    <text macro="interviewer"/>
-	    <text variable="medium" text-case="capitalize-first"/>
+	  </else-if>
+	  <else-if type="report">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="genre" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="personal_communication">
-	  <choose>
-	    <if variable="genre">
-	  <text variable="genre" text-case="capitalize-first"/>
-	    </if>
-	    <else>
-	  <text value="letter" text-case="capitalize-first"/>
-	    </else>
-	  </choose>
-	  <text macro="recipient" prefix=" "/>
-	  <text macro="issued" prefix=". "/>
-	</else-if>
-	<else-if type="graphic">
-	  <text variable="medium" text-case="capitalize-first" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="report">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="genre" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	   <text macro="issued"/>
-	</else-if>
-	<else-if type="book">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="collection-title" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else>
-	  <group class="container" delimiter=". ">
-	    <text macro="editor-translator"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="collection-title" font-style="italic"/>
-	    <text variable="genre" text-case="capitalize-first"/>
-	    <text variable="medium" text-case="capitalize-first"/>
+	  </else-if>
+	  <else-if type="book">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="collection-title" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else>
-      </choose>
+	  </else-if>
+	  <else>
+	    <group class="container" delimiter=". ">
+	      <text macro="editor-translator"/>
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="collection-title" font-style="italic"/>
+	      <text variable="genre" text-case="capitalize-first"/>
+	      <text variable="medium" text-case="capitalize-first"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else>
+	</choose>
 	<choose>
 	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-	<group delimiter=". ">
-	  <text variable="archive_location" text-case="title"/>
-	  <text macro="archive"/>
-	</group>
+	    <group delimiter=". ">
+	      <text variable="archive_location" text-case="title"/>
+	      <text macro="archive"/>
+	    </group>
 	  </if>
 	</choose>
 	<choose>
 	  <if variable="page" match="none">
-      <text variable="URL"/>
+	    <text variable="URL"/>
 	  </if>
 	</choose>
-	  </group>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 40e02a380..5888bf115 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -137,23 +137,23 @@
   <macro name="issued">
     <choose>
       <if type="graphic report" match="any">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </if>
       <else-if type="book chapter thesis" match="any">
-    <date variable="issued">
+	<date variable="issued">
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else-if>
       <else>
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else>
     </choose>
   </macro>
@@ -167,20 +167,20 @@
     <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
       <group delimiter=", ">
-        <group>
+	<group>
 	  <text macro="author-short"/>      
 	  <text macro="recipient-short"/>
-        </group>
-	  <text macro="title-short"/>
-        <choose>
-	    <if type="interview">
-	  <text value="interview" text-case="lowercase"/>
-	    </if>
-	    <else-if variable="recipient">
-	  <text macro="issued"/>
-	    </else-if>
-        </choose>
-	  <text variable="locator"/>
+	</group>
+	<text macro="title-short"/>
+	<choose>
+	  <if type="interview">
+	    <text value="interview" text-case="lowercase"/>
+	  </if>
+	  <else-if variable="recipient">
+	    <text macro="issued"/>
+	  </else-if>
+	</choose>
+	<text variable="locator"/>
       </group>
     </layout>
   </citation> 
@@ -190,113 +190,113 @@
     <option name="et-al-use-first" value="6"/>
     <option name="subsequent-author-substitute" value="---"/>
     <layout suffix=".">
-	  <group delimiter=". ">
-      <text macro="author"/>
-	  <text macro="title"/>
-      <choose>
-	<if type="thesis">
-	  <group delimiter=", ">
-	    <text variable="genre"/>
-	    <text variable="publisher"/>
+      <group delimiter=". ">
+	<text macro="author"/>
+	<text macro="title"/>
+	<choose>
+	  <if type="thesis">
+	    <group delimiter=", ">
+	      <text variable="genre"/>
+	      <text variable="publisher"/>
+	      <text macro="issued"/>
+	    </group>
+	  </if>
+	  <else-if type="chapter">
+	    <group class="container">
+	      <text term="in" text-case="capitalize-first"/>
+	      <text variable="container-title" font-style="italic" prefix=" "/>
+	      <text variable="collection-title" prefix=". "/>
+	      <text macro="editor-translator" prefix=". "/>
+	      <text variable="page" prefix=", "/>
+	      <text macro="publisher" prefix=". "/>
+	      <text macro="issued" prefix=", "/>
+	    </group>
+	  </else-if>
+	  <else-if type="article-journal">
+	    <text macro="editor-translator" suffix=". "/>
+	    <group class="container">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="volume"  prefix=" "/>
+	      <text variable="issue" prefix=", no. "/>
+	      <text macro="issued" prefix=" (" suffix=")"/>
+	      <text variable="page" prefix=": "/>
+	    </group>
+	  </else-if>
+	  <else-if type="article-newspaper article-magazine" match="any">
+	    <text macro="editor-translator" suffix=". "/>
+	    <group delimiter=", ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else-if>
+	  <else-if type="paper-conference">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
+	    <text variable="event" suffix=", "/>
+	    <text variable="event-place" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group class="container">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" font-style="italic" prefix=" "/>
-	    <text variable="collection-title" prefix=". "/>
-	    <text macro="editor-translator" prefix=". "/>
-	    <text variable="page" prefix=", "/>
-	    <text macro="publisher" prefix=". "/>
-	    <text macro="issued" prefix=", "/>
-	  </group>
-	</else-if>
-	<else-if type="article-journal">
-	  <text macro="editor-translator" suffix=". "/>
-	  <group class="container">
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="volume"  prefix=" "/>
-	    <text variable="issue" prefix=", no. "/>
-	    <text macro="issued" prefix=" (" suffix=")"/>
-	    <text variable="page" prefix=": "/>
-	  </group>
-	</else-if>
-	<else-if type="article-newspaper article-magazine" match="any">
-	  <text macro="editor-translator" suffix=". "/>
-	  <group delimiter=", ">
-	    <text variable="container-title" font-style="italic"/>
+	  </else-if>
+	  <else-if type="interview">
+	    <group delimiter=". " suffix=".">
+	      <text macro="interviewer"/>
+	      <text variable="medium" text-case="capitalize-first"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else-if>
+	  <else-if type="personal_communication">
+	    <choose>
+	      <if variable="genre">
+		<text variable="genre" text-case="capitalize-first"/>
+	      </if>
+	      <else>
+		<text value="letter" text-case="capitalize-first"/>
+	      </else>
+	    </choose>
+	    <text macro="recipient" prefix=" "/>
+	    <text macro="issued" prefix=". "/>
+	  </else-if>
+	  <else-if type="graphic">
+	    <text variable="medium" text-case="capitalize-first" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="paper-conference">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
-	  <text variable="event" suffix=", "/>
-	  <text variable="event-place" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="interview">
-	  <group delimiter=". " suffix=".">
-	    <text macro="interviewer"/>
-	    <text variable="medium" text-case="capitalize-first"/>
+	  </else-if>
+	  <else-if type="report">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="genre" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="personal_communication">
-	  <choose>
-	    <if variable="genre">
-	  <text variable="genre" text-case="capitalize-first"/>
-	    </if>
-	    <else>
-	  <text value="letter" text-case="capitalize-first"/>
-	    </else>
-	  </choose>
-	  <text macro="recipient" prefix=" "/>
-	  <text macro="issued" prefix=". "/>
-	</else-if>
-	<else-if type="graphic">
-	  <text variable="medium" text-case="capitalize-first" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="report">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="genre" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	   <text macro="issued"/>
-	</else-if>
-	<else-if type="book">
-	  <text macro="editor-translator" suffix=". "/>
-	  <text variable="collection-title" suffix=". "/>
-	  <text macro="publisher" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else>
-	  <group class="container" delimiter=". ">
-	    <text macro="editor-translator"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="collection-title" font-style="italic"/>
-	    <text variable="genre" text-case="capitalize-first"/>
-	    <text variable="medium" text-case="capitalize-first"/>
+	  </else-if>
+	  <else-if type="book">
+	    <text macro="editor-translator" suffix=". "/>
+	    <text variable="collection-title" suffix=". "/>
+	    <text macro="publisher" suffix=", "/>
 	    <text macro="issued"/>
-	  </group>
-	</else>
-      </choose>
+	  </else-if>
+	  <else>
+	    <group class="container" delimiter=". ">
+	      <text macro="editor-translator"/>
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="collection-title" font-style="italic"/>
+	      <text variable="genre" text-case="capitalize-first"/>
+	      <text variable="medium" text-case="capitalize-first"/>
+	      <text macro="issued"/>
+	    </group>
+	  </else>
+	</choose>
 	<choose>
 	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-	<group delimiter=". ">
-	  <text variable="archive_location" text-case="title"/>
-	  <text macro="archive"/>
-	</group>
+	    <group delimiter=". ">
+	      <text variable="archive_location" text-case="title"/>
+	      <text macro="archive"/>
+	    </group>
 	  </if>
 	</choose>
 	<choose>
 	  <if variable="page" match="none">
-      <text variable="URL"/>
+	    <text variable="URL"/>
 	  </if>
 	</choose>
-	  </group>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index b29c74a33..c3ce17976 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -130,7 +130,7 @@
       <text variable="publisher"/>
     </group>
   </macro>
-    <macro name="archive">
+  <macro name="archive">
     <group delimiter=", ">
       <text variable="archive"/>
       <text variable="archive-place"/>
@@ -139,27 +139,27 @@
   <macro name="issued">
     <choose>
       <if type="graphic report" match="any">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </if>
       <else-if type="book chapter thesis" match="any">
-    <date variable="issued">
+	<date variable="issued">
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else-if>
       <else>
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
+	<date variable="issued">
+	  <date-part name="month" suffix=" "/>
 	  <date-part name="day" suffix=", "/>
 	  <date-part name="year"/>
-    </date>
+	</date>
       </else>
     </choose>
   </macro>
-<citation>
+  <citation>
     <option name="et-al-min" value="4"/>
     <option name="et-al-use-first" value="1"/>
     <option name="et-al-subsequent-min" value="4"/>
@@ -168,160 +168,162 @@
     <option name="disambiguate-add-names" value="true"/>
     <option name="disambiguate-add-givenname" value="true"/>
     <layout prefix="" suffix="." delimiter="; ">
-	<choose>
-  <if position="subsequent">
-    <group delimiter=", ">
-      <group>
-	<text macro="author-short"/>      
-	<text macro="recipient-short"/>
-      </group>
-	<text macro="title-short"/>
       <choose>
-	<if type="interview">
-	  <text value="interview" text-case="lowercase"/>
+	<if position="ibid-with-locator">
+	  <group delimiter=", ">
+	    <text term="ibid" text-case="capitalize-first"/>
+	    <text variable="locator"/>
+	  </group>
 	</if>
-	<else-if  variable="recipient">
-	  <text macro="issued"/>
+	<else-if position="ibid">
+	  <text term="ibid" text-case="capitalize-first"/>
 	</else-if>
-      </choose>
-	<text variable="locator"/>
-    </group>
-  </if> 
-  <else-if position="ibid-with-locator">
-    <group delimiter=", ">
-      <text term="ibid" text-case="capitalize-first"/>
-      <text variable="locator"/>
-    </group>
-  </else-if>
-  <else-if position="ibid">
-    <text term="ibid" text-case="capitalize-first"/>
-  </else-if>
-  <else>
-    <group delimiter=", ">
-      <group>
-	<text macro="author"/>      
-	<text macro="recipient"/>
+	<else-if position="subsequent">
+	  <group delimiter=", ">
+	    <group>
+	      <text macro="author-short"/>      
+	      <text macro="recipient-short"/>
+	    </group>
+	    <text macro="title-short"/>
+	    <choose>
+	      <if type="interview">
+		<text value="interview" text-case="lowercase"/>
+	      </if>
+	      <else-if  variable="recipient">
+		<text macro="issued"/>
+	      </else-if>
+	    </choose>
+	    <text variable="locator"/>
 	  </group>
-	<text macro="title"/>
-	</group>
-	<choose>
-	  <if type="thesis">
-	    <group prefix=" (" delimiter=", " suffix=")">
-	      <text variable="genre"/>
-	      <text variable="publisher"/>
-	      <text macro="issued"/>
+	</else-if> 
+	<else>
+	  <group delimiter=", ">
+	    <group>
+	      <text macro="author"/>      
+	      <text macro="recipient"/>
 	    </group>
-	  </if>
-	  <else-if type="chapter">
-	    <group class="container" prefix=", ">
-	      <text term="in" text-case="lowercase"/>
-	      <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	    </group>
-	    <text macro="editor-translator"/>
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	      <text macro="publisher"/>
-	      <text macro="issued"/>
-	    </group>
-	  </else-if>
-	  <else-if type="article-journal">
-	    <group class="container" prefix=", ">
-	      <text variable="container-title" font-style="italic" prefix=" "/>
-	      <text macro="publisher"/>
-	      <text variable="volume" prefix=" "/>
-	      <text variable="issue" prefix=", no. "/>
-	      <text macro="issued" prefix=" (" suffix=")"/>
-	    </group>
-	  </else-if>
-	  <else-if type="article-newspaper article-magazine" match="any">
-	    <group prefix=", " delimiter=", ">
-	      <text macro="editor-translator"/>
-	      <text variable="container-title" font-style="italic"/>
-	      <text macro="issued"/>
-	    </group>
-	  </else-if>
-	<else-if type="paper-conference">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="genre" prefix=", " suffix=" presented at the "/>
-	  <text macro="event" suffix=", "/>
-	  <text macro="issued"/>
-	</else-if>
-	<else-if type="interview">
-	  <group prefix=", " delimiter=", ">
-	    <text macro="interviewer"/>
-	    <text variable="medium"/>
-	    <text macro="issued"/>
+	    <text macro="title"/>
 	  </group>
-	</else-if>
-	<else-if type="personal_communication">
-	  <group prefix=", " delimiter=", ">
-	    <text variable="genre"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="graphic">
-	  <group prefix=", " delimiter=", ">
-	    <text variable="medium"/>
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</else-if>
-	<else-if type="report">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="genre" prefix=", "/>
 	  <choose>
-	    <if variable="publisher publisher-place" match="all">
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	  <text macro="publisher"/>
-	  <text macro="issued"/>
-	    </group>
+	    <if type="thesis">
+	      <group prefix=" (" delimiter=", " suffix=")">
+		<text variable="genre"/>
+		<text variable="publisher"/>
+		<text macro="issued"/>
+	      </group>
 	    </if>
+	    <else-if type="chapter">
+	      <group delimiter=", ">
+		<group class="container" prefix=", " delimiter=" ">
+		  <text term="in" text-case="lowercase"/>
+		  <text variable="container-title" font-style="italic"/>
+		</group>
+		<text macro="editor-translator"/>
+	      </group>
+	      <group prefix=" (" suffix=")" delimiter=", ">
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="article-journal">
+	      <group class="container" prefix=", ">
+		<text variable="container-title" font-style="italic" prefix=" "/>
+		<text macro="publisher"/>
+		<text variable="volume" prefix=" "/>
+		<text variable="issue" prefix=", no. "/>
+		<text macro="issued" prefix=" (" suffix=")"/>
+	      </group>
+	    </else-if>
+	    <else-if type="article-newspaper article-magazine" match="any">
+	      <group prefix=", " delimiter=", ">
+		<text macro="editor-translator"/>
+		<text variable="container-title" font-style="italic"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="paper-conference">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="genre" prefix=", " suffix=" presented at the "/>
+	      <text macro="event" suffix=", "/>
+	      <text macro="issued"/>
+	    </else-if>
+	    <else-if type="interview">
+	      <group prefix=", " delimiter=", ">
+		<text macro="interviewer"/>
+		<text variable="medium"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="personal_communication">
+	      <group prefix=", " delimiter=", ">
+		<text variable="genre"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="graphic">
+	      <group prefix=", " delimiter=", ">
+		<text variable="medium"/>
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
+	    <else-if type="report">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="genre" prefix=", "/>
+	      <choose>
+		<if variable="publisher publisher-place" match="all">
+		  <group prefix=" (" suffix=")" delimiter=", ">
+		    <text macro="publisher"/>
+		    <text macro="issued"/>
+		  </group>
+		</if>
+		<else>
+		  <text macro="issued" prefix=", "/>
+		</else>
+	      </choose>
+	    </else-if>
+	    <else-if type="book">
+	      <text macro="editor-translator" prefix=", "/>
+	      <text variable="collection-title" prefix=", "/>
+	      <group prefix=" (" suffix=")" delimiter=", ">
+		<text macro="publisher"/>
+		<text macro="issued"/>
+	      </group>
+	    </else-if>
 	    <else>
-	  <text macro="issued" prefix=", "/>
+	      <group class="container"  prefix=", " delimiter=", ">
+		<text macro="editor-translator"/>
+		<text variable="container-title" font-style="italic"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text variable="genre"/>
+		<text variable="medium"/>
+		<text macro="issued"/>
+	      </group>
 	    </else>
 	  </choose>
-	</else-if>
-	<else-if type="book">
-	  <text macro="editor-translator" prefix=", "/>
-	  <text variable="collection-title" prefix=", "/>
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	  <text macro="publisher"/>
-	  <text macro="issued"/>
-	    </group>
-	</else-if>
-	  <else>
-	    <group class="container"  prefix=", " delimiter=", ">
-	  <text macro="editor-translator"/>
-	  <text variable="container-title" font-style="italic"/>
-	  <text variable="collection-title" font-style="italic"/>
-	  <text variable="genre"/>
-	  <text variable="medium"/>
-	  <text macro="issued"/>
-	    </group>
-	  </else>
-	</choose>
-	<choose>
-	  <if type="article-journal">
-	<text variable="locator" prefix=": "/>
-	  </if>
-	  <else>
-	<text variable="locator" prefix=", "/>
-	  </else>
-	</choose>
-	<choose>
-	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-	<group prefix=", " delimiter=", ">
-	  <text variable="archive_location"/>
-	  <text macro="archive"/>
-	</group>
-	  </if>
-	</choose>
-	<choose>
-	  <if variable="page" match="none">
-      <text variable="URL" prefix=", "/>
-	  </if>
-	</choose>
-	  </else>
-	</choose>
+	  <choose>
+	    <if type="article-journal">
+	      <text variable="locator" prefix=": "/>
+	    </if>
+	    <else>
+	      <text variable="locator" prefix=", "/>
+	    </else>
+	  </choose>
+	  <choose>
+	    <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	      <group prefix=", " delimiter=", ">
+		<text variable="archive_location"/>
+		<text macro="archive"/>
+	      </group>
+	    </if>
+	  </choose>
+	  <choose>
+	    <if variable="page" match="none">
+	      <text variable="URL" prefix=", "/>
+	    </if>
+	  </choose>
+	</else>
+      </choose>
     </layout>
   </citation> 
 </style>