Skip to content

Commit

Permalink
Fix bibliography date sorting (#5876)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bwiernik
bwiernik authored Jan 31, 2022
1 parent 873df06 commit 5125c43
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 144 deletions.
17 changes: 1 addition & 16 deletions apa-annotated-bibliography.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-cv.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,22 +447,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<!-- APA has two description elements following the title:
title (parenthetical) [bracketed] -->
Expand Down
17 changes: 1 addition & 16 deletions apa-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-no-initials.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-numeric-superscript-brackets.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-numeric-superscript.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-single-spaced.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
17 changes: 1 addition & 16 deletions apa-with-abstract.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,22 +502,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down
18 changes: 2 additions & 16 deletions apa.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@
</group>
</macro>
<macro name="date-sort-group">
<!-- APA sorts 1. no-date items, 2. items with dates, 3. in-press (status) items -->
<choose>
<if variable="issued">
<text value="1"/>
Expand All @@ -502,22 +503,7 @@
</choose>
</macro>
<macro name="date-sort-date">
<choose>
<if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
<date variable="issued" form="numeric"/>
</if>
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
<if variable="collection-editor editor editorial-director issue page volume" match="none">
<date variable="issued" form="numeric"/>
</if>
</choose>
</else-if>
<else>
<date variable="issued" form="numeric"/>
</else>
</choose>
<date variable="issued" form="numeric"/>
</macro>
<macro name="date-intext">
<choose>
Expand Down

0 comments on commit 5125c43

Please sign in to comment.