Skip to content

Commit

Permalink
APA: in-text title in title-case (#4725)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwiernik
bwiernik authored Apr 23, 2020
1 parent 88c68d2 commit b2c0c1e
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 79 deletions.
26 changes: 13 additions & 13 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
<text macro="patent-number"/>
</if>
<else-if type="treaty">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if type="personal_communication">
<choose>
Expand All @@ -344,7 +344,7 @@
<names variable="author">
<name and="symbol" delimiter=", " initialize-with=". "/>
<substitute>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</substitute>
</names>
<!-- This should be localized -->
Expand All @@ -359,10 +359,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -380,10 +380,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -401,7 +401,7 @@
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<names variable="translator"/>
Expand All @@ -420,16 +420,16 @@
<text variable="title" font-style="italic"/>
</else-if>
<else-if type="bill legislation" match="any">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if variable="reviewed-author" type="review review-book" match="any">
<text macro="format-short" prefix="[" suffix="]"/>
</else-if>
<else-if type="post post-weblog webpage" variable="container-title" match="any">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else-if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand Down Expand Up @@ -691,20 +691,20 @@
<!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
<group delimiter=", ">
<text variable="genre" text-case="capitalize-first"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</if>
<else>
<!-- This should be localized -->
<group delimiter=" ">
<text value="Review of"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</else>
</choose>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else>
</choose>
</if>
Expand Down
16 changes: 8 additions & 8 deletions apa-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,13 @@
<text macro="bracketed-intext" prefix="[" suffix="]"/>
</if>
<else-if type="bill">
<!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
<!-- If a bill has no number or container-title, assume it is a hearing; italic -->
<choose>
<if variable="number container-title" match="none">
<text variable="title" form="short" font-style="italic" text-case="title"/>
</if>
<else-if variable="title">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else>
<group delimiter=" ">
Expand All @@ -491,18 +491,18 @@
</else-if>
<else-if type="legislation treaty" match="any">
<!-- Legislation and treaties not italicized or quoted -->
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title" />
</else-if>
<else-if type="post webpage" match="any">
<!-- Webpages are always italicized -->
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title" />
</else-if>
<else-if variable="container-title" match="any">
<!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" quotes="true" text-case="title" />
</else-if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title" />
</else>
</choose>
</macro>
Expand Down Expand Up @@ -1127,11 +1127,11 @@
<choose>
<if variable="reviewed-title">
<!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
<text variable="reviewed-title" form="short" font-style="italic"/>
<text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
</if>
<else>
<!-- Assume title is title of reviewed work -->
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title"/>
</else>
</choose>
</macro>
Expand Down
16 changes: 8 additions & 8 deletions apa-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,13 @@
<text macro="bracketed-intext" prefix="[" suffix="]"/>
</if>
<else-if type="bill">
<!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
<!-- If a bill has no number or container-title, assume it is a hearing; italic -->
<choose>
<if variable="number container-title" match="none">
<text variable="title" form="short" font-style="italic" text-case="title"/>
</if>
<else-if variable="title">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else>
<group delimiter=" ">
Expand All @@ -491,18 +491,18 @@
</else-if>
<else-if type="legislation treaty" match="any">
<!-- Legislation and treaties not italicized or quoted -->
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title" />
</else-if>
<else-if type="post webpage" match="any">
<!-- Webpages are always italicized -->
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title" />
</else-if>
<else-if variable="container-title" match="any">
<!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" quotes="true" text-case="title" />
</else-if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title" />
</else>
</choose>
</macro>
Expand Down Expand Up @@ -1127,11 +1127,11 @@
<choose>
<if variable="reviewed-title">
<!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
<text variable="reviewed-title" form="short" font-style="italic"/>
<text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
</if>
<else>
<!-- Assume title is title of reviewed work -->
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" font-style="italic" text-case="title"/>
</else>
</choose>
</macro>
Expand Down
26 changes: 13 additions & 13 deletions apa-no-doi-no-issue.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<text macro="patent-number"/>
</if>
<else-if type="treaty">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if type="personal_communication">
<choose>
Expand All @@ -345,7 +345,7 @@
<names variable="author">
<name and="symbol" delimiter=", " initialize-with=". "/>
<substitute>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</substitute>
</names>
<!-- This should be localized -->
Expand All @@ -360,10 +360,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -381,10 +381,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -402,7 +402,7 @@
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<names variable="translator"/>
Expand All @@ -421,16 +421,16 @@
<text variable="title" font-style="italic"/>
</else-if>
<else-if type="bill legislation" match="any">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if variable="reviewed-author" type="review review-book" match="any">
<text macro="format-short" prefix="[" suffix="]"/>
</else-if>
<else-if type="post post-weblog webpage" variable="container-title" match="any">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else-if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand Down Expand Up @@ -706,20 +706,20 @@
<!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
<group delimiter=", ">
<text variable="genre" text-case="capitalize-first"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</if>
<else>
<!-- This should be localized -->
<group delimiter=" ">
<text value="Review of"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</else>
</choose>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else>
</choose>
</if>
Expand Down
26 changes: 13 additions & 13 deletions apa-old-doi-prefix.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<text macro="patent-number"/>
</if>
<else-if type="treaty">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if type="personal_communication">
<choose>
Expand All @@ -345,7 +345,7 @@
<names variable="author">
<name and="symbol" delimiter=", " initialize-with=". "/>
<substitute>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</substitute>
</names>
<!-- This should be localized -->
Expand All @@ -360,10 +360,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -381,10 +381,10 @@
<names variable="translator"/>
<choose>
<if variable="container-title">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand All @@ -402,7 +402,7 @@
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
<names variable="translator"/>
Expand All @@ -421,16 +421,16 @@
<text variable="title" font-style="italic"/>
</else-if>
<else-if type="bill legislation" match="any">
<text variable="title" form="short"/>
<text variable="title" form="short" text-case="title"/>
</else-if>
<else-if variable="reviewed-author" type="review review-book" match="any">
<text macro="format-short" prefix="[" suffix="]"/>
</else-if>
<else-if type="post post-weblog webpage" variable="container-title" match="any">
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else-if>
<else>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</else>
</choose>
<text macro="format-short" prefix="[" suffix="]"/>
Expand Down Expand Up @@ -692,20 +692,20 @@
<!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
<group delimiter=", ">
<text variable="genre" text-case="capitalize-first"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</if>
<else>
<!-- This should be localized -->
<group delimiter=" ">
<text value="Review of"/>
<text variable="title" form="short" font-style="italic"/>
<text variable="title" form="short" text-case="title" font-style="italic"/>
</group>
</else>
</choose>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
<text variable="title" form="short" text-case="title" quotes="true"/>
</else>
</choose>
</if>
Expand Down
Loading

0 comments on commit b2c0c1e

Please sign in to comment.