Skip to content

Commit

Permalink
APA: Swap priority for periodical page and number (#6255)
Browse files Browse the repository at this point in the history 
Closes citation-style-language/styles#5827
  • Loading branch information
@bwiernik
bwiernik authored Oct 2, 2022
1 parent 7bde3e4 commit 38bc5fe
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 45 deletions.
13 changes: 8 additions & 5 deletions apa-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,13 +1425,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-cv.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1172,13 +1172,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,13 +1425,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-no-initials.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,13 +1425,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-numeric-superscript-brackets.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,13 +1228,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-numeric-superscript.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,13 +1228,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-single-spaced.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,13 +1425,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa-with-abstract.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1425,13 +1425,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down
13 changes: 8 additions & 5 deletions apa.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1426,13 +1426,16 @@
</else>
</choose>
<choose>
<if variable="page">
<text variable="page"/>
</if>
<else>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
<!-- This should be localized -->
<text variable="number" prefix="Article "/>
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
</group>
</if>
<else>
<text variable="page"/>
</else>
</choose>
</group>
Expand Down

0 comments on commit 38bc5fe

Please sign in to comment.