From f1a3d660e92c51fb207d1ac4c0646a2712f180e2 Mon Sep 17 00:00:00 2001
From: Elena Razlogova <elena.razlogova@gmail.com>
Date: Tue, 12 Feb 2008 12:59:29 +0000
Subject: [PATCH] Secondary authors should precede page numbers in chapter
 citations in Chicago bibliography styles

---
 csl/chicago-fullnote-bibliography.csl | 38 ++++++++++++++++++++++++---
 csl/chicago-note-bibliography.csl     | 38 ++++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index fd5225188..17e4f9f7e 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -41,6 +41,16 @@
       </if>
     </choose>
   </macro>
+  <macro name="translator-chapter-bib">
+    <choose>
+      <if variable="author editor" match="any">
+    <names variable="translator" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+      </if>
+    </choose>
+  </macro>
   <macro name="secondary-contributor">
     <group delimiter=", ">
       <names variable="editor" delimiter=", ">
@@ -55,6 +65,8 @@
     </group>
   </macro>
   <macro name="secondary-contributor-bib">
+    <choose>
+      <if type="chapter" match="none">
     <group delimiter=". ">
       <names variable="editor" delimiter=". ">
         <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
@@ -66,6 +78,21 @@
         </if>
       </choose>
     </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributor-chapter-bib">
+    <choose>
+      <if type="chapter">
+    <group delimiter=", ">
+      <names variable="editor" delimiter=", ">
+        <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+      <text macro="translator-chapter-bib"/>
+    </group>
+      </if>
+    </choose>
   </macro>
   <macro name="translator-article">
     <choose>
@@ -381,7 +408,7 @@
   <macro name="pages-chapter">
     <choose>
       <if type="chapter">
-    <text variable="page" prefix=", "/>
+    <text variable="page"/>
       </if>
     </choose>
   </macro>
@@ -559,9 +586,12 @@
         <text macro="title-bib"/>
         <text macro="description-bib"/>
         <text macro="translator-article-bib"/>
-        <group>
-          <text macro="container-prefix-bib"/>
-          <text variable="container-title" font-style="italic"/>
+        <group delimiter=", ">
+          <group>
+            <text macro="container-prefix-bib"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+          <text macro="secondary-contributor-chapter-bib"/>
           <text macro="pages-chapter"/>
         </group>
         <text macro="secondary-contributor-bib"/>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index a0d477e5d..df768fdc2 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -33,7 +33,19 @@
       </if>
     </choose>
   </macro>
+  <macro name="translator-chapter-bib">
+    <choose>
+      <if variable="author editor" match="any">
+    <names variable="translator" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+      </if>
+    </choose>
+  </macro>
   <macro name="secondary-contributor-bib">
+    <choose>
+      <if type="chapter" match="none">
     <group delimiter=". ">
       <names variable="editor" delimiter=". ">
         <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
@@ -45,6 +57,21 @@
         </if>
       </choose>
     </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributor-chapter-bib">
+    <choose>
+      <if type="chapter">
+    <group delimiter=", ">
+      <names variable="editor" delimiter=", ">
+        <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+      <text macro="translator-chapter-bib"/>
+    </group>
+      </if>
+    </choose>
   </macro>
   <macro name="translator-article-bib">
     <choose>
@@ -255,7 +282,7 @@
   <macro name="pages-chapter">
     <choose>
       <if type="chapter">
-    <text variable="page" prefix=", "/>
+    <text variable="page"/>
       </if>
     </choose>
   </macro>
@@ -366,9 +393,12 @@
         <text macro="title-bib"/>
         <text macro="description-bib"/>
         <text macro="translator-article-bib"/>
-        <group>
-          <text macro="container-prefix-bib"/>
-          <text variable="container-title" font-style="italic"/>
+        <group delimiter=", ">
+          <group>
+            <text macro="container-prefix-bib"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+          <text macro="secondary-contributor-chapter-bib"/>
           <text macro="pages-chapter"/>
         </group>
         <text macro="secondary-contributor-bib"/>