Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 077a993 + f78a4fd commit 61e63b483427c0465e3611d16aad0d43033da120 @rmzelle rmzelle committed May 12, 2012
Showing with 3 additions and 7 deletions.
  1. +3 −7 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=".">

0 comments on commit 61e63b4

Please sign in to comment.