Skip to content

Commit 0dab651

Browse files
bwiernikbwiernik
authored
Add event-title to other APA styles (#6153)
1 parent 698cf1c commit 0dab651

12 files changed

+210
-150
lines changed

‎apa-6th-edition-no-ampersand.csl

+11-2
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,16 @@
913913
</else>
914914
</choose>
915915
<group delimiter=", ">
916-
<text variable="event"/>
916+
<choose>
917+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
918+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
919+
<if variable="event-title">
920+
<text variable="event-title"/>
921+
</if>
922+
<else>
923+
<text variable="event"/>
924+
</else>
925+
</choose>
917926
<text variable="event-place"/>
918927
</group>
919928
</group>
@@ -1401,7 +1410,7 @@
14011410
<group prefix="(" suffix=")">
14021411
<choose>
14031412
<if variable="references">
1404-
<!-- This provides the option for more elaborate description
1413+
<!-- This provides the option for more elaborate description
14051414
of publication history, such as full "reprinted" references
14061415
(example 26) or retracted references -->
14071416
<text variable="references"/>

‎apa-6th-edition.csl

+11-2
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,16 @@
912912
</else>
913913
</choose>
914914
<group delimiter=", ">
915-
<text variable="event"/>
915+
<choose>
916+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
917+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
918+
<if variable="event-title">
919+
<text variable="event-title"/>
920+
</if>
921+
<else>
922+
<text variable="event"/>
923+
</else>
924+
</choose>
916925
<text variable="event-place"/>
917926
</group>
918927
</group>
@@ -1400,7 +1409,7 @@
14001409
<group prefix="(" suffix=")">
14011410
<choose>
14021411
<if variable="references">
1403-
<!-- This provides the option for more elaborate description
1412+
<!-- This provides the option for more elaborate description
14041413
of publication history, such as full "reprinted" references
14051414
(example 26) or retracted references -->
14061415
<text variable="references"/>

‎apa-annotated-bibliography.csl

+21-18
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@
320320
<!-- General categories of item types:
321321
Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
322322
Periodical or Booklike: paper-conference
323-
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324-
graphic interview manuscript map motion_picture musical_score pamphlet patent
323+
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324+
graphic interview manuscript map motion_picture musical_score pamphlet patent
325325
personal_communication report song speech thesis post webpage
326326
Legal: bill legal_case legislation treaty
327327
-->
@@ -389,7 +389,7 @@
389389
</if>
390390
<else-if type="interview personal_communication" match="any">
391391
<choose>
392-
<!-- These variables indicate that the letter is retrievable by the reader.
392+
<!-- These variables indicate that the letter is retrievable by the reader.
393393
If not, then use the APA in-text-only personal communication format -->
394394
<if variable="archive container-title DOI publisher URL" match="none">
395395
<group delimiter=", ">
@@ -470,7 +470,7 @@
470470
</if>
471471
</choose>
472472
</else-if>
473-
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
473+
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
474474
manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
475475
</choose>
476476
</if>
@@ -529,7 +529,7 @@
529529
<if type="interview personal_communication" match="any">
530530
<choose>
531531
<if variable="archive container-title DOI publisher URL" match="none">
532-
<!-- These variables indicate that the communication is retrievable by the reader.
532+
<!-- These variables indicate that the communication is retrievable by the reader.
533533
If not, then use the in-text-only personal communication format -->
534534
<date variable="issued" form="text"/>
535535
</if>
@@ -1294,7 +1294,7 @@
12941294
<macro name="reviewed-title">
12951295
<choose>
12961296
<if variable="reviewed-title">
1297-
<!-- Not possible to distinguish TV series episode from other reviewed
1297+
<!-- Not possible to distinguish TV series episode from other reviewed
12981298
works [Ex. 69] -->
12991299
<text variable="reviewed-title" font-style="italic"/>
13001300
</if>
@@ -1552,18 +1552,21 @@
15521552
</macro>
15531553
<macro name="event">
15541554
<choose>
1555-
<if variable="event">
1556-
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
1557-
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
1558-
<choose>
1559-
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1560-
<!-- Don't print event info if published in a proceedings -->
1561-
<group delimiter=", ">
1555+
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1556+
<!-- Don't print event info if published in a proceedings -->
1557+
<group delimiter=", ">
1558+
<choose>
1559+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1560+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1561+
<if variable="event-title">
1562+
<text variable="event-title"/>
1563+
</if>
1564+
<else>
15621565
<text variable="event"/>
1563-
<text variable="event-place"/>
1564-
</group>
1565-
</if>
1566-
</choose>
1566+
</else>
1567+
</choose>
1568+
<text variable="event-place"/>
1569+
</group>
15671570
</if>
15681571
</choose>
15691572
</macro>
@@ -1574,7 +1577,7 @@
15741577
<group prefix="(" suffix=")">
15751578
<choose>
15761579
<if variable="references">
1577-
<!-- This provides the option for more elaborate description
1580+
<!-- This provides the option for more elaborate description
15781581
of publication history, such as full "reprinted" references
15791582
(examples 11, 43, 44) or retracted references -->
15801583
<text variable="references"/>

‎apa-cv.csl

+19-16
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@
320320
<!-- General categories of item types:
321321
Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
322322
Periodical or Booklike: paper-conference
323-
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324-
graphic interview manuscript map motion_picture musical_score pamphlet patent
323+
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324+
graphic interview manuscript map motion_picture musical_score pamphlet patent
325325
personal_communication report song speech thesis post webpage
326326
Legal: bill legal_case legislation treaty
327327
-->
@@ -415,7 +415,7 @@
415415
</if>
416416
</choose>
417417
</else-if>
418-
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
418+
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
419419
manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
420420
</choose>
421421
</if>
@@ -1085,7 +1085,7 @@
10851085
<macro name="reviewed-title">
10861086
<choose>
10871087
<if variable="reviewed-title">
1088-
<!-- Not possible to distinguish TV series episode from other reviewed
1088+
<!-- Not possible to distinguish TV series episode from other reviewed
10891089
works [Ex. 69] -->
10901090
<text variable="reviewed-title" font-style="italic"/>
10911091
</if>
@@ -1299,18 +1299,21 @@
12991299
</macro>
13001300
<macro name="event">
13011301
<choose>
1302-
<if variable="event">
1303-
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
1304-
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
1305-
<choose>
1306-
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1307-
<!-- Don't print event info if published in a proceedings -->
1308-
<group delimiter=", ">
1302+
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1303+
<!-- Don't print event info if published in a proceedings -->
1304+
<group delimiter=", ">
1305+
<choose>
1306+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1307+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1308+
<if variable="event-title">
1309+
<text variable="event-title"/>
1310+
</if>
1311+
<else>
13091312
<text variable="event"/>
1310-
<text variable="event-place"/>
1311-
</group>
1312-
</if>
1313-
</choose>
1313+
</else>
1314+
</choose>
1315+
<text variable="event-place"/>
1316+
</group>
13141317
</if>
13151318
</choose>
13161319
</macro>
@@ -1321,7 +1324,7 @@
13211324
<group prefix="(" suffix=")">
13221325
<choose>
13231326
<if variable="references">
1324-
<!-- This provides the option for more elaborate description
1327+
<!-- This provides the option for more elaborate description
13251328
of publication history, such as full "reprinted" references
13261329
(examples 11, 43, 44) or retracted references -->
13271330
<text variable="references"/>

‎apa-no-ampersand.csl

+21-18
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@
320320
<!-- General categories of item types:
321321
Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
322322
Periodical or Booklike: paper-conference
323-
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324-
graphic interview manuscript map motion_picture musical_score pamphlet patent
323+
Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
324+
graphic interview manuscript map motion_picture musical_score pamphlet patent
325325
personal_communication report song speech thesis post webpage
326326
Legal: bill legal_case legislation treaty
327327
-->
@@ -389,7 +389,7 @@
389389
</if>
390390
<else-if type="interview personal_communication" match="any">
391391
<choose>
392-
<!-- These variables indicate that the letter is retrievable by the reader.
392+
<!-- These variables indicate that the letter is retrievable by the reader.
393393
If not, then use the APA in-text-only personal communication format -->
394394
<if variable="archive container-title DOI publisher URL" match="none">
395395
<group delimiter=", ">
@@ -470,7 +470,7 @@
470470
</if>
471471
</choose>
472472
</else-if>
473-
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
473+
<!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
474474
manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
475475
</choose>
476476
</if>
@@ -529,7 +529,7 @@
529529
<if type="interview personal_communication" match="any">
530530
<choose>
531531
<if variable="archive container-title DOI publisher URL" match="none">
532-
<!-- These variables indicate that the communication is retrievable by the reader.
532+
<!-- These variables indicate that the communication is retrievable by the reader.
533533
If not, then use the in-text-only personal communication format -->
534534
<date variable="issued" form="text"/>
535535
</if>
@@ -1294,7 +1294,7 @@
12941294
<macro name="reviewed-title">
12951295
<choose>
12961296
<if variable="reviewed-title">
1297-
<!-- Not possible to distinguish TV series episode from other reviewed
1297+
<!-- Not possible to distinguish TV series episode from other reviewed
12981298
works [Ex. 69] -->
12991299
<text variable="reviewed-title" font-style="italic"/>
13001300
</if>
@@ -1552,18 +1552,21 @@
15521552
</macro>
15531553
<macro name="event">
15541554
<choose>
1555-
<if variable="event">
1556-
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
1557-
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
1558-
<choose>
1559-
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1560-
<!-- Don't print event info if published in a proceedings -->
1561-
<group delimiter=", ">
1555+
<if variable="collection-editor editor editorial-director issue page volume" match="none">
1556+
<!-- Don't print event info if published in a proceedings -->
1557+
<group delimiter=", ">
1558+
<choose>
1559+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1560+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1561+
<if variable="event-title">
1562+
<text variable="event-title"/>
1563+
</if>
1564+
<else>
15621565
<text variable="event"/>
1563-
<text variable="event-place"/>
1564-
</group>
1565-
</if>
1566-
</choose>
1566+
</else>
1567+
</choose>
1568+
<text variable="event-place"/>
1569+
</group>
15671570
</if>
15681571
</choose>
15691572
</macro>
@@ -1574,7 +1577,7 @@
15741577
<group prefix="(" suffix=")">
15751578
<choose>
15761579
<if variable="references">
1577-
<!-- This provides the option for more elaborate description
1580+
<!-- This provides the option for more elaborate description
15781581
of publication history, such as full "reprinted" references
15791582
(examples 11, 43, 44) or retracted references -->
15801583
<text variable="references"/>

‎apa-no-doi-no-issue.csl

+11-2
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,16 @@
919919
</else>
920920
</choose>
921921
<group delimiter=", ">
922-
<text variable="event"/>
922+
<choose>
923+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
924+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
925+
<if variable="event-title">
926+
<text variable="event-title"/>
927+
</if>
928+
<else>
929+
<text variable="event"/>
930+
</else>
931+
</choose>
923932
<text variable="event-place"/>
924933
</group>
925934
</group>
@@ -1414,7 +1423,7 @@
14141423
<group prefix="(" suffix=")">
14151424
<choose>
14161425
<if variable="references">
1417-
<!-- This provides the option for more elaborate description
1426+
<!-- This provides the option for more elaborate description
14181427
of publication history, such as full "reprinted" references
14191428
(example 26) or retracted references -->
14201429
<text variable="references"/>

0 commit comments

Comments
 (0)