Skip to content

Commit f4399aa

Browse files
bwiernikPOBrien333
bwiernik
and
POBrien333
authored
APA: match="any" bugfixes (#5092)
Closes citation-style-language/styles#5071 Co-authored-by: POBrien333 <[email protected]>
1 parent d0cc2c4 commit f4399aa

13 files changed

+55
-55
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<choose>
291291
<if variable="container-title">
292292
<choose>
293-
<if type="book entry entry-dictionary entry-encyclopedia">
293+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
294294
<text macro="title"/>
295295
</if>
296296
<else>
@@ -401,7 +401,7 @@
401401
<choose>
402402
<if variable="container-title">
403403
<choose>
404-
<if type="book entry entry-dictionary entry-encyclopedia">
404+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
405405
<text variable="title" form="short" text-case="title" quotes="true"/>
406406
</if>
407407
<else>
@@ -1381,7 +1381,7 @@
13811381
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
13821382
<text variable="container-title" font-style="italic" text-case="title"/>
13831383
</if>
1384-
<else-if type="paper-conference speech">
1384+
<else-if type="paper-conference speech" match="any">
13851385
<choose>
13861386
<if variable="collection-editor container-author editor" match="any">
13871387
<text variable="container-title" font-style="italic"/>

‎apa-6th-edition.csl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
<choose>
290290
<if variable="container-title">
291291
<choose>
292-
<if type="book entry entry-dictionary entry-encyclopedia">
292+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
293293
<text macro="title"/>
294294
</if>
295295
<else>
@@ -400,7 +400,7 @@
400400
<choose>
401401
<if variable="container-title">
402402
<choose>
403-
<if type="book entry entry-dictionary entry-encyclopedia">
403+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
404404
<text variable="title" form="short" text-case="title" quotes="true"/>
405405
</if>
406406
<else>
@@ -1380,7 +1380,7 @@
13801380
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
13811381
<text variable="container-title" font-style="italic" text-case="title"/>
13821382
</if>
1383-
<else-if type="paper-conference speech">
1383+
<else-if type="paper-conference speech" match="any">
13841384
<choose>
13851385
<if variable="collection-editor container-author editor" match="any">
13861386
<text variable="container-title" font-style="italic"/>

‎apa-annotated-bibliography.csl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
<if type="bill legal_case legislation treaty" match="any">
388388
<text macro="title-intext"/>
389389
</if>
390-
<else-if type="interview personal_communication">
390+
<else-if type="interview personal_communication" match="any">
391391
<choose>
392392
<!-- These variables indicate that the letter is retrievable by the reader.
393393
If not, then use the APA in-text-only personal communication format -->
@@ -543,7 +543,7 @@
543543
</choose>
544544
<group>
545545
<choose>
546-
<if type="interview personal_communication">
546+
<if type="interview personal_communication" match="any">
547547
<choose>
548548
<if variable="archive container-title DOI publisher URL" match="none">
549549
<!-- These variables indicate that the communication is retrievable by the reader.
@@ -611,7 +611,7 @@
611611
</else-if>
612612
<else>
613613
<choose>
614-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
614+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
615615
<text variable="title" font-style="italic"/>
616616
</if>
617617
<else-if type="paper-conference">
@@ -728,7 +728,7 @@
728728
</group>
729729
</group>
730730
</if>
731-
<else-if type="post webpage">
731+
<else-if type="post webpage" match="any">
732732
<!-- For post webpage, container-title is treated as publisher -->
733733
<group delimiter="; ">
734734
<text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
15081508
</if>
15091509
</choose>
15101510
</if>
1511-
<else-if type="post webpage">
1511+
<else-if type="post webpage" match="any">
15121512
<!-- For websites, treat container title like publisher -->
15131513
<group delimiter="; ">
15141514
<text variable="container-title" text-case="title"/>

‎apa-cv.csl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
</else-if>
500500
<else>
501501
<choose>
502-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
502+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
503503
<text variable="title" font-style="italic"/>
504504
</if>
505505
<else-if type="paper-conference">
@@ -565,7 +565,7 @@
565565
</group>
566566
</group>
567567
</if>
568-
<else-if type="post webpage">
568+
<else-if type="post webpage" match="any">
569569
<!-- For post webpage, container-title is treated as publisher -->
570570
<group delimiter="; ">
571571
<text macro="secondary-contributors"/>
@@ -1255,7 +1255,7 @@
12551255
</if>
12561256
</choose>
12571257
</if>
1258-
<else-if type="post webpage">
1258+
<else-if type="post webpage" match="any">
12591259
<!-- For websites, treat container title like publisher -->
12601260
<group delimiter="; ">
12611261
<text variable="container-title" text-case="title"/>

‎apa-no-ampersand.csl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
<if type="bill legal_case legislation treaty" match="any">
388388
<text macro="title-intext"/>
389389
</if>
390-
<else-if type="interview personal_communication">
390+
<else-if type="interview personal_communication" match="any">
391391
<choose>
392392
<!-- These variables indicate that the letter is retrievable by the reader.
393393
If not, then use the APA in-text-only personal communication format -->
@@ -543,7 +543,7 @@
543543
</choose>
544544
<group>
545545
<choose>
546-
<if type="interview personal_communication">
546+
<if type="interview personal_communication" match="any">
547547
<choose>
548548
<if variable="archive container-title DOI publisher URL" match="none">
549549
<!-- These variables indicate that the communication is retrievable by the reader.
@@ -611,7 +611,7 @@
611611
</else-if>
612612
<else>
613613
<choose>
614-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
614+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
615615
<text variable="title" font-style="italic"/>
616616
</if>
617617
<else-if type="paper-conference">
@@ -728,7 +728,7 @@
728728
</group>
729729
</group>
730730
</if>
731-
<else-if type="post webpage">
731+
<else-if type="post webpage" match="any">
732732
<!-- For post webpage, container-title is treated as publisher -->
733733
<group delimiter="; ">
734734
<text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
15081508
</if>
15091509
</choose>
15101510
</if>
1511-
<else-if type="post webpage">
1511+
<else-if type="post webpage" match="any">
15121512
<!-- For websites, treat container title like publisher -->
15131513
<group delimiter="; ">
15141514
<text variable="container-title" text-case="title"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<choose>
291291
<if variable="container-title">
292292
<choose>
293-
<if type="book entry entry-dictionary entry-encyclopedia">
293+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
294294
<text macro="title"/>
295295
</if>
296296
<else>
@@ -401,7 +401,7 @@
401401
<choose>
402402
<if variable="container-title">
403403
<choose>
404-
<if type="book entry entry-dictionary entry-encyclopedia">
404+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
405405
<text variable="title" form="short" text-case="title" quotes="true"/>
406406
</if>
407407
<else>
@@ -1394,7 +1394,7 @@
13941394
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
13951395
<text variable="container-title" font-style="italic" text-case="title"/>
13961396
</if>
1397-
<else-if type="paper-conference speech">
1397+
<else-if type="paper-conference speech" match="any">
13981398
<choose>
13991399
<if variable="collection-editor container-author editor" match="any">
14001400
<text variable="container-title" font-style="italic"/>

‎apa-numeric-superscript-brackets.csl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<if type="bill legal_case legislation treaty" match="any">
191191
<text macro="title-intext"/>
192192
</if>
193-
<else-if type="interview personal_communication">
193+
<else-if type="interview personal_communication" match="any">
194194
<choose>
195195
<!-- These variables indicate that the letter is retrievable by the reader.
196196
If not, then use the APA in-text-only personal communication format -->
@@ -346,7 +346,7 @@
346346
</choose>
347347
<group>
348348
<choose>
349-
<if type="interview personal_communication">
349+
<if type="interview personal_communication" match="any">
350350
<choose>
351351
<if variable="archive container-title DOI publisher URL" match="none">
352352
<!-- These variables indicate that the communication is retrievable by the reader.
@@ -414,7 +414,7 @@
414414
</else-if>
415415
<else>
416416
<choose>
417-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
417+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
418418
<text variable="title" font-style="italic"/>
419419
</if>
420420
<else-if type="paper-conference">
@@ -531,7 +531,7 @@
531531
</group>
532532
</group>
533533
</if>
534-
<else-if type="post webpage">
534+
<else-if type="post webpage" match="any">
535535
<!-- For post webpage, container-title is treated as publisher -->
536536
<group delimiter="; ">
537537
<text macro="secondary-contributors"/>
@@ -1311,7 +1311,7 @@
13111311
</if>
13121312
</choose>
13131313
</if>
1314-
<else-if type="post webpage">
1314+
<else-if type="post webpage" match="any">
13151315
<!-- For websites, treat container title like publisher -->
13161316
<group delimiter="; ">
13171317
<text variable="container-title" text-case="title"/>

‎apa-numeric-superscript.csl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<if type="bill legal_case legislation treaty" match="any">
191191
<text macro="title-intext"/>
192192
</if>
193-
<else-if type="interview personal_communication">
193+
<else-if type="interview personal_communication" match="any">
194194
<choose>
195195
<!-- These variables indicate that the letter is retrievable by the reader.
196196
If not, then use the APA in-text-only personal communication format -->
@@ -346,7 +346,7 @@
346346
</choose>
347347
<group>
348348
<choose>
349-
<if type="interview personal_communication">
349+
<if type="interview personal_communication" match="any">
350350
<choose>
351351
<if variable="archive container-title DOI publisher URL" match="none">
352352
<!-- These variables indicate that the communication is retrievable by the reader.
@@ -414,7 +414,7 @@
414414
</else-if>
415415
<else>
416416
<choose>
417-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
417+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
418418
<text variable="title" font-style="italic"/>
419419
</if>
420420
<else-if type="paper-conference">
@@ -531,7 +531,7 @@
531531
</group>
532532
</group>
533533
</if>
534-
<else-if type="post webpage">
534+
<else-if type="post webpage" match="any">
535535
<!-- For post webpage, container-title is treated as publisher -->
536536
<group delimiter="; ">
537537
<text macro="secondary-contributors"/>
@@ -1311,7 +1311,7 @@
13111311
</if>
13121312
</choose>
13131313
</if>
1314-
<else-if type="post webpage">
1314+
<else-if type="post webpage" match="any">
13151315
<!-- For websites, treat container title like publisher -->
13161316
<group delimiter="; ">
13171317
<text variable="container-title" text-case="title"/>

‎apa-old-doi-prefix.csl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<choose>
291291
<if variable="container-title">
292292
<choose>
293-
<if type="book entry entry-dictionary entry-encyclopedia">
293+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
294294
<text macro="title"/>
295295
</if>
296296
<else>
@@ -401,7 +401,7 @@
401401
<choose>
402402
<if variable="container-title">
403403
<choose>
404-
<if type="book entry entry-dictionary entry-encyclopedia">
404+
<if type="book entry entry-dictionary entry-encyclopedia" match="any">
405405
<text variable="title" form="short" text-case="title" quotes="true"/>
406406
</if>
407407
<else>
@@ -1381,7 +1381,7 @@
13811381
<if type="article article-journal article-magazine article-newspaper dataset" match="any">
13821382
<text variable="container-title" font-style="italic" text-case="title"/>
13831383
</if>
1384-
<else-if type="paper-conference speech">
1384+
<else-if type="paper-conference speech" match="any">
13851385
<choose>
13861386
<if variable="collection-editor container-author editor" match="any">
13871387
<text variable="container-title" font-style="italic"/>

‎apa-single-spaced.csl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
<if type="bill legal_case legislation treaty" match="any">
388388
<text macro="title-intext"/>
389389
</if>
390-
<else-if type="interview personal_communication">
390+
<else-if type="interview personal_communication" match="any">
391391
<choose>
392392
<!-- These variables indicate that the letter is retrievable by the reader.
393393
If not, then use the APA in-text-only personal communication format -->
@@ -543,7 +543,7 @@
543543
</choose>
544544
<group>
545545
<choose>
546-
<if type="interview personal_communication">
546+
<if type="interview personal_communication" match="any">
547547
<choose>
548548
<if variable="archive container-title DOI publisher URL" match="none">
549549
<!-- These variables indicate that the communication is retrievable by the reader.
@@ -611,7 +611,7 @@
611611
</else-if>
612612
<else>
613613
<choose>
614-
<if type="article-journal article-magazine article-newspaper post-weblog review review-book">
614+
<if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
615615
<text variable="title" font-style="italic"/>
616616
</if>
617617
<else-if type="paper-conference">
@@ -728,7 +728,7 @@
728728
</group>
729729
</group>
730730
</if>
731-
<else-if type="post webpage">
731+
<else-if type="post webpage" match="any">
732732
<!-- For post webpage, container-title is treated as publisher -->
733733
<group delimiter="; ">
734734
<text macro="secondary-contributors"/>
@@ -1508,7 +1508,7 @@
15081508
</if>
15091509
</choose>
15101510
</if>
1511-
<else-if type="post webpage">
1511+
<else-if type="post webpage" match="any">
15121512
<!-- For websites, treat container title like publisher -->
15131513
<group delimiter="; ">
15141514
<text variable="container-title" text-case="title"/>

0 commit comments

Comments
 (0)