Skip to content

Commit

Permalink
Switch labels from "verb-short" to "short" (with plural="never") (rev…
Browse files Browse the repository at this point in the history
…erse-merged from commit 4bf538a)
  • Loading branch information
rmzelle committed Sep 15, 2012
1 parent e0f4440 commit c39ea35
Show file tree
Hide file tree
Showing 44 changed files with 170 additions and 170 deletions.
6 changes: 3 additions & 3 deletions american-antiquity.csl
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<if type="chapter paper-conference" match="none">
<group delimiter=". ">
<names variable="editor">
<label form="short" plural="never" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -97,7 +97,7 @@
<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=", " suffix="." text-case="lowercase" strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
Expand Down
8 changes: 4 additions & 4 deletions american-journal-of-archaeology.csl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<choose>
<if variable="author">
<names variable="editor">
<label form="short" plural="never" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -56,7 +56,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand All @@ -81,7 +81,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand All @@ -105,7 +105,7 @@
<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=", " suffix="." text-case="lowercase" strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
Expand Down
2 changes: 1 addition & 1 deletion applied-spectroscopy.csl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient-note">
Expand Down
12 changes: 6 additions & 6 deletions asian-studies-review.csl
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
<choose>
<if variable="author">
<names variable="editor">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<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="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -82,7 +82,7 @@
<if variable="container-author">
<group>
<names variable="container-author">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</group>
Expand All @@ -93,7 +93,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand All @@ -114,7 +114,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand All @@ -138,7 +138,7 @@
<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=", " suffix="." text-case="lowercase" strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
Expand Down
6 changes: 3 additions & 3 deletions australian-historical-studies.csl
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<macro name="editor-translator">
<group delimiter=", ">
<names variable="editor" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
<choose>
<if variable="author editor" match="any">
<names variable="translator" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -67,7 +67,7 @@
<macro name="translator-note">
<names variable="translator">
<name and="text" sort-separator=", " delimiter=", "/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient-note">
Expand Down
2 changes: 1 addition & 1 deletion australian-legal.csl
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter=", "/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="author">
Expand Down
2 changes: 1 addition & 1 deletion austrian-legal.csl
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<macro name="contributors-sort">
<names variable="editor">
<name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
<substitute>
<names variable="author"/>
<text macro="noauthor"/>
Expand Down
8 changes: 4 additions & 4 deletions bioelectromagnetics.csl
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<choose>
<if variable="author">
<names variable="editor">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
</choose>
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
Expand All @@ -59,7 +59,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
Expand All @@ -84,7 +84,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand Down
8 changes: 4 additions & 4 deletions biotechnology-and-bioengineering.csl
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
<choose>
<if variable="author">
<names variable="editor">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
</choose>
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
Expand All @@ -59,7 +59,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<name delimiter=", "/>
</names>
</if>
Expand All @@ -84,7 +84,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand Down
2 changes: 1 addition & 1 deletion bluebook-law-review.csl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<macro name="name-short-macro">
<names variable="author">
<name form="short" and="text" delimiter=", "/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
<substitute>
<text variable="title" form="short"/>
</substitute>
Expand Down
10 changes: 5 additions & 5 deletions british-journal-of-political-science.csl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<if variable="container-author">
<group>
<names variable="container-author">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</group>
Expand All @@ -51,7 +51,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -111,7 +111,7 @@
<if variable="container-author">
<group>
<names variable="container-author">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=" " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</group>
Expand Down Expand Up @@ -140,7 +140,7 @@
<macro name="translator-note">
<names variable="translator">
<name and="text" sort-separator=", " delimiter=", "/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient-note">
Expand Down Expand Up @@ -168,7 +168,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand Down
12 changes: 6 additions & 6 deletions catholic-biblical-association.csl
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@
<choose>
<if variable="author">
<names variable="editor" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix="."/>
<label form="verb-short" text-case="lowercase" suffix="."/>
<name form="short" and="text" delimiter=", "/>
</names>
</if>
</choose>
<choose>
<if variable="author editor" match="any">
<names variable="translator" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix=". "/>
<label form="verb-short" text-case="lowercase" suffix=". "/>
<name form="short" and="text" delimiter=", "/>
</names>
</if>
Expand Down Expand Up @@ -197,13 +197,13 @@
</macro>
<macro name="translator">
<names variable="translator">
<label form="short" plural="never" suffix=". "/>
<label form="verb-short" suffix=". "/>
<name and="text" sort-separator=", " delimiter=", "/>
</names>
</macro>
<macro name="editor">
<names variable="editor">
<label form="short" plural="never" prefix=", " suffix="."/>
<label form="verb-short" prefix=", " suffix="."/>
<name and="text" sort-separator=", " delimiter=", "/>
</names>
</macro>
Expand All @@ -222,14 +222,14 @@
<choose>
<if variable="author">
<names variable="editor" delimiter=", ">
<label form="short" plural="never" text-case="lowercase" suffix=". "/>
<label form="verb-short" text-case="lowercase" suffix=". "/>
<name and="text" delimiter=", "/>
</names>
<choose>
<if variable="container-author">
<group prefix=" by ">
<names variable="container-author">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=" "/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
</group>
Expand Down
8 changes: 4 additions & 4 deletions culture-medicine-and-psychiatry.csl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<label form="verb-short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand All @@ -60,7 +60,7 @@
<choose>
<if variable="author editor" match="any">
<names variable="translator">
<label form="short" plural="never" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
<name and="text" delimiter=", "/>
</names>
</if>
Expand All @@ -85,7 +85,7 @@
<macro name="translator">
<names variable="translator">
<name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" plural="never" prefix=", " suffix="." strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
</names>
</macro>
<macro name="recipient">
Expand All @@ -109,7 +109,7 @@
<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=", " suffix="." text-case="lowercase" strip-periods="true"/>
<label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
<substitute>
<text macro="editor"/>
<text macro="translator"/>
Expand Down
Loading

0 comments on commit c39ea35

Please sign in to comment.