From 0dab65132a09f9e965dad9ff7627aa1e4d2bf61d Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Fri, 22 Jul 2022 20:14:43 -0400
Subject: [PATCH] Add event-title to other APA styles (#6153)

---
 apa-6th-edition-no-ampersand.csl     | 13 ++++++++--
 apa-6th-edition.csl                  | 13 ++++++++--
 apa-annotated-bibliography.csl       | 39 +++++++++++++++-------------
 apa-cv.csl                           | 35 +++++++++++++------------
 apa-no-ampersand.csl                 | 39 +++++++++++++++-------------
 apa-no-doi-no-issue.csl              | 13 ++++++++--
 apa-no-initials.csl                  | 39 +++++++++++++++-------------
 apa-numeric-superscript-brackets.csl | 39 +++++++++++++++-------------
 apa-numeric-superscript.csl          | 39 +++++++++++++++-------------
 apa-old-doi-prefix.csl               | 13 ++++++++--
 apa-single-spaced.csl                | 39 +++++++++++++++-------------
 apa-with-abstract.csl                | 39 +++++++++++++++-------------
 12 files changed, 210 insertions(+), 150 deletions(-)

diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index b0f618ec31fd..6f89a653b988 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -913,7 +913,16 @@
                   </else>
                 </choose>
                 <group delimiter=", ">
-                  <text variable="event"/>
+                  <choose>
+                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                    <if variable="event-title">
+                      <text variable="event-title"/>
+                    </if>
+                    <else>
+                      <text variable="event"/>
+                    </else>
+                  </choose>
                   <text variable="event-place"/>
                 </group>
               </group>
@@ -1401,7 +1410,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 775857accbe2..1b20359e2717 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -912,7 +912,16 @@
                   </else>
                 </choose>
                 <group delimiter=", ">
-                  <text variable="event"/>
+                  <choose>
+                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                    <if variable="event-title">
+                      <text variable="event-title"/>
+                    </if>
+                    <else>
+                      <text variable="event"/>
+                    </else>
+                  </choose>
                   <text variable="event-place"/>
                 </group>
               </group>
@@ -1400,7 +1409,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 014ae44f1625..bf0e3f36b8f8 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,18 +1552,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1574,7 +1577,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-cv.csl b/apa-cv.csl
index 5a766c3dc61a..0edf4f0f0691 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -415,7 +415,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -1085,7 +1085,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1299,18 +1299,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1321,7 +1324,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 446103abb69f..a2fcfa4a3174 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                             If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,18 +1552,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1574,7 +1577,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 08306362d766..168cb7deb329 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -919,7 +919,16 @@
                   </else>
                 </choose>
                 <group delimiter=", ">
-                  <text variable="event"/>
+                  <choose>
+                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                    <if variable="event-title">
+                      <text variable="event-title"/>
+                    </if>
+                    <else>
+                      <text variable="event"/>
+                    </else>
+                  </choose>
                   <text variable="event-place"/>
                 </group>
               </group>
@@ -1414,7 +1423,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/apa-no-initials.csl b/apa-no-initials.csl
index b8bcab11e794..49a20a72c0bf 100644
--- a/apa-no-initials.csl
+++ b/apa-no-initials.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,18 +1552,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1574,7 +1577,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index c6d3de36f821..d49ffa909ae1 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -123,8 +123,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -192,7 +192,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -273,7 +273,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -332,7 +332,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1097,7 +1097,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1355,18 +1355,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1377,7 +1380,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index 0a6af38540b1..1edc7a4af826 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -123,8 +123,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -192,7 +192,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -273,7 +273,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -332,7 +332,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1097,7 +1097,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1355,18 +1355,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1377,7 +1380,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 02ecfc75fac7..a98bb2cf9625 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -913,7 +913,16 @@
                   </else>
                 </choose>
                 <group delimiter=", ">
-                  <text variable="event"/>
+                  <choose>
+                    <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                        This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+                    <if variable="event-title">
+                      <text variable="event-title"/>
+                    </if>
+                    <else>
+                      <text variable="event"/>
+                    </else>
+                  </choose>
                   <text variable="event-place"/>
                 </group>
               </group>
@@ -1401,7 +1410,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index c2157cb296a1..8a9de386e032 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                             If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,18 +1552,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1574,7 +1577,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index ddff715c9d66..0fa4010a865d 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,18 +1552,21 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
-        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
-        <choose>
-          <if variable="collection-editor editor editorial-director issue page volume" match="none">
-            <!-- Don't print event info if published in a proceedings -->
-            <group delimiter=", ">
+      <if variable="collection-editor editor editorial-director issue page volume" match="none">
+        <!-- Don't print event info if published in a proceedings -->
+        <group delimiter=", ">
+          <choose>
+            <!-- We expect "event-title" to be used, but applications may not be updated yet.
+                 This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
+            <if variable="event-title">
+              <text variable="event-title"/>
+            </if>
+            <else>
               <text variable="event"/>
-              <text variable="event-place"/>
-            </group>
-          </if>
-        </choose>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -1574,7 +1577,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>