Use latest chicago-author-date.csl.

2 files changed, 445 insertions, 409 deletions

diff --git a/tests/chicago-author-date.csl b/tests/chicago-author-date.csl
index dea707114..83a70d0b5 100644
--- a/tests/chicago-author-date.csl
+++ b/tests/chicago-author-date.csl
@@ -1,422 +1,458 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Chicago Manual of Style (Author-Date format)</title>
-      <id>http://www.zotero.org/styles/chicago-author-date</id>
-      <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
-      <author>
-         <name>Julian Onions</name>
-         <email>julian.onions@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Sebastian Karcher</name>
-      </contributor>
-      <category citation-format="author-date"/>
-      <category field="generic-base"/>
-      <updated>2011-11-17T22:01:05+00:00</updated>
-      <summary>The author-date variant of the Chicago style</summary>
-      <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-      <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
-   </info>
-   <macro name="secondary-contributors">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+  <info>
+    <title>Chicago Manual of Style (author-date)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date</id>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="self"/>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>The author-date variant of the Chicago style</summary>
+    <updated>2013-03-28T05:37:10+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale>
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">by</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator">
+            <label form="verb" text-case="capitalize-first" suffix=" " plural="never"/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <names variable="container-author editor" delimiter=", ">
+            <label form="verb" suffix=" " plural="never"/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " plural="never"/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" plural="never" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+    <text macro="recipient"/>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
       <choose>
-         <if type="chapter paper-conference" match="none">
-            <group delimiter=". ">
-               <choose>
-                  <if variable="author">
-                     <names variable="editor">
-                        <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-               <choose>
-                  <if variable="author editor" match="any">
-                     <names variable="translator">
-                        <label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="container-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <group prefix="," delimiter=", ">
-               <choose>
-                  <if variable="author">
-                     <names variable="editor">
-                        <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                     <choose>
-                        <if variable="container-author">
-                           <group>
-                              <names variable="container-author">
-                                 <label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
-                                 <name and="text" delimiter=", "/>
-                              </names>
-                           </group>
-                        </if>
-                     </choose>
-                  </if>
-               </choose>
-               <choose>
-                  <if variable="author editor" match="any">
-                     <names variable="translator">
-                        <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-            </group>
-         </if>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-magazine article-newspaper bill book chapter graphic legal_case legislation motion_picture paper-conference report song thesis" match="none">
+          <text macro="archive"/>
+        </else-if>
       </choose>
-   </macro>
-   <macro name="anon">
-      <text term="anonymous" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="translator">
-      <names variable="translator">
-         <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="recipient">
+      <text variable="DOI" prefix="doi:"/>
       <choose>
-         <if type="personal_communication">
-            <choose>
-               <if variable="genre">
-                  <text variable="genre" text-case="capitalize-first"/>
-               </if>
-               <else>
-                  <text term="letter" text-case="capitalize-first"/>
-               </else>
-            </choose>
-         </if>
-      </choose>
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="contributors">
-      <names variable="author">
-         <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-         <substitute>
-            <text macro="editor"/>
-            <text macro="translator"/>
-            <text macro="anon"/>
-         </substitute>
-      </names>
-      <text macro="recipient"/>
-   </macro>
-   <macro name="contributors-short">
-      <names variable="author">
-         <name form="short" and="text" delimiter=", " initialize-with=". "/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="anon"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="interviewer">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="archive">
-      <group delimiter=". ">
-         <text variable="archive_location" text-case="capitalize-first"/>
-         <text variable="archive"/>
-         <text variable="archive-place"/>
-      </group>
-   </macro>
-   <macro name="access">
-      <group delimiter=". ">
-         <choose>
-            <if type="graphic report" match="any">
-               <text macro="archive"/>
+        <if variable="DOI issued" match="none">
+          <choose>
+            <if variable="URL accessed" match="all">
+              <group delimiter=" ">
+                <text term="accessed" text-case="capitalize-first"/>
+                <date variable="accessed" delimiter=" ">
+                  <date-part name="month"/>
+                  <date-part name="day"/>
+                </date>
+              </group>
             </if>
