Skip to content

Commit

Permalink
Bug fix for event regression (#6154)
Browse files Browse the repository at this point in the history 
* Bugfix: `event` check regression from 15655ab2493473dccd15d60f1d532e40ebe39e3e
  • Loading branch information
@bwiernik
bwiernik committed Jul 25, 2022
1 parent 0dab651 commit e231ea3
Show file tree
Hide file tree
Showing 13 changed files with 325 additions and 247 deletions.
62 changes: 34 additions & 28 deletions apa-6th-edition-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,36 +897,42 @@
</macro>
<macro name="event">
<choose>
<if variable="event" type="speech paper-conference" match="any">
<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>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
<if variable="event" type="speech paper-conference" match="any">
<choose>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
</group>
</group>
</group>
</group>
</group>
</if>
</choose>
</if>
</choose>
</if>
Expand Down
62 changes: 34 additions & 28 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,36 +896,42 @@
</macro>
<macro name="event">
<choose>
<if variable="event" type="speech paper-conference" match="any">
<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>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
<if variable="event" type="speech paper-conference" match="any">
<choose>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
</group>
</group>
</group>
</group>
</group>
</if>
</choose>
</if>
</choose>
</if>
Expand Down
36 changes: 21 additions & 15 deletions apa-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,21 +1552,27 @@
</macro>
<macro name="event">
<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=", ">
<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>
<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=", ">
<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>
</if>
</choose>
</if>
</choose>
</macro>
Expand Down
36 changes: 21 additions & 15 deletions apa-cv.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1299,21 +1299,27 @@
</macro>
<macro name="event">
<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=", ">
<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>
<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=", ">
<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>
</if>
</choose>
</if>
</choose>
</macro>
Expand Down
36 changes: 21 additions & 15 deletions apa-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,21 +1552,27 @@
</macro>
<macro name="event">
<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=", ">
<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>
<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=", ">
<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>
</if>
</choose>
</if>
</choose>
</macro>
Expand Down
62 changes: 34 additions & 28 deletions apa-no-doi-no-issue.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -903,36 +903,42 @@
</macro>
<macro name="event">
<choose>
<if variable="event" type="speech paper-conference" match="any">
<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>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
<if variable="event" type="speech paper-conference" match="any">
<choose>
<!-- Don't print event info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
<choose>
<if variable="genre">
<text term="presented at"/>
</if>
<else>
<text term="presented at" text-case="capitalize-first"/>
</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 variable="event-place"/>
</group>
</group>
</group>
</group>
</group>
</if>
</choose>
</if>
</choose>
</if>
Expand Down
36 changes: 21 additions & 15 deletions apa-no-initials.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,21 +1552,27 @@
</macro>
<macro name="event">
<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=", ">
<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>
<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=", ">
<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>
</if>
</choose>
</if>
</choose>
</macro>
Expand Down
Loading

0 comments on commit e231ea3

Please sign in to comment.