Skip to content

APA overhaul #3602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adam3smith merged 52 commits into from
Mar 25, 2019
Merged

APA overhaul #3602

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
51e4d91
APA bug fix
bwiernik Jul 7, 2018
1dd5d15
Don't show publisher if other access information is available
bwiernik Jul 8, 2018
acd844b
Allow report to potentially refer to a chapter in a report
bwiernik Jul 8, 2018
9e9d3be
Update APA (description) [format] container
bwiernik Jul 9, 2018
c03c8a4
Fix typos
bwiernik Jul 9, 2018
957085b
Update legal_cites, patents, and creators
bwiernik Jul 10, 2018
35641e4
Bug fixes and robustification
bwiernik Jul 10, 2018
2182a37
Adjust contributor inclusion and formatting
bwiernik Jul 13, 2018
02ffda9
Bug fix in newspaper
bwiernik Jul 13, 2018
04033ed
Fix broadcast container bug
bwiernik Jul 13, 2018
a99710a
Adjust names subsitution
bwiernik Jul 14, 2018
8bf6cdc
Update song recording
bwiernik Jul 14, 2018
cb4b022
Update container formatting for items without container-title
bwiernik Jul 14, 2018
5e9d023
Tweaks to container formatting
bwiernik Jul 14, 2018
162c47e
Move duplicated lines to macro
bwiernik Aug 6, 2018
0c4d306
Fix multiple type conditionals
bwiernik Aug 6, 2018
ca7dcb3
Replace hard-coded "No. " with term
bwiernik Aug 6, 2018
b2fc3a7
Replace hardcoded "No. " with term
bwiernik Aug 6, 2018
2d75189
Fix reviewed-author label
bwiernik Aug 6, 2018
241414e
Remove unnecessary delimiter
bwiernik Aug 6, 2018
4904a69
Simplify nested subsitute
bwiernik Aug 6, 2018
8b171f1
Fix "retrieved from" for reports
bwiernik Dec 2, 2018
fda5714
Add circa abbreviation
bwiernik Dec 2, 2018
e44104b
Fix status bug
bwiernik Dec 2, 2018
93649a5
Add archive for article-journal, etc.
bwiernik Dec 2, 2018
ae081bc
Support chapters in book series volumes
bwiernik Dec 2, 2018
3fdfc53
Tweak collection-number
bwiernik Dec 2, 2018
6201bb3
Support book-like and journal-like paper-conference
bwiernik Dec 2, 2018
5a04ea9
Correctly format volume titles
bwiernik Dec 2, 2018
f472820
Allow genre to be specified in reviews
bwiernik Dec 17, 2018
58d4a6c
Fix manuscript formatting
bwiernik Dec 17, 2018
e6e400d
Song author substitute
bwiernik Dec 18, 2018
bf039b0
Remove short container title from treaty
bwiernik Dec 18, 2018
22d1cf6
Update handling of archival material
bwiernik Feb 4, 2019
a3c9067
Use full name for recipient
bwiernik Feb 4, 2019
e912b15
Fix handling of archives
bwiernik Feb 5, 2019
2ccc18c
Fix title-less interviews
bwiernik Feb 18, 2019
f05ea4c
Remove form="long" from Chapter locator
bwiernik Feb 20, 2019
41c9b33
Fix container information for whole reference books entered as entry
bwiernik Feb 20, 2019
887cbe0
Accomodate entry without byline and software with container-title
bwiernik Feb 20, 2019
47242c7
Change placement of container-author
bwiernik Feb 20, 2019
9af1996
Put the conditional back into container-booklike
bwiernik Feb 20, 2019
5d22378
Fix container title non-numeric volume display for editor-less contai…
bwiernik Feb 20, 2019
db5aac7
Fix non-archival manuscripts
bwiernik Feb 20, 2019
cae0ae4
Fix delimiter
bwiernik Feb 20, 2019
d4eae2c
Fix preprint publisher
bwiernik Feb 20, 2019
ef0ffe0
Address comments from adamsmith
bwiernik Mar 19, 2019
d300778
Fix patent rendering
bwiernik Mar 20, 2019
214d6d7
Let URL/DOI replace publisher for patents
bwiernik Mar 22, 2019
af852ea
Update other APA styles
bwiernik Mar 24, 2019
ddb9be4
Update apa-cv.csl
bwiernik Mar 24, 2019
e724187
Update apa-cv.csl
bwiernik Mar 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix handling of archives
  • Loading branch information