-            <else-if type="bill book graphic legal_case motion_picture report song article-magazine article-newspaper thesis chapter paper-conference" match="none">
-               <text macro="archive"/>
-            </else-if>
-         </choose>
-         <text variable="DOI" prefix="doi:"/>
-         <choose>
-            <if type="legal_case" match="none">
-               <text variable="URL"/>
-            </if>
-         </choose>
-      </group>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if variable="title" match="none">
-            <choose>
-               <if type="personal_communication" match="none">
-                  <text variable="genre" text-case="capitalize-first"/>
-               </if>
-            </choose>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-	 <else>
-            <text variable="title" quotes="true"/>
-         </else>
+          </choose>
+        </if>
+        <else-if type="webpage">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month"/>
+            <date-part name="day"/>
+          </date>
+        </else-if>
       </choose>
-   </macro>
-   <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" suffix="."/>
-               </else>
-            </choose>
-         </if>
+        <if type="legal_case" match="none">
+          <text variable="URL"/>
+        </if>
       </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal">
-            <text variable="volume" prefix=" "/>
-            <text variable="issue" prefix=" (" suffix=")"/>
-         </if>
-         <else-if type="legal_case">
-            <text variable="volume" prefix=", "/>
-            <text variable="container-title" prefix=" "/>
-            <text variable="page" prefix=" "/>
-         </else-if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <group prefix=". " delimiter=". ">
-               <group>
-                  <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="volume" form="numeric"/>
-               </group>
-               <group>
-                  <number variable="number-of-volumes" form="numeric"/>
-                  <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
-               </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=". ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" strip-periods="true"/>
             </group>
-         </else-if>
-         <else-if type="chapter paper-conference" match="any">
-            <choose>
-               <if variable="page" match="none">
-                  <group prefix=". ">
-                     <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                     <number variable="volume" form="numeric"/>
-                  </group>
-               </if>
-            </choose>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="locators-chapter">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <choose>
-               <if variable="page">
-                  <group prefix=", ">
-                     <text variable="volume" suffix=":"/>
-                     <text variable="page"/>
-                  </group>
-               </if>
-            </choose>
-         </if>
-      </choose>
-   </macro>
-   <macro name="locators-article">
-      <choose>
-         <if type="article-newspaper">
-            <group prefix=", " delimiter=", ">
-               <group>
-                  <text variable="edition" suffix=" "/>
-                  <text term="edition" prefix=" "/>
-               </group>
-               <group>
-                  <text term="section" form="short" suffix=". " strip-periods="true"/>
-                  <text variable="section"/>
-               </group>
+          </if>
+          <else>
+            <text variable="edition" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter  paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=", ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
             </group>
-         </if>
-         <else-if type="article-journal">
-            <text variable="page" prefix=": "/>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="point-locators">
-      <choose>
-         <if variable="locator">
+          </if>
+          <else>
+            <text variable="edition" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume" prefix=" "/>
+        <text variable="issue" prefix=" (" suffix=")"/>
+      </if>
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <text variable="volume" suffix=":"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="edition" suffix=" "/>
+            <text term="edition" prefix=" "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <text variable="page" prefix=": "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
             <choose>
-               <if locator="page" match="none">
-                  <choose>
-                     <if type="bill book graphic legal_case motion_picture report song" match="any">
-                        <choose>
-                           <if variable="volume">
-                              <group>
-                                 <text term="volume" form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
-                                 <number variable="volume" form="numeric"/>
-                                 <label variable="locator" form="short" prefix=", " suffix=" "/>
-                              </group>
-                           </if>
-                           <else>
-                              <label variable="locator" form="short" suffix=" "/>
-                           </else>
-                        </choose>
-                     </if>
-                  </choose>
-               </if>
-               <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-                  <number variable="volume" form="numeric" suffix=":"/>
-               </else-if>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" suffix=" "/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
+                  </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
             </choose>
