APA: event-title and conditional event (#6152)

To handle Zotero's updated data model

Author: bwiernik

apa.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>
@@ -530,7 +530,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>
@@ -1295,7 +1295,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>
@@ -1553,18 +1553,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>
@@ -1575,7 +1578,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"/>