Skip to content

/styles

Permalink
Browse files

APA: use "et al." in German & Danish (#4066) 

Also fix some whitepace&indenting FYI @bwiernik
  • Loading branch information...
@adam3smith
adam3smith committed Apr 27, 2019
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
1 parent c7ad649 commit 47c232551d1757b6ff082bfeb48bbaa58ed427d0
Unified Split
Showing with 96 additions and 26 deletions.
  1. +13 −3 apa-annotated-bibliography.csl
  2. +13 −3 apa-cv.csl
  3. +13 −3 apa-no-ampersand.csl
  4. +13 −3 apa-no-doi-no-issue.csl
  5. +13 −3 apa-old-doi-prefix.csl
  6. +18 −8 apa-single-spaced.csl
  7. +13 −3 apa.csl
16 apa-annotated-bibliography.csl
View file
@@ -52,6 +52,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -767,7 +777,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -832,7 +842,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1255,7 +1265,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
16 apa-cv.csl
View file
@@ -52,6 +52,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -658,7 +668,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -723,7 +733,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1066,7 +1076,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
16 apa-no-ampersand.csl
View file
@@ -53,6 +53,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -768,7 +778,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -833,7 +843,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1256,7 +1266,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
16 apa-no-doi-no-issue.csl
View file
@@ -52,6 +52,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -781,7 +791,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -846,7 +856,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1276,7 +1286,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
16 apa-old-doi-prefix.csl
View file
@@ -52,6 +52,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -767,7 +777,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -832,7 +842,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1255,7 +1265,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
26 apa-single-spaced.csl
View file
@@ -52,6 +52,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -258,21 +268,21 @@
</choose>
<names variable="translator">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
</names>
</if>
</choose>
<names variable="editor translator" delimiter=", ">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
</names>
<names variable="editorial-director">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
</names>
<names variable="collection-editor">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
<label form="short" prefix=" (" suffix=")" text-case="title"/>
</names>
<choose>
<if type="report">
@@ -338,7 +348,7 @@
<names variable="original-author"/>
<names variable="author"/>
<names variable="translator"/>
<choose>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
</if>
@@ -767,7 +777,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -832,7 +842,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1255,7 +1265,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">
16 apa.csl
View file
@@ -51,6 +51,16 @@
<term name="from">de</term>
</terms>
</locale>
<locale xml:lang="de">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<locale xml:lang="da">
<terms>
<term name="et-al">et al.</term>
</terms>
</locale>
<macro name="container-contributors-booklike">
<choose>
<if variable="container-title">
@@ -766,7 +776,7 @@
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
@@ -831,7 +841,7 @@
</if>
</choose>
</if>
<else>
<else>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
@@ -1254,7 +1264,7 @@
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
<text macro="legal-cites"/>
</else-if>
</else-if>
</choose>
</macro>
<macro name="container-booklike">

0 comments on commit 47c2325

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