-            <text variable="locator"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="container-prefix">
-      <text term="in" text-case="capitalize-first"/>
-   </macro>
-   <macro name="container-title">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text macro="container-prefix" suffix=" "/>
-         </if>
-      </choose>
-      <choose>
-         <if type="legal_case" match="none">
-            <text variable="container-title" font-style="italic"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher-place"/>
-         <text variable="publisher"/>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix=":"/>
+          </else-if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="legal_case" match="none">
+        <text variable="container-title" text-case="title" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if variable="accessed">
+        <date variable="accessed">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title" text-case="title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if type="interview">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis"/>
+      <else>
+        <group delimiter=" " prefix=". ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+    <!--This is for computer programs only. Localization new to 1.0.1, so may be missing in many locales-->
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text term="version"/>
+      <text variable="version"/>
+    </group>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="article-journal">
+        <text macro="day-month" prefix=" (" suffix=")"/>
+      </if>
+      <else-if type="legal_case">
+        <text variable="authority" prefix=". "/>
+      </else-if>
+      <else-if type="speech">
+        <group prefix=" " delimiter=", ">
+          <text macro="event"/>
+          <text macro="day-month"/>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="contributors-short"/>
+          <text macro="date"/>
+        </group>
+        <text macro="point-locators"/>
       </group>
-   </macro>
-   <macro name="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>
-   <macro name="collection-title">
-      <text variable="collection-title"/>
-      <text variable="collection-number" prefix=" "/>
-   </macro>
-   <macro name="event">
-      <group>
-         <text term="presented at" suffix=" "/>
-         <text variable="event"/>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="contributors"/>
+        <text macro="date"/>
+        <text macro="title"/>
       </group>
-   </macro>
-   <macro name="description">
-      <choose>
-         <if type="interview">
-            <group delimiter=". ">
-               <text macro="interviewer"/>
-               <text variable="medium" text-case="capitalize-first"/>
-            </group>
-         </if>
-         <else>
-            <text variable="medium" text-case="capitalize-first" prefix=". "/>
-         </else>
-      </choose>
-      <choose>
-         <if variable="title" match="none"/>
-         <else-if type="thesis"/>
-         <else>
-            <text variable="genre" text-case="capitalize-first" prefix=". "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="issue">
-      <choose>
-         <if type="article-journal">
-            <text macro="day-month" prefix=" (" suffix=")"/>
-         </if>
-         <else-if type="legal_case">
-            <text variable="authority" prefix=". "/>
-         </else-if>
-         <else-if type="speech">
-            <group prefix=" " delimiter=", ">
-               <text macro="event"/>
-               <text macro="day-month"/>
-               <text variable="event-place"/>
-            </group>
-         </else-if>
-         <else-if type="article-newspaper article-magazine" match="any">
-            <text macro="day-month" prefix=", "/>
-         </else-if>
-         <else>
-            <group prefix=". " delimiter=", ">
-               <choose>
-                  <if type="thesis">
-                     <text variable="genre" text-case="capitalize-first"/>
-                  </if>
-               </choose>
-               <text macro="publisher"/>
-               </group>
-         </else>
-      </choose>
-   </macro>
-   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=", ">
-            <group delimiter=" ">
-               <text macro="contributors-short"/>
-               <text macro="date"/>
-            </group>
-            <text macro="point-locators"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
-      <sort>
-         <key macro="contributors"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="contributors" suffix=". "/>
-         <text macro="date" suffix=". "/>
-         <text macro="title"/>
-         <text macro="description"/>
-         <text macro="secondary-contributors" prefix=". "/>
-         <text macro="container-title" prefix=". "/>
-         <text macro="container-contributors"/>
-         <text macro="locators-chapter"/>
-         <text macro="edition" prefix=". "/>
-         <text macro="locators"/>
-         <text macro="collection-title" prefix=". "/>
-         <text macro="issue"/>
-         <text macro="locators-article"/>
-         <text macro="access" prefix=". "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
+      <text macro="edition"/>
+      <text macro="locators-chapter"/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/tests/markdown-citations.chicago-author-date.txt b/tests/markdown-citations.chicago-author-date.txt
index 9b92c1cb5..de242300d 100644
--- a/tests/markdown-citations.chicago-author-date.txt
+++ b/tests/markdown-citations.chicago-author-date.txt
@@ -36,7 +36,7 @@ Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press.
 
 ———. 2006. “Article.” *Journal of Generic Studies* 6: 33–34.
 
-Doe, John, and Jenny Roe. 2007. “Why Water Is Wet.” In *Third Book*, ed. Sam Smith. Oxford: Oxford University Press.
+Doe, John, and Jenny Roe. 2007. “Why Water Is Wet.” In *Third Book*, edited by Sam Smith. Oxford: Oxford University Press.
 
 [^1]: Doe and Roe (2007, 12) and a citation without locators (Doe and Roe 2007).