From c750b6e69ae229823d34f57794744d129677bcee Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:07:54 -0400
Subject: [PATCH] APA: Put conditional event-title logic in a macro (#6161)

* APA: `event-title` and conditional `event`

To handle Zotero's updated data model

* Update other APA styles with event-title

* APA: Put conditional event-title logic in a macro
---
 apa-5th-edition.csl                  | 22 ++++++++++++++++++----
 apa-6th-edition-no-ampersand.csl     | 25 +++++++++++++++----------
 apa-6th-edition.csl                  | 25 +++++++++++++++----------
 apa-annotated-bibliography.csl       | 25 +++++++++++++++----------
 apa-cv.csl                           | 25 +++++++++++++++----------
 apa-fr-provost.csl                   | 22 ++++++++++++++++++----
 apa-no-ampersand.csl                 | 25 +++++++++++++++----------
 apa-no-doi-no-issue.csl              | 25 +++++++++++++++----------
 apa-no-initials.csl                  | 25 +++++++++++++++----------
 apa-numeric-superscript-brackets.csl | 25 +++++++++++++++----------
 apa-numeric-superscript.csl          | 25 +++++++++++++++----------
 apa-old-doi-prefix.csl               | 25 +++++++++++++++----------
 apa-single-spaced.csl                | 25 +++++++++++++++----------
 apa-tr.csl                           | 22 ++++++++++++++++++----
 apa-with-abstract.csl                | 25 +++++++++++++++----------
 apa.csl                              | 25 +++++++++++++++----------
 16 files changed, 249 insertions(+), 142 deletions(-)

diff --git a/apa-5th-edition.csl b/apa-5th-edition.csl
index a2784ca4b5bc..87cc83196a39 100644
--- a/apa-5th-edition.csl
+++ b/apa-5th-edition.csl
@@ -183,7 +183,7 @@
       </else-if>
       <else>
         <choose>
-          <if variable="event" match="none">
+          <if variable="event event-title" match="none">
             <text variable="genre" suffix=", "/>
           </if>
         </choose>
@@ -196,23 +196,37 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <choose>
           <if variable="genre" match="none">
             <text term="presented at" text-case="capitalize-first" suffix=" "/>
-            <text variable="event"/>
+            <text macro="event-title"/>
           </if>
           <else>
             <group delimiter=" ">
               <text variable="genre" text-case="capitalize-first"/>
               <text term="presented at"/>
-              <text variable="event"/>
+              <text macro="event-title"/>
             </group>
           </else>
         </choose>
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if variable="issued">
diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index d0f5ffdfd180..ff55b46b98db 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -917,16 +917,7 @@
                       </else>
                     </choose>
                     <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"/>
-                        </else>
-                      </choose>
+                      <text macro="event-title"/>
                       <text variable="event-place"/>
                     </group>
                   </group>
@@ -938,6 +929,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 1c515b4c2f14..851a3096ab03 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -916,16 +916,7 @@
                       </else>
                     </choose>
                     <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"/>
-                        </else>
-                      </choose>
+                      <text macro="event-title"/>
                       <text variable="event-place"/>
                     </group>
                   </group>
@@ -937,6 +928,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index a2bbdf461be8..0636d93db589 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -1559,16 +1559,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1576,6 +1567,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-cv.csl b/apa-cv.csl
index ef4a89a059a0..228ad3ee8820 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -1306,16 +1306,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1323,6 +1314,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-fr-provost.csl b/apa-fr-provost.csl
index 4b068cf752d3..9e7928dca71f 100644
--- a/apa-fr-provost.csl
+++ b/apa-fr-provost.csl
@@ -245,7 +245,7 @@
       <else-if type="map post-weblog post" match="none">
         <group delimiter=", ">
           <choose>
-            <if variable="event" match="none">
+            <if variable="event event-title" match="none">
               <text variable="genre" prefix="[" suffix="]"/>
             </if>
           </choose>
@@ -298,17 +298,17 @@
     <choose>
       <if variable="container-title" match="none">
         <choose>
-          <if variable="event">
+          <if variable="event event-title" match="any">
             <choose>
               <if variable="genre" match="none">
                 <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
+                <text macro="event-title"/>
               </if>
               <else>
                 <group delimiter=" ">
                   <text variable="genre" text-case="capitalize-first"/>
                   <text term="presented at"/>
-                  <text variable="event"/>
+                  <text macro="event-title"/>
                 </group>
               </else>
             </choose>
@@ -317,6 +317,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="extra">
     <choose>
       <if type="manuscript">
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 691c2e0e0a5d..5759e34ec4ab 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -1559,16 +1559,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1576,6 +1567,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index dfc139f11311..c72c8bdf126a 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -923,16 +923,7 @@
                       </else>
                     </choose>
                     <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"/>
-                        </else>
-                      </choose>
+                      <text macro="event-title"/>
                       <text variable="event-place"/>
                     </group>
                   </group>
@@ -944,6 +935,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
diff --git a/apa-no-initials.csl b/apa-no-initials.csl
index d2fbff38b124..4695cd9b6fb8 100644
--- a/apa-no-initials.csl
+++ b/apa-no-initials.csl
@@ -1559,16 +1559,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1576,6 +1567,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index 79a204839fd3..ba3dadf6d201 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -1362,16 +1362,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1379,6 +1370,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index 067bcaf0c17c..1ed0ae88b7ce 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -1362,16 +1362,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1379,6 +1370,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index bdb2d87a4aed..cdfaa73a4512 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -917,16 +917,7 @@
                       </else>
                     </choose>
                     <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"/>
-                        </else>
-                      </choose>
+                      <text macro="event-title"/>
                       <text variable="event-place"/>
                     </group>
                   </group>
@@ -938,6 +929,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index 0abe741b45f8..ff224f6a4059 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -1559,16 +1559,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1576,6 +1567,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa-tr.csl b/apa-tr.csl
index 557066dafd84..d17be7709852 100644
--- a/apa-tr.csl
+++ b/apa-tr.csl
@@ -223,7 +223,7 @@
       <else>
         <group delimiter=", ">
           <choose>
-            <if variable="event" match="none">
+            <if variable="event event-title" match="none">
               <text variable="genre"/>
             </if>
           </choose>
@@ -241,15 +241,15 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <choose>
           <if variable="genre" match="none">
-            <text variable="event"/>
+            <text macro="event-title"/>
             <text term="presented at" prefix=", "/>
           </if>
           <else>
             <group delimiter=" ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="genre"/>
             </group>
           </else>
@@ -257,6 +257,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="issued">
     <choose>
       <if type="bill legal_case legislation" match="none">
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 981dd8be4c67..25d185866bff 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -1559,16 +1559,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1576,6 +1567,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
diff --git a/apa.csl b/apa.csl
index bd45e65e9144..0fd6bd71a5e9 100644
--- a/apa.csl
+++ b/apa.csl
@@ -1560,16 +1560,7 @@
           <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"/>
-                </else>
-              </choose>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1577,6 +1568,20 @@
       </if>
     </choose>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>