Skip to content

Commit

Permalink
Fix affixes on et-al
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwiernik
bwiernik committed Dec 23, 2021
1 parent 408a3a8 commit 40855c4
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 29 deletions.
12 changes: 6 additions & 6 deletions afro-asia.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand Down
8 changes: 4 additions & 4 deletions antiquites-africaines.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions szociologiai-szemle.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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; "/>
Expand Down
39 changes: 22 additions & 17 deletions universitat-basel-iberoromanistik.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,26 @@
<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>
</macro>
<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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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=".">
Expand Down

0 comments on commit 40855c4

Please sign in to comment.