Skip to content

Commit e231ea3

Browse files
bwiernikbwiernik
authored
Bug fix for event regression (#6154)
* Bugfix: `event` check regression from 15655ab2493473dccd15d60f1d532e40ebe39e3e
1 parent 0dab651 commit e231ea3

13 files changed

+325
-247
lines changed

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

+34-28
Original file line numberDiff line numberDiff line change
@@ -897,36 +897,42 @@
897897
</macro>
898898
<macro name="event">
899899
<choose>
900-
<if variable="event" type="speech paper-conference" match="any">
900+
<if variable="event">
901+
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
902+
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
901903
<choose>
902-
<!-- Don't print event info if published in a proceedings -->
903-
<if variable="collection-editor editor issue page volume" match="none">
904-
<group delimiter=" ">
905-
<text variable="genre" text-case="capitalize-first"/>
906-
<group delimiter=" ">
907-
<choose>
908-
<if variable="genre">
909-
<text term="presented at"/>
910-
</if>
911-
<else>
912-
<text term="presented at" text-case="capitalize-first"/>
913-
</else>
914-
</choose>
915-
<group delimiter=", ">
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>
926-
<text variable="event-place"/>
904+
<if variable="event" type="speech paper-conference" match="any">
905+
<choose>
906+
<!-- Don't print event info if published in a proceedings -->
907+
<if variable="collection-editor editor issue page volume" match="none">
908+
<group delimiter=" ">
909+
<text variable="genre" text-case="capitalize-first"/>
910+
<group delimiter=" ">
911+
<choose>
912+
<if variable="genre">
913+
<text term="presented at"/>
914+
</if>
915+
<else>
916+
<text term="presented at" text-case="capitalize-first"/>
917+
</else>
918+
</choose>
919+
<group delimiter=", ">
920+
<choose>
921+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
922+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
923+
<if variable="event-title">
924+
<text variable="event-title"/>
925+
</if>
926+
<else>
927+
<text variable="event"/>
928+
</else>
929+
</choose>
930+
<text variable="event-place"/>
931+
</group>
932+
</group>
927933
</group>
928-
</group>
929-
</group>
934+
</if>
935+
</choose>
930936
</if>
931937
</choose>
932938
</if>

‎apa-6th-edition.csl

+34-28
Original file line numberDiff line numberDiff line change
@@ -896,36 +896,42 @@
896896
</macro>
897897
<macro name="event">
898898
<choose>
899-
<if variable="event" type="speech paper-conference" match="any">
899+
<if variable="event">
900+
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
901+
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
900902
<choose>
901-
<!-- Don't print event info if published in a proceedings -->
902-
<if variable="collection-editor editor issue page volume" match="none">
903-
<group delimiter=" ">
904-
<text variable="genre" text-case="capitalize-first"/>
905-
<group delimiter=" ">
906-
<choose>
907-
<if variable="genre">
908-
<text term="presented at"/>
909-
</if>
910-
<else>
911-
<text term="presented at" text-case="capitalize-first"/>
912-
</else>
913-
</choose>
914-
<group delimiter=", ">
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>
925-
<text variable="event-place"/>
903+
<if variable="event" type="speech paper-conference" match="any">
904+
<choose>
905+
<!-- Don't print event info if published in a proceedings -->
906+
<if variable="collection-editor editor issue page volume" match="none">
907+
<group delimiter=" ">
908+
<text variable="genre" text-case="capitalize-first"/>
909+
<group delimiter=" ">
910+
<choose>
911+
<if variable="genre">
912+
<text term="presented at"/>
913+
</if>
914+
<else>
915+
<text term="presented at" text-case="capitalize-first"/>
916+
</else>
917+
</choose>
918+
<group delimiter=", ">
919+
<choose>
920+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
921+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
922+
<if variable="event-title">
923+
<text variable="event-title"/>
924+
</if>
925+
<else>
926+
<text variable="event"/>
927+
</else>
928+
</choose>
929+
<text variable="event-place"/>
930+
</group>
931+
</group>
926932
</group>
927-
</group>
928-
</group>
933+
</if>
934+
</choose>
929935
</if>
930936
</choose>
931937
</if>

‎apa-annotated-bibliography.csl

+21-15
Original file line numberDiff line numberDiff line change
@@ -1552,21 +1552,27 @@
15521552
</macro>
15531553
<macro name="event">
15541554
<choose>
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>
1565-
<text variable="event"/>
1566-
</else>
1567-
</choose>
1568-
<text variable="event-place"/>
1569-
</group>
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=", ">
1562+
<choose>
1563+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1564+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1565+
<if variable="event-title">
1566+
<text variable="event-title"/>
1567+
</if>
1568+
<else>
1569+
<text variable="event"/>
1570+
</else>
1571+
</choose>
1572+
<text variable="event-place"/>
1573+
</group>
1574+
</if>
1575+
</choose>
15701576
</if>
15711577
</choose>
15721578
</macro>

‎apa-cv.csl

+21-15
Original file line numberDiff line numberDiff line change
@@ -1299,21 +1299,27 @@
12991299
</macro>
13001300
<macro name="event">
13011301
<choose>
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>
1312-
<text variable="event"/>
1313-
</else>
1314-
</choose>
1315-
<text variable="event-place"/>
1316-
</group>
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=", ">
1309+
<choose>
1310+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1311+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1312+
<if variable="event-title">
1313+
<text variable="event-title"/>
1314+
</if>
1315+
<else>
1316+
<text variable="event"/>
1317+
</else>
1318+
</choose>
1319+
<text variable="event-place"/>
1320+
</group>
1321+
</if>
1322+
</choose>
13171323
</if>
13181324
</choose>
13191325
</macro>

‎apa-no-ampersand.csl

+21-15
Original file line numberDiff line numberDiff line change
@@ -1552,21 +1552,27 @@
15521552
</macro>
15531553
<macro name="event">
15541554
<choose>
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>
1565-
<text variable="event"/>
1566-
</else>
1567-
</choose>
1568-
<text variable="event-place"/>
1569-
</group>
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=", ">
1562+
<choose>
1563+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1564+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1565+
<if variable="event-title">
1566+
<text variable="event-title"/>
1567+
</if>
1568+
<else>
1569+
<text variable="event"/>
1570+
</else>
1571+
</choose>
1572+
<text variable="event-place"/>
1573+
</group>
1574+
</if>
1575+
</choose>
15701576
</if>
15711577
</choose>
15721578
</macro>

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

+34-28
Original file line numberDiff line numberDiff line change
@@ -903,36 +903,42 @@
903903
</macro>
904904
<macro name="event">
905905
<choose>
906-
<if variable="event" type="speech paper-conference" match="any">
906+
<if variable="event">
907+
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
908+
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
907909
<choose>
908-
<!-- Don't print event info if published in a proceedings -->
909-
<if variable="collection-editor editor issue page volume" match="none">
910-
<group delimiter=" ">
911-
<text variable="genre" text-case="capitalize-first"/>
912-
<group delimiter=" ">
913-
<choose>
914-
<if variable="genre">
915-
<text term="presented at"/>
916-
</if>
917-
<else>
918-
<text term="presented at" text-case="capitalize-first"/>
919-
</else>
920-
</choose>
921-
<group delimiter=", ">
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>
932-
<text variable="event-place"/>
910+
<if variable="event" type="speech paper-conference" match="any">
911+
<choose>
912+
<!-- Don't print event info if published in a proceedings -->
913+
<if variable="collection-editor editor issue page volume" match="none">
914+
<group delimiter=" ">
915+
<text variable="genre" text-case="capitalize-first"/>
916+
<group delimiter=" ">
917+
<choose>
918+
<if variable="genre">
919+
<text term="presented at"/>
920+
</if>
921+
<else>
922+
<text term="presented at" text-case="capitalize-first"/>
923+
</else>
924+
</choose>
925+
<group delimiter=", ">
926+
<choose>
927+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
928+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
929+
<if variable="event-title">
930+
<text variable="event-title"/>
931+
</if>
932+
<else>
933+
<text variable="event"/>
934+
</else>
935+
</choose>
936+
<text variable="event-place"/>
937+
</group>
938+
</group>
933939
</group>
934-
</group>
935-
</group>
940+
</if>
941+
</choose>
936942
</if>
937943
</choose>
938944
</if>

‎apa-no-initials.csl

+21-15
Original file line numberDiff line numberDiff line change
@@ -1552,21 +1552,27 @@
15521552
</macro>
15531553
<macro name="event">
15541554
<choose>
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>
1565-
<text variable="event"/>
1566-
</else>
1567-
</choose>
1568-
<text variable="event-place"/>
1569-
</group>
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=", ">
1562+
<choose>
1563+
<!-- We expect "event-title" to be used, but applications may not be updated yet.
1564+
This ensures that either can be accpeted. Remove if procesor logic can handle this. -->
1565+
<if variable="event-title">
1566+
<text variable="event-title"/>
1567+
</if>
1568+
<else>
1569+
<text variable="event"/>
1570+
</else>
1571+
</choose>
1572+
<text variable="event-place"/>
1573+
</group>
1574+
</if>
1575+
</choose>
15701576
</if>
15711577
</choose>
15721578
</macro>

0 commit comments

Comments
 (0)