@bwiernik
bwiernik committed Feb 5, 2019
commit e912b15f3d6aebb083e5378740fcd753b725fa3d
130 changes: 74 additions & 56 deletions apa.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@
</macro>
<macro name="container-contributors">
<choose>
<if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report" match="any">
<if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
<text macro="container-contributors-booklike"/>
</if>
<else-if type="paper-conference">
<choose>
<if variable="editor collection-editor" match="any">
<if variable="collection-editor container-author editor" match="any">
<text macro="container-contributors-booklike"/>
</if>
</choose>
Expand Down Expand Up @@ -173,7 +173,7 @@
</else-if>
<else-if type="paper-conference">
<choose>
<if variable="editor collection-editor" match="any">
<if variable="collection-editor editor" match="any">
<text macro="secondary-contributors-booklike"/>
</if>
<else>
Expand Down Expand Up @@ -409,13 +409,20 @@
</else-if>
<else-if variable="archive">
<choose>
<if type="article article-journal article-magazine article-newspaper dataset report thesis" match="any">
<group delimiter=" ">
<text term="retrieved" text-case="capitalize-first"/>
<text term="from"/>
<text variable="archive" suffix="."/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
<if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
<choose>
<if variable="archive-place" match="none">
<group delimiter=" ">
<text term="retrieved" text-case="capitalize-first"/>
<text term="from"/>
<text variable="archive" suffix="."/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</if>
<else>
<text macro="publisher" suffix="."/>
Expand Down Expand Up @@ -639,7 +646,7 @@
<else-if type="paper-conference">
<group delimiter=", ">
<choose>
<if variable="container-title">
<if variable="collection-editor editor issue page volume" match="any">
<text variable="genre" text-case="capitalize-first"/>
</if>
</choose>
Expand Down Expand Up @@ -692,61 +699,71 @@
</else>
</choose>
</macro>
<macro name="archive">
<group delimiter=". ">
<group delimiter=", ">
<choose>
<if type="manuscript">
<text variable="genre"/>
</if>
</choose>
<group delimiter=" ">
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" here when "archive_collection" becomes available -->
<text variable="archive-place"/>
</group>
</group>
</macro>
<macro name="publisher">
<choose>
<if type="manuscript pamphlet" match="any">
<group delimiter=". ">
<group delimiter=", ">
<text variable="genre"/>
<group delimiter=" ">
<!-- Replace "archive" with "archive_collection" as that becomes available -->
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</group>
<group delimiter=", ">
<!-- Move "archive" and "archive-place" here when "archive_collection" becomes available -->
<!-- Move "publisher" and "publisher-place" between "genre" and "archive_collection"/"archive_location" when "archive_collection" becomes available -->
<text variable="publisher"/>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
</group>
<text macro="archive"/>
</group>
</if>
<else-if type="thesis patent article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
<group delimiter=", ">
<group delimiter=" ">
<text variable="archive"/>
<text variable="archive_location" prefix="(" suffix=")"/>
<!-- Same details as above regarding archive_collection -->
</group>
<text variable="publisher"/>
<text variable="publisher-place"/>
</group>
</else-if>
<else-if type="thesis" match="any">
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
<group delimiter=". ">
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
</group>
<text macro="archive"/>
</group>
</else-if>
<else-if type="patent">
<group delimiter=": ">
<text variable="publisher-place"/>
<choose>
<if variable="publisher">
<text variable="publisher"/>
</if>
<else>
<text variable="authority"/>
</else>
</choose>
<group delimiter=". ">
<group delimiter=": ">
<text variable="publisher-place"/>
<choose>
<if variable="publisher">
<text variable="publisher"/>
</if>
<else>
<text variable="authority"/>
</else>
</choose>
</group>
<text macro="archive"/>
</group>
</else-if>
<else-if type="article-journal article-magazine article-newspaper post post-weblog webpage" match="none">
<else-if type="article article-journal article-magazine article-newspaper" match="any">
<text macro="archive"/>
</else-if>
<else-if type="post post-weblog webpage" match="none">
<choose>
<if variable="event">
<choose>
<if variable="container-title">
<!-- Only print publisher info if published in a proceedings -->
<if variable="collection-editor editor issue page volume" match="any">
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
Expand All @@ -761,6 +778,7 @@
</group>
</else>
</choose>
<text macro="archive"/>
</else-if>
</choose>
</macro>
Expand All @@ -769,7 +787,7 @@
<if variable="event" type="speech paper-conference" match="any">
<choose>
<!-- Don't print event info if published in a proceedings -->
<if variable="container-title" match="none">
<if variable="collection-editor editor issue page volume" match="none">
<group delimiter=" ">
<text variable="genre" text-case="capitalize-first"/>
<group delimiter=" ">
Expand Down Expand Up @@ -989,7 +1007,7 @@
</else-if>
<else-if type="paper-conference">
<choose>
<if variable="editor collection-editor" match="any">
<if variable="collection-editor editor" match="any">
<text macro="locators-booklike"/>
</if>
<else>
Expand Down Expand Up @@ -1136,7 +1154,7 @@
</else-if>
<else-if type="paper-conference">
<choose>
<if variable="editor collection-editor" match="any">
<if variable="editor collection-editor container-author" match="any">
<text macro="container-booklike"/>
</if>
<else>
Expand All @@ -1147,7 +1165,7 @@
</else>
</choose>
</else-if>
<else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map" match="any">
<else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
<text macro="container-booklike"/>
</else-if>
<else-if type="bill legal_case legislation treaty" match="any">
Expand All @@ -1164,7 +1182,7 @@
<text macro="container-contributors"/>
<group delimiter=" ">
<choose>
<if variable="editor translator" match="none">
<if variable="container-author editor translator" match="none">
<group delimiter=". ">
<group delimiter=": ">
<text variable="collection-title" font-style="italic" text-case="title"/>
Expand Down Expand Up @@ -1222,9 +1240,9 @@
<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">
<else-if type="paper-conference speech">
<choose>
<if variable="editor collection-editor" match="any">
<if variable="collection-editor container-author editor" match="any">
<text variable="container-title" font-style="italic"/>
</if>
<else>
Expand Down