From b2c0c1e9b0fb42f58e3cf6f7d38ccc1083d1974e Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Wed, 22 Apr 2020 22:08:05 -0400
Subject: [PATCH] APA: in-text title in title-case (#4725)

---
 apa-6th-edition.csl            | 26 +++++++++++++-------------
 apa-annotated-bibliography.csl | 16 ++++++++--------
 apa-no-ampersand.csl           | 16 ++++++++--------
 apa-no-doi-no-issue.csl        | 26 +++++++++++++-------------
 apa-old-doi-prefix.csl         | 26 +++++++++++++-------------
 apa-single-spaced.csl          | 16 ++++++++--------
 apa-with-abstract.csl          | 16 ++++++++--------
 apa.csl                        | 16 ++++++++--------
 8 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index da2f966217b8..83c3b70cce64 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -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>
@@ -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 -->
@@ -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="]"/>
@@ -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="]"/>
@@ -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"/>
@@ -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="]"/>
@@ -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>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 5a1fdff33cbc..c35e3446a67a 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -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=" ">
@@ -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>
@@ -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>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 48a1c7ac76ec..bea8e85d779b 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -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=" ">
@@ -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>
@@ -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>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 3c1d12571ecc..b71c07b4aa7d 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -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>
@@ -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 -->
@@ -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="]"/>
@@ -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="]"/>
@@ -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"/>
@@ -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="]"/>
@@ -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>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 02bbbaf90d43..1bba65f00619 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -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>
@@ -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 -->
@@ -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="]"/>
@@ -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="]"/>
@@ -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"/>
@@ -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="]"/>
@@ -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>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index 7c902d8ee752..56b775bf8c24 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -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=" ">
@@ -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>
@@ -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>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 6c28d7f889a5..2b6c03d8575e 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -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=" ">
@@ -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>
@@ -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>
diff --git a/apa.csl b/apa.csl
index 284e56ca1ce2..0c788c2148bd 100644
--- a/apa.csl
+++ b/apa.csl
@@ -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=" ">
@@ -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>
@@ -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>