Merge pull request #5800 from citation-style-language/validation-fixes

JabRef · Dec 24, 2021 · 02080ce · 02080ce
2 parents 8b51d85 + bb11942
commit 02080ce
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git 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
@@ -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,23 +85,23 @@
             <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">
         <names variable="editor">
           <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">
         <names variable="collection-editor">
           <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/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,23 +81,23 @@
             <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">
         <names variable="editor">
           <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">
         <names variable="collection-editor">
           <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">

diff --git 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"/>

diff --git 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"/>

diff --git 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
@@ -28,7 +28,7 @@
         <names variable="translator" delimiter="/" prefix="[" suffix="]">
           <label form="short" suffix=" "/>
           <name delimiter=" / " delimiter-precedes-last="always"/>
-          <et-al prefix=" (" suffix=") " font-style="italic"/>
+          <et-al font-style="italic"/>
         </names>
       </if>
     </choose>
@@ -38,7 +38,7 @@
       <if type="chapter article-journal paper-conference" match="any">
         <names variable="editor" delimiter=" / " suffix=":">
           <name delimiter=" / " delimiter-precedes-last="always" name-as-sort-order="all"/>
-          <et-al prefix=" (" suffix=") " font-style="italic"/>
+          <et-al font-style="italic"/>
           <label form="short" prefix=" (" suffix=")"/>
         </names>
       </if>

diff --git 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>