Skip to content

Commit

Permalink
Add event-title to other APA styles (#6153)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwiernik
bwiernik authored Jul 23, 2022
1 parent 698cf1c commit 0dab651
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 150 deletions.
13 changes: 11 additions & 2 deletions apa-6th-edition-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,16 @@
</else>
</choose>
<group delimiter=", ">
<text variable="event"/>
<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>
Expand Down Expand Up @@ -1401,7 +1410,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
(example 26) or retracted references -->
<text variable="references"/>
Expand Down
13 changes: 11 additions & 2 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,16 @@
</else>
</choose>
<group delimiter=", ">
<text variable="event"/>
<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>
Expand Down Expand Up @@ -1400,7 +1409,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
(example 26) or retracted references -->
<text variable="references"/>
Expand Down
39 changes: 21 additions & 18 deletions apa-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down Expand Up @@ -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=", ">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -529,7 +529,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>
Expand Down Expand Up @@ -1294,7 +1294,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>
Expand Down Expand Up @@ -1552,18 +1552,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>
Expand All @@ -1574,7 +1577,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"/>
Expand Down
35 changes: 19 additions & 16 deletions apa-cv.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down Expand Up @@ -415,7 +415,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>
Expand Down Expand Up @@ -1085,7 +1085,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>
Expand Down Expand Up @@ -1299,18 +1299,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>
Expand All @@ -1321,7 +1324,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"/>
Expand Down
39 changes: 21 additions & 18 deletions apa-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down Expand Up @@ -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=", ">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -529,7 +529,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>
Expand Down Expand Up @@ -1294,7 +1294,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>
Expand Down Expand Up @@ -1552,18 +1552,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>
Expand All @@ -1574,7 +1577,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"/>
Expand Down
13 changes: 11 additions & 2 deletions apa-no-doi-no-issue.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,16 @@
</else>
</choose>
<group delimiter=", ">
<text variable="event"/>
<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>
Expand Down Expand Up @@ -1414,7 +1423,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
(example 26) or retracted references -->
<text variable="references"/>
Expand Down
Loading

0 comments on commit 0dab651

Please sign in to comment.