Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix sorting problem identified by Frank, delete a few non-used macros.

  • Loading branch information...
commit 7966cb2a460ab46f2999c1d12f4c632469fdf7e2 1 parent cead007
Rintze M. Zelle rmzelle authored
15 british-journal-of-political-science.csl
View
@@ -212,16 +212,6 @@
</names>
<text macro="recipient-short"/>
</macro>
- <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"/>
- </substitute>
- </names>
- </macro>
<macro name="interviewer-note">
<names variable="interviewer" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
@@ -556,11 +546,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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
12 chicago-fullnote-bibliography-no-ibid.csl
View
@@ -212,7 +212,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=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -858,13 +857,6 @@
</choose>
</group>
</macro>
- <macro name="sort-key">
- <group delimiter=" ">
- <text macro="contributors-sort"/>
- <text variable="title"/>
- <text variable="genre"/>
- </group>
- </macro>
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
<layout suffix="." delimiter="; ">
<choose>
@@ -915,7 +907,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 chicago-library-list.csl
View
@@ -143,7 +143,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"/>
@@ -456,11 +455,6 @@
<text variable="call-number"/>
</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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
@@ -485,7 +479,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 chicago-note-biblio-no-ibid.csl
View
@@ -143,7 +143,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"/>
@@ -472,11 +471,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" disambiguate-add-names="true">
<layout prefix="" suffix="." delimiter="; ">
<group delimiter=", ">
@@ -488,7 +482,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
15 chicago-quick-copy.csl
View
@@ -206,16 +206,6 @@
</names>
<text macro="recipient-short"/>
</macro>
- <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"/>
- </substitute>
- </names>
- </macro>
<macro name="interviewer-note">
<names variable="interviewer" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
@@ -650,11 +640,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">
<layout prefix="" suffix="." delimiter="; ">
<group delimiter=", ">
15 ethics-book-reviews.csl
View
@@ -190,16 +190,6 @@
</names>
<text macro="recipient-short"/>
</macro>
- <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=", "/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- </substitute>
- </names>
- </macro>
<macro name="interviewer-note">
<names variable="interviewer" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
@@ -712,11 +702,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" disambiguate-add-names="true">
<layout prefix="(" suffix=")" delimiter="; ">
<choose>
15 geopolitics.csl
View
@@ -212,16 +212,6 @@
</names>
<text macro="recipient-short"/>
</macro>
- <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"/>
- </substitute>
- </names>
- </macro>
<macro name="interviewer-note">
<names variable="interviewer" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
@@ -556,11 +546,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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
10 international-organization.csl
View
@@ -142,7 +142,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"/>
@@ -404,11 +403,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>
@@ -435,7 +429,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=".">
10 law1-de.csl
View
@@ -129,7 +129,6 @@
<macro name="contributors-sort">
<names variable="author">
<name name-as-sort-order="all" sort-separator=", " delimiter="/" delimiter-precedes-last="always"/>
- <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -384,11 +383,6 @@
</group>
</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">
<layout prefix="" suffix="." delimiter="; ">
<!-- <choose>
@@ -413,7 +407,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" subsequent-author-substitute="---" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
</sort>
<layout suffix=".">
<text macro="contributors"/>
5 lettres-et-sciences-humaines-fr.csl
View
@@ -70,10 +70,7 @@
</macro>
<macro name="contributors-sort">
<names variable="author">
- <name name-as-sort-order="all" form="long" delimiter=", " delimiter-precedes-last="always" sort-separator=" ">
- <name-part name="family" text-case="uppercase"/>
- </name>
- <label form="short" prefix=", (" suffix=".)"/>
+ <name name-as-sort-order="all" form="long" delimiter=", " delimiter-precedes-last="always" sort-separator=" "/>
<substitute>
<text macro="title"/>
<names variable="editor"/>
10 mcrj7.csl
View
@@ -128,7 +128,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"/>
@@ -806,11 +805,6 @@
<text macro="issued" prefix=" (" suffix=")"/>
</macro>
<!-- Backup plan end -->
- <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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
@@ -882,7 +876,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="4" et-al-use-first="4" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 mla-notes.csl
View
@@ -212,7 +212,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"/>
@@ -725,11 +724,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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
@@ -770,7 +764,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 radiopaedia.csl
View
@@ -39,7 +39,6 @@
<macro name="contributors-sort">
<names variable="author">
<name name-as-sort-order="first" and="text" sort-separator=" " delimiter=", " delimiter-precedes-last="never"/>
- <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -412,11 +411,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="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true">
<layout prefix="" suffix="." delimiter="; ">
<group delimiter=", ">
@@ -428,7 +422,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="5" et-al-use-first="3" subsequent-author-substitute="" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 sbl-fullnote-bibliography.csl
View
@@ -234,7 +234,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"/>
@@ -678,11 +677,6 @@
<text variable="URL"/>
</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" disambiguate-add-names="true">
<layout prefix="" suffix="." delimiter="; ">
<choose>
@@ -720,7 +714,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" subsequent-author-substitute="---" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
</sort>
<layout suffix=".">
<group delimiter=". ">
10 turabian-fullnote-bibliography.csl
View
@@ -201,7 +201,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"/>
@@ -711,11 +710,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">
<layout prefix="" suffix="." delimiter="; ">
<choose>
@@ -756,7 +750,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 universita-di-bologna-lettere.csl
View
@@ -165,7 +165,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"/>
@@ -568,11 +567,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">
<layout prefix="" delimiter="; ">
<choose>
@@ -613,7 +607,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
10 wheaton-college-phd-in-biblical-and-theological-studies.csl
View
@@ -198,7 +198,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"/>
@@ -730,11 +729,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">
<layout prefix="" suffix="" delimiter="; ">
<choose>
@@ -775,7 +769,9 @@
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="______" entry-spacing="0">
<sort>
- <key macro="sort-key"/>
+ <key macro="contributors-sort"/>
+ <key variable="title"/>
+ <key variable="genre"/>
<key variable="issued"/>
</sort>
<layout suffix=".">
Please sign in to comment.
Something went wrong with that request. Please try again.