Skip to content
Please note that GitHub no longer supports your web browser.

We recommend upgrading to the latest Google Chrome or Firefox.

Learn more
Permalink
Browse files

Migrate common name attributes upward (#3524)

* Remove redundant attribute from style node of gallia-prehistoire.csl

* Migrate common et-al attributes upward

* Also move et-al-{min,use-first} attributes without pair partners
  • Loading branch information
fbennett authored and adam3smith committed Jul 1, 2018
1 parent 6640ef4 commit 69304f734581616ae454e94dd45205dae1620c7d
Showing with 114 additions and 114 deletions.
  1. +3 −3 acta-polytechnica.csl
  2. +5 −5 annual-review-of-astronomy-and-astrophysics.csl
  3. +3 −3 annual-review-of-medicine.csl
  4. +3 −3 annual-review-of-nuclear-and-particle-science.csl
  5. +4 −4 annual-reviews-alphabetical.csl
  6. +5 −5 annual-reviews-author-date.csl
  7. +3 −3 annual-reviews-without-titles.csl
  8. +3 −3 annual-reviews.csl
  9. +1 −1 cahiers-du-centre-gustave-glotz.csl
  10. +1 −1 collections-electroniques-de-l-inha-author-date.csl
  11. +1 −1 der-moderne-staat.csl
  12. +2 −2 deutsches-archaologisches-institut.csl
  13. +1 −1 egretta.csl
  14. +2 −2 ets-ecole-de-technologie-superieure.csl
  15. +4 −4 fine-focus.csl
  16. +2 −2 food-and-agriculture-organization-of-the-united-nations.csl
  17. +11 −11 gallia-prehistoire.csl
  18. +2 −2 harvard-newcastle-university.csl
  19. +2 −2 harvard-university-for-the-creative-arts.csl
  20. +1 −1 harvard-university-of-abertay-dundee.csl
  21. +2 −2 international-journal-of-lexicography.csl
  22. +12 −12 leidraad-voor-juridische-auteurs.csl
  23. +2 −2 lethaia.csl
  24. +2 −2 paleobiology.csl
  25. +5 −5 sociology-of-health-and-illness.csl
  26. +2 −2 spip-cite.csl
  27. +1 −1 technische-universitat-dresden-erziehungswissenschaften-author-date.csl
  28. +1 −1 ...universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date-with-short-titles.csl
  29. +1 −1 technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date.csl
  30. +1 −1 technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-note.csl
  31. +3 −3 universite-laval-departement-des-sciences-historiques.csl
  32. +2 −2 university-for-the-creative-arts-figures.csl
  33. +1 −1 university-of-lincoln-harvard.csl
  34. +10 −10 university-of-zabol-fa.csl
  35. +9 −9 university-of-zabol.csl
  36. +1 −1 wirtschaftsuniversitat-wien-wirtschaftspadagogik.csl
@@ -19,7 +19,7 @@
</info>
<macro name="author">
<names variable="author">
<name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", " et-al-min="3" et-al-use-first="1"/>
<name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
<label form="short" prefix=" "/>
<substitute>
<names variable="editor"/>
@@ -30,7 +30,7 @@
<macro name="container-author">
<names variable="container-author">
<label form="long" suffix=": " text-case="capitalize-first" strip-periods="true"/>
<name and="text" delimiter=" " initialize-with=". " delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1">
<name and="text" delimiter=" " initialize-with=". " delimiter-precedes-last="never">
<name-part name="given"/>
<name-part name="family" text-case="capitalize-first"/>
</name>
@@ -75,7 +75,7 @@
</group>
</layout>
</citation>
<bibliography entry-spacing="1" second-field-align="flush">
<bibliography entry-spacing="1" second-field-align="flush" et-al-min="3" et-al-use-first="1">
<sort>
<key variable="citation-number"/>
</sort>
@@ -48,7 +48,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -59,7 +59,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" delimiter=", " et-al-min="4" et-al-use-first="1" and="symbol" delimiter-precedes-last="never"/>
<name form="short" delimiter=", " and="symbol" delimiter-precedes-last="never"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -69,7 +69,7 @@
</macro>
<macro name="author-last-names">
<names variable="author">
<name form="short" et-al-min="7" et-al-use-first="5"/>
<name form="short"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -79,7 +79,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -278,7 +278,7 @@
</group>
</layout>
</citation>
<bibliography entry-spacing="0" line-spacing="2" hanging-indent="true">
<bibliography entry-spacing="0" line-spacing="2" hanging-indent="true" et-al-min="7" et-al-use-first="5">
<sort>
<key macro="author" names-min="2" names-use-first="1" names-use-last="false"/>
<key macro="author-last-names"/>
@@ -47,7 +47,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="4" et-al-use-first="3"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -59,7 +59,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="4" et-al-use-first="3"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -254,7 +254,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="4" et-al-use-first="3">
<layout>
<text variable="citation-number" suffix=". "/>
<group delimiter=". ">
@@ -47,7 +47,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="5" et-al-use-first="1"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -59,7 +59,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="5" et-al-use-first="1"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -254,7 +254,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="5" et-al-use-first="1">
<layout>
<text variable="citation-number" suffix=". "/>
<group delimiter=". ">
@@ -45,7 +45,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -56,7 +56,7 @@
</macro>
<macro name="author-last-names">
<names variable="author">
<name form="short" et-al-min="7" et-al-use-first="5"/>
<name form="short"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -66,7 +66,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -261,7 +261,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="7" et-al-use-first="5">
<sort>
<key macro="author" names-min="2" names-use-first="1" names-use-last="false"/>
<key macro="author-last-names"/>
@@ -49,7 +49,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -60,7 +60,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" delimiter=", " et-al-min="3" et-al-use-first="1" and="symbol" delimiter-precedes-last="never"/>
<name form="short" delimiter=", " and="symbol" delimiter-precedes-last="never"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -70,7 +70,7 @@
</macro>
<macro name="author-last-names">
<names variable="author">
<name form="short" et-al-min="7" et-al-use-first="5"/>
<name form="short"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -80,7 +80,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=". " plural="contextual"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -362,7 +362,7 @@
</group>
</layout>
</citation>
<bibliography entry-spacing="0" line-spacing="2" hanging-indent="true">
<bibliography entry-spacing="0" line-spacing="2" hanging-indent="true" et-al-min="7" et-al-use-first="5">
<sort>
<key macro="author" names-min="2" names-use-first="1" names-use-last="false"/>
<key macro="author-last-names"/>
@@ -45,7 +45,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -57,7 +57,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -252,7 +252,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="7" et-al-use-first="5">
<layout>
<text variable="citation-number" suffix=". "/>
<group delimiter=". ">
@@ -44,7 +44,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -56,7 +56,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -251,7 +251,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="7" et-al-use-first="5">
<layout>
<text variable="citation-number" suffix=". "/>
<group delimiter=". ">
@@ -68,7 +68,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" delimiter=", " et-al-min="4" et-al-use-first="1"/>
<name form="short" delimiter=", "/>
<et-al font-variant="normal" font-style="italic"/>
<substitute>
<names variable="editor"/>
@@ -70,7 +70,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" font-variant="small-caps" delimiter=", " et-al-min="4" et-al-use-first="1"/>
<name form="short" font-variant="small-caps" delimiter=", "/>
<et-al font-variant="normal" font-style="italic"/>
<substitute>
<names variable="editor"/>
@@ -44,7 +44,7 @@
</macro>
<macro name="author-short">
<names variable="author" font-style="italic" delimiter=" ">
<name form="short" delimiter="/" et-al-min="4" initialize-with=". "/>
<name form="short" delimiter="/" initialize-with=". "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -146,12 +146,12 @@
<choose>
<if variable="author">
<names variable="author">
<name form="short" delimiter=" &#8211; " et-al-min="3" et-al-use-first="1"/>
<name form="short" delimiter=" &#8211; "/>
</names>
</if>
<else-if variable="editor">
<names variable="editor">
<name form="short" delimiter=" &#8211; " et-al-min="3" et-al-use-first="1"/>
<name form="short" delimiter=" &#8211; "/>
</names>
</else-if>
<else>
@@ -45,7 +45,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" et-al-min="3" et-al-use-first="1"/>
<name form="short"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -34,7 +34,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" initialize-with=". "/>
<name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
@@ -145,7 +145,7 @@
</else-if>
</choose>
</macro>
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" et-al-subsequent-min="4" et-al-subsequent-use-first="1">
<layout prefix="(" suffix=")" delimiter="&#160;; ">
<group delimiter=", ">
<text macro="author-short"/>
@@ -31,7 +31,7 @@
</locale>
<macro name="author">
<names variable="author">
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" "/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
@@ -42,7 +42,7 @@
</macro>
<macro name="author-last-names">
<names variable="author">
<name form="short" et-al-min="7" et-al-use-first="5"/>
<name form="short"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
@@ -52,7 +52,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" suffix=" " plural="never"/>
<name initialize-with="" delimiter=", " et-al-min="7" et-al-use-first="5"/>
<name initialize-with="" delimiter=", "/>
</names>
</macro>
<macro name="year-date">
@@ -246,7 +246,7 @@
<text variable="citation-number"/>
</layout>
</citation>
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2">
<bibliography entry-spacing="0" second-field-align="flush" line-spacing="2" et-al-min="7" et-al-use-first="5">
<sort>
<key macro="author" names-min="2" names-use-first="1" names-use-last="false"/>
<key macro="author-last-names"/>
@@ -61,7 +61,7 @@
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" initialize-with="."/>
<name form="short" and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with="."/>
<et-al font-style="italic"/>
<substitute>
<names variable="editor"/>
@@ -124,7 +124,7 @@
</group>
</macro>
<!-- in-line citation: (author, date) -->
<citation disambiguate-add-year-suffix="true" collapse="year">
<citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="4" et-al-use-first="1">
<sort>
<key variable="author"/>
<key variable="issued"/>

0 comments on commit 69304f7

Please sign in to comment.
You can’t perform that action at this time.