Merge remote-tracking branch 'origin/master'

nofacetou · May 12, 2012 · 61e63b4 · 61e63b4
2 parents 077a993 + f78a4fd
commit 61e63b4
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/chicago-dated-note-biblio-no-ibid.csl b/chicago-dated-note-biblio-no-ibid.csl
@@ -137,7 +137,6 @@
   <macro name="contributors-sort">
     <names variable="author">
       <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -415,11 +414,6 @@
       </choose>
     </group>
   </macro>
-  <macro name="sort-key">
-    <text macro="contributors-sort" suffix=" "/>
-    <text variable="title" suffix=" "/>
-    <text variable="genre"/>
-  </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-year-suffix="true">
     <layout prefix="" suffix="." delimiter="; ">
       <choose>
@@ -446,7 +440,9 @@
   </citation>
   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" entry-spacing="0">
     <sort>
-      <key macro="sort-key"/>
+      <key macro="contributors-sort"/>
+      <key variable="title"/>
+      <key variable="genre"/>
       <key variable="issued"/>
     </sort>
     <layout suffix=".">