Migrate common name attributes upward (citation-style-language#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
figgie10 · Jul 1, 2018 · 69304f7 · 69304f7
1 parent 6640ef4
commit 69304f7
Show file tree

Hide file tree

Showing 36 changed files with 114 additions and 114 deletions.
diff --git a/acta-polytechnica.csl b/acta-polytechnica.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>

diff --git a/annual-review-of-astronomy-and-astrophysics.csl b/annual-review-of-astronomy-and-astrophysics.csl
@@ -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"/>

diff --git a/annual-review-of-medicine.csl b/annual-review-of-medicine.csl
@@ -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=". ">

diff --git a/annual-review-of-nuclear-and-particle-science.csl b/annual-review-of-nuclear-and-particle-science.csl
@@ -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=". ">

diff --git a/annual-reviews-alphabetical.csl b/annual-reviews-alphabetical.csl
@@ -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"/>

diff --git a/annual-reviews-author-date.csl b/annual-reviews-author-date.csl
@@ -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"/>

diff --git a/annual-reviews-without-titles.csl b/annual-reviews-without-titles.csl
@@ -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=". ">

diff --git a/annual-reviews.csl b/annual-reviews.csl
@@ -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=". ">

diff --git a/cahiers-du-centre-gustave-glotz.csl b/cahiers-du-centre-gustave-glotz.csl
@@ -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"/>

diff --git a/collections-electroniques-de-l-inha-author-date.csl b/collections-electroniques-de-l-inha-author-date.csl
@@ -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"/>

diff --git a/der-moderne-staat.csl b/der-moderne-staat.csl
@@ -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"/>

diff --git a/deutsches-archaologisches-institut.csl b/deutsches-archaologisches-institut.csl
@@ -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>

diff --git a/egretta.csl b/egretta.csl
@@ -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"/>

diff --git a/ets-ecole-de-technologie-superieure.csl b/ets-ecole-de-technologie-superieure.csl
@@ -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"/>

diff --git a/fine-focus.csl b/fine-focus.csl
@@ -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"/>

diff --git a/food-and-agriculture-organization-of-the-united-nations.csl b/food-and-agriculture-organization-of-the-united-nations.csl
@@ -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"/>