Skip to content

Commit

Permalink
APA: match="any" bugfixes (JabRef#5092)
Browse files Browse the repository at this point in the history
Closes citation-style-language/styles#5071

Co-authored-by: POBrien333 <954979+POBrien333@users.noreply.github.com>
  • Loading branch information
bwiernik and POBrien333 authored Nov 4, 2020
1 parent d0cc2c4 commit f4399aa
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 55 deletions.
6 changes: 3 additions & 3 deletions apa-6th-edition-no-ampersand.csl
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text macro="title"/>
</if>
<else>
Expand Down Expand Up @@ -401,7 +401,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
Expand Down Expand Up @@ -1381,7 +1381,7 @@
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
<text variable="container-title" font-style="italic" text-case="title"/>
</if>
<else-if type="paper-conference speech">
<else-if type="paper-conference speech" match="any">
<choose>
<if variable="collection-editor container-author editor" match="any">
<text variable="container-title" font-style="italic"/>
Expand Down
6 changes: 3 additions & 3 deletions apa-6th-edition.csl
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text macro="title"/>
</if>
<else>
Expand Down Expand Up @@ -400,7 +400,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
Expand Down Expand Up @@ -1380,7 +1380,7 @@
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
<text variable="container-title" font-style="italic" text-case="title"/>
</if>
<else-if type="paper-conference speech">
<else-if type="paper-conference speech" match="any">
<choose>
<if variable="collection-editor container-author editor" match="any">
<text variable="container-title" font-style="italic"/>
Expand Down
10 changes: 5 additions & 5 deletions apa-annotated-bibliography.csl
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
</if>
<else-if type="interview personal_communication">
<else-if type="interview personal_communication" match="any">
<choose>
<!-- These variables indicate that the letter is retrievable by the reader.
If not, then use the APA in-text-only personal communication format -->
Expand Down Expand Up @@ -543,7 +543,7 @@
</choose>
<group>
<choose>
<if type="interview personal_communication">
<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.
Expand Down Expand Up @@ -611,7 +611,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -728,7 +728,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1508,7 +1508,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
6 changes: 3 additions & 3 deletions apa-cv.csl
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -565,7 +565,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1255,7 +1255,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
10 changes: 5 additions & 5 deletions apa-no-ampersand.csl
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
</if>
<else-if type="interview personal_communication">
<else-if type="interview personal_communication" match="any">
<choose>
<!-- These variables indicate that the letter is retrievable by the reader.
If not, then use the APA in-text-only personal communication format -->
Expand Down Expand Up @@ -543,7 +543,7 @@
</choose>
<group>
<choose>
<if type="interview personal_communication">
<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.
Expand Down Expand Up @@ -611,7 +611,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -728,7 +728,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1508,7 +1508,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
6 changes: 3 additions & 3 deletions apa-no-doi-no-issue.csl
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text macro="title"/>
</if>
<else>
Expand Down Expand Up @@ -401,7 +401,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
Expand Down Expand Up @@ -1394,7 +1394,7 @@
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
<text variable="container-title" font-style="italic" text-case="title"/>
</if>
<else-if type="paper-conference speech">
<else-if type="paper-conference speech" match="any">
<choose>
<if variable="collection-editor container-author editor" match="any">
<text variable="container-title" font-style="italic"/>
Expand Down
10 changes: 5 additions & 5 deletions apa-numeric-superscript-brackets.csl
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
</if>
<else-if type="interview personal_communication">
<else-if type="interview personal_communication" match="any">
<choose>
<!-- These variables indicate that the letter is retrievable by the reader.
If not, then use the APA in-text-only personal communication format -->
Expand Down Expand Up @@ -346,7 +346,7 @@
</choose>
<group>
<choose>
<if type="interview personal_communication">
<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.
Expand Down Expand Up @@ -414,7 +414,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -531,7 +531,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1311,7 +1311,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
10 changes: 5 additions & 5 deletions apa-numeric-superscript.csl
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
</if>
<else-if type="interview personal_communication">
<else-if type="interview personal_communication" match="any">
<choose>
<!-- These variables indicate that the letter is retrievable by the reader.
If not, then use the APA in-text-only personal communication format -->
Expand Down Expand Up @@ -346,7 +346,7 @@
</choose>
<group>
<choose>
<if type="interview personal_communication">
<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.
Expand Down Expand Up @@ -414,7 +414,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -531,7 +531,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1311,7 +1311,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
6 changes: 3 additions & 3 deletions apa-old-doi-prefix.csl
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text macro="title"/>
</if>
<else>
Expand Down Expand Up @@ -401,7 +401,7 @@
<choose>
<if variable="container-title">
<choose>
<if type="book entry entry-dictionary entry-encyclopedia">
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
<text variable="title" form="short" text-case="title" quotes="true"/>
</if>
<else>
Expand Down Expand Up @@ -1381,7 +1381,7 @@
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
<text variable="container-title" font-style="italic" text-case="title"/>
</if>
<else-if type="paper-conference speech">
<else-if type="paper-conference speech" match="any">
<choose>
<if variable="collection-editor container-author editor" match="any">
<text variable="container-title" font-style="italic"/>
Expand Down
10 changes: 5 additions & 5 deletions apa-single-spaced.csl
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<if type="bill legal_case legislation treaty" match="any">
<text macro="title-intext"/>
</if>
<else-if type="interview personal_communication">
<else-if type="interview personal_communication" match="any">
<choose>
<!-- These variables indicate that the letter is retrievable by the reader.
If not, then use the APA in-text-only personal communication format -->
Expand Down Expand Up @@ -543,7 +543,7 @@
</choose>
<group>
<choose>
<if type="interview personal_communication">
<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.
Expand Down Expand Up @@ -611,7 +611,7 @@
</else-if>
<else>
<choose>
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
<text variable="title" font-style="italic"/>
</if>
<else-if type="paper-conference">
Expand Down Expand Up @@ -728,7 +728,7 @@
</group>
</group>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For post webpage, container-title is treated as publisher -->
<group delimiter="; ">
<text macro="secondary-contributors"/>
Expand Down Expand Up @@ -1508,7 +1508,7 @@
</if>
</choose>
</if>
<else-if type="post webpage">
<else-if type="post webpage" match="any">
<!-- For websites, treat container title like publisher -->
<group delimiter="; ">
<text variable="container-title" text-case="title"/>
Expand Down
Loading

0 comments on commit f4399aa

Please sign in to comment.