From 40855c4fd758a9e8fd017ce675c280b547439a0a Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 13:57:51 -0500
Subject: [PATCH 1/6] Fix affixes on et-al

---
 afro-asia.csl                         | 12 ++++-----
 antiquites-africaines.csl             |  8 +++---
 szociologiai-szemle.csl               |  4 +--
 universitat-basel-iberoromanistik.csl | 39 +++++++++++++++------------
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/afro-asia.csl b/afro-asia.csl
index a4994d148155..17044b87c1c3 100644
--- a/afro-asia.csl
+++ b/afro-asia.csl
@@ -147,7 +147,7 @@
   <macro name="producers">
     <names variable="author">
       <name form="long" sort-separator=", "/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers"/>
       </substitute>
@@ -156,7 +156,7 @@
   <macro name="producers-short">
     <names variable="author">
       <name form="short"/>
-      <et-al term="et-al" prefix=" " suffix="." font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers-short"/>
       </substitute>
@@ -168,7 +168,7 @@
       <name form="long" name-as-sort-order="all" sort-separator=", ">
         <name-part name="family" text-case="uppercase"/>
       </name>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <substitute>
         <text macro="container-producers-surname"/>
       </substitute>
@@ -178,7 +178,7 @@
   <macro name="container-producers">
     <names variable="editor">
       <name form="long" sort-separator=", "/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="container-author"/>
@@ -188,7 +188,7 @@
   <macro name="container-producers-short">
     <names variable="editor">
       <name form="short"/>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="container-author"/>
@@ -201,7 +201,7 @@
       <name form="long" name-as-sort-order="all" sort-separator=", ">
         <name-part name="family" text-case="uppercase"/>
       </name>
-      <et-al term="et-al" prefix=" " font-style="italic"/>
+      <et-al term="et-al" font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="container-author"/>
diff --git a/antiquites-africaines.csl b/antiquites-africaines.csl
index 32d4978529c1..743bbce5935d 100644
--- a/antiquites-africaines.csl
+++ b/antiquites-africaines.csl
@@ -64,7 +64,7 @@
           <name form="short">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
           <substitute>
             <names variable="editor"/>
             <names variable="translator"/>
@@ -85,7 +85,7 @@
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <label form="short" prefix=", " suffix=". " text-case="uppercase" strip-periods="true"/>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </if>
       <else-if variable="editor">
@@ -93,7 +93,7 @@
           <name form="short" et-al-min="3" et-al-use-first="1">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </else-if>
       <else-if variable="collection-editor">
@@ -101,7 +101,7 @@
           <name form="short" et-al-min="3" et-al-use-first="1">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </else-if>
       <else-if type="book">
diff --git a/szociologiai-szemle.csl b/szociologiai-szemle.csl
index e209c7c01f6f..520e80126d3b 100644
--- a/szociologiai-szemle.csl
+++ b/szociologiai-szemle.csl
@@ -27,7 +27,7 @@
       <term name="from">Elérhető</term>
       <term name="accessed">Letöltve</term>
       <term name="and">&#8211;</term>
-      <term name="et-al"> et al.</term>
+      <term name="et-al">et al.</term>
     </terms>
   </locale>
   <macro name="container-contributors">
@@ -58,7 +58,7 @@
     <names variable="author" delimiter="&#8211;">
       <name delimiter=" &#8211; " delimiter-precedes-et-al="always" delimiter-precedes-last="always" et-al-use-last="true" initialize-with=". " name-as-sort-order="all"/>
       <label form="short" text-case="lowercase" prefix=" (" suffix=")."/>
-      <et-al prefix=" " font-style="italic"/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor" delimiter=" &#8211; "/>
         <names variable="translator" delimiter=" &#8211; "/>
diff --git a/universitat-basel-iberoromanistik.csl b/universitat-basel-iberoromanistik.csl
index 2d25c497db89..0eaea643896e 100644
--- a/universitat-basel-iberoromanistik.csl
+++ b/universitat-basel-iberoromanistik.csl
@@ -26,9 +26,9 @@
     <choose>
       <if type="book" match="any">
         <names variable="translator" delimiter="/" prefix="[" suffix="]">
-          <label form="short" suffix=" "/>
+          <label form="short"/>
           <name delimiter=" / " delimiter-precedes-last="always"/>
-          <et-al prefix=" (" suffix=") " font-style="italic"/>
+          <et-al font-style="italic"/>
         </names>
       </if>
     </choose>
@@ -36,16 +36,16 @@
   <macro name="editor">
     <choose>
       <if type="chapter article-journal paper-conference" match="any">
-        <names variable="editor" delimiter=" / " suffix=":">
+        <names variable="editor" delimiter=" / ">
           <name delimiter=" / " delimiter-precedes-last="always" name-as-sort-order="all"/>
-          <et-al prefix=" (" suffix=") " font-style="italic"/>
-          <label form="short" prefix=" (" suffix=")"/>
+          <et-al font-style="italic"/>
+          <label form="short" prefix="(" suffix=")"/>
         </names>
       </if>
       <else>
         <names variable="editor" delimiter=" / ">
           <name name-as-sort-order="all" sort-separator=", " delimiter="/" delimiter-precedes-last="always" form="long"/>
-          <label form="short" prefix=" (" suffix=")"/>
+          <label form="short" prefix="(" suffix=")"/>
         </names>
       </else>
     </choose>
@@ -196,14 +196,17 @@
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text macro="editor"/>
+        
       </if>
     </choose>
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter=". " prefix=" " suffix=".">
-          <text variable="container-title" text-case="title" font-style="italic"/>
-          <text macro="number-of-volumes"/>
+        <group delimiter=": ">
+          <text macro="editor"/>
+          <group delimiter=". " suffix=".">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+            <text macro="number-of-volumes"/>
+          </group>
         </group>
       </if>
       <else-if type="webpage post-weblog" match="any">
@@ -252,17 +255,19 @@
     </sort>
     <layout suffix=".">
       <group delimiter=". ">
-        <group delimiter=" " suffix=".">
+        <group delimiter=" ">
           <text macro="author"/>
           <text macro="year-date" prefix="(" suffix="):"/>
           <text macro="title"/>
           <text macro="container-prefix"/>
-          <choose>
-            <if type="article-journal" match="all" variable="editor">
-              <text macro="editor"/>
-            </if>
-          </choose>
-          <text macro="container-title"/>
+          <group delimiter=": ">
+            <choose>
+              <if type="article-journal" match="all" variable="editor">
+                <text macro="editor"/>
+              </if>
+            </choose>
+            <text macro="container-title"/>
+          </group>
           <text macro="edition"/>
           <text macro="genre"/>
           <group delimiter=", " suffix=".">

From 07d74236d1c215dd46bc80e43d4ce99656bd1cdb Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 15:35:50 -0500
Subject: [PATCH 2/6] Revert non-et-al changes to
 universitat-basel-iberomanistik

---
 universitat-basel-iberoromanistik.csl | 35 ++++++++++++---------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/universitat-basel-iberoromanistik.csl b/universitat-basel-iberoromanistik.csl
index 0eaea643896e..1f62279ec147 100644
--- a/universitat-basel-iberoromanistik.csl
+++ b/universitat-basel-iberoromanistik.csl
@@ -26,7 +26,7 @@
     <choose>
       <if type="book" match="any">
         <names variable="translator" delimiter="/" prefix="[" suffix="]">
-          <label form="short"/>
+          <label form="short" suffix=" "/>
           <name delimiter=" / " delimiter-precedes-last="always"/>
           <et-al font-style="italic"/>
         </names>
@@ -36,16 +36,16 @@
   <macro name="editor">
     <choose>
       <if type="chapter article-journal paper-conference" match="any">
-        <names variable="editor" delimiter=" / ">
+        <names variable="editor" delimiter=" / " suffix=":">
           <name delimiter=" / " delimiter-precedes-last="always" name-as-sort-order="all"/>
           <et-al font-style="italic"/>
-          <label form="short" prefix="(" suffix=")"/>
+          <label form="short" prefix=" (" suffix=")"/>
         </names>
       </if>
       <else>
         <names variable="editor" delimiter=" / ">
           <name name-as-sort-order="all" sort-separator=", " delimiter="/" delimiter-precedes-last="always" form="long"/>
-          <label form="short" prefix="(" suffix=")"/>
+          <label form="short" prefix=" (" suffix=")"/>
         </names>
       </else>
     </choose>
@@ -196,17 +196,14 @@
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-        
+        <text macro="editor"/>
       </if>
     </choose>
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter=": ">
-          <text macro="editor"/>
-          <group delimiter=". " suffix=".">
-            <text variable="container-title" text-case="title" font-style="italic"/>
-            <text macro="number-of-volumes"/>
-          </group>
+        <group delimiter=". " prefix=" " suffix=".">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <text macro="number-of-volumes"/>
         </group>
       </if>
       <else-if type="webpage post-weblog" match="any">
@@ -255,19 +252,17 @@
     </sort>
     <layout suffix=".">
       <group delimiter=". ">
-        <group delimiter=" ">
+        <group delimiter=" " suffix=".">
           <text macro="author"/>
           <text macro="year-date" prefix="(" suffix="):"/>
           <text macro="title"/>
           <text macro="container-prefix"/>
-          <group delimiter=": ">
-            <choose>
-              <if type="article-journal" match="all" variable="editor">
-                <text macro="editor"/>
-              </if>
-            </choose>
-            <text macro="container-title"/>
-          </group>
+          <choose>
+            <if type="article-journal" match="all" variable="editor">
+              <text macro="editor"/>
+            </if>
+          </choose>
+          <text macro="container-title"/>
           <text macro="edition"/>
           <text macro="genre"/>
           <group delimiter=", " suffix=".">

From 03a94e46df9de49d452965eb281417b6fd7f3d60 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 16:07:19 -0500
Subject: [PATCH 3/6] Remove more et-al affixes

---
 archaeonautica.csl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/archaeonautica.csl b/archaeonautica.csl
index ed72eb87bf81..5954a1d8c7f5 100644
--- a/archaeonautica.csl
+++ b/archaeonautica.csl
@@ -60,7 +60,7 @@
           <name form="short">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
           <substitute>
             <names variable="editor"/>
             <names variable="translator"/>
@@ -81,7 +81,7 @@
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <label form="short" prefix=", " suffix=". " text-case="uppercase" strip-periods="true"/>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </if>
       <else-if variable="editor">
@@ -89,7 +89,7 @@
           <name form="long" name-as-sort-order="all" initialize-with=". " sort-separator=" ">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </else-if>
       <else-if variable="collection-editor">
@@ -97,7 +97,7 @@
           <name form="long" name-as-sort-order="all" initialize-with=". " sort-separator=" ">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <et-al font-style="italic" suffix=" "/>
+          <et-al font-style="italic"/>
         </names>
       </else-if>
       <else-if type="book map graphic report entry-dictionary entry-encyclopedia chapter speech paper-conference article-journal article-magazine article-newspaper">

From be96bd802d4760d824d9cdeb97958c98600fa1e2 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 16:12:59 -0500
Subject: [PATCH 4/6] Remove et-al affixes from bibliotecae-it.csl

Needed a redefinition of term
---
 bibliothecae-it.csl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bibliothecae-it.csl b/bibliothecae-it.csl
index 0b58506c5eaf..450b65f0844f 100644
--- a/bibliothecae-it.csl
+++ b/bibliothecae-it.csl
@@ -24,12 +24,12 @@
       </term>
       <term name="and others"/>
       <term name="letter" form="short">lettera</term>
+      <term name="et-al">[et al.]</term>
     </terms>
   </locale>
   <macro name="responsibility">
     <names variable="author">
       <name delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3"/>
-      <et-al prefix=" [" suffix="]"/>
       <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -41,7 +41,7 @@
   <macro name="author-citation">
     <names variable="author">
       <name form="short" delimiter=" - " et-al-min="2" et-al-use-first="1"/>
-      <et-al term="and others" prefix=" [" suffix="]"/>
+      <et-al term="and others"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>

From 06038a7f3eb700ec95efee53d241db64d219936f Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 16:37:21 -0500
Subject: [PATCH 5/6] Remove et-al affixes

---
 embnet-journal.csl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/embnet-journal.csl b/embnet-journal.csl
index d53b8d01939e..0d54e7115e16 100644
--- a/embnet-journal.csl
+++ b/embnet-journal.csl
@@ -21,14 +21,14 @@
     <names variable="editor">
       <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=""/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-      <et-al suffix="." font-style="italic"/>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
       <name and="text" et-al-min="6" et-al-use-first="5" name-as-sort-order="all" sort-separator=" "/>
       <label form="short" prefix=" "/>
-      <et-al suffix="." font-style="italic"/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <text variable="title"/>

From bb1194253a644c8b4ab2596c778fabec5b831032 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 23 Dec 2021 16:41:03 -0500
Subject: [PATCH 6/6] Remove superfluous 'container' data from wiley-vch-books

---
 wiley-vch-books.csl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiley-vch-books.csl b/wiley-vch-books.csl
index e0b0e4d0c961..f1ac1b07a457 100644
--- a/wiley-vch-books.csl
+++ b/wiley-vch-books.csl
@@ -65,7 +65,7 @@
       <text variable="citation-number" suffix="."/>
       <text macro="authors"/>
       <choose>
-        <if match="all" is-uncertain-date="issued accessed original-date container">
+        <if match="all" is-uncertain-date="issued accessed original-date">
           <text term="in press" prefix=" (" suffix=")"/>
         </if>
         <else>