Skip to content

Commit

Permalink
Always print publisher in APA 6th edition (JabRef#4899)
Browse files Browse the repository at this point in the history 
* Always print publisher in APA 6th edition

Even though the manual says otherwise, journals (including APA) generally, if not always, seem to ask for publisher and place when working with APA 6.

Also backport some other features from APA 7.
  • Loading branch information
@bwiernik
bwiernik authored Aug 4, 2020
1 parent 868809c commit 66f9974
Show file tree
Hide file tree
Showing 4 changed files with 260 additions and 200 deletions.
111 changes: 64 additions & 47 deletions apa-6th-edition-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,19 +503,10 @@
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</else-if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</macro>
<macro name="title">
Expand Down Expand Up @@ -796,6 +787,25 @@
</else>
</choose>
</macro>
<macro name="title-and-descriptions">
<group delimiter=" ">
<text macro="title"/>
<choose>
<if variable="title interviewer" type="interview" match="any">
<group delimiter=" ">
<text macro="description"/>
<text macro="format"/>
</group>
</if>
<else>
<group delimiter=" ">
<text macro="format"/>
<text macro="description"/>
</group>
</else>
</choose>
</group>
</macro>
<macro name="archive">
<group delimiter=". ">
<group delimiter=", ">
Expand Down Expand Up @@ -1386,6 +1396,42 @@
</else-if>
</choose>
</macro>
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
<macro name="publication-history">
<choose>
<if type="patent" match="none">
<group prefix="(" suffix=")">
<choose>
<if variable="references">
<!-- This provides the option for more elaborate description
of publication history, such as full "reprinted" references
(example 26) or retracted references -->
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</else>
</choose>
</group>
</if>
<else>
<text variable="references" prefix="(" suffix=")"/>
</else>
</choose>
</macro>
<macro name="legal-cites">
<choose>
<if type="legal_case">
Expand Down Expand Up @@ -1492,57 +1538,28 @@
<key macro="title"/>
</sort>
<layout>
<group suffix=".">
<group delimiter=". ">
<group delimiter=" ">
<group delimiter=". " suffix=".">
<text macro="author"/>
<choose>
<if is-uncertain-date="issued">
<group prefix=" [" suffix="]" delimiter=" ">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="issued"/>
</group>
</if>
<else>
<text macro="issued" prefix=" (" suffix=")"/>
<text macro="issued" prefix="(" suffix=")"/>
</else>
</choose>
<group delimiter=" ">
<text macro="title"/>
<choose>
<if variable="title interviewer" type="interview" match="any">
<group delimiter=" ">
<text macro="description"/>
<text macro="format"/>
</group>
</if>
<else>
<group delimiter=" ">
<text macro="format"/>
<text macro="description"/>
</group>
</else>
</choose>
</group>
<text macro="title-and-descriptions"/>
<text macro="container"/>
<text macro="event"/>
<text macro="publisher"/>
</group>
<text macro="event" prefix=". "/>
<text macro="access"/>
<text macro="publication-history"/>
</group>
<text macro="access" prefix=" "/>
<choose>
<if is-uncertain-date="original-date">
<group prefix=" [" suffix="]" delimiter=" ">
<text macro="original-published"/>
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else-if variable="original-date">
<group prefix=" (" suffix=")" delimiter=" ">
<text macro="original-published"/>
<text macro="original-date"/>
</group>
</else-if>
</choose>
</layout>
</bibliography>
</style>
111 changes: 64 additions & 47 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,19 +502,10 @@
<text variable="archive_location" prefix="(" suffix=")"/>
</group>
</if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</else-if>
<else>
<text macro="publisher" suffix="."/>
</else>
</choose>
</macro>
<macro name="title">
Expand Down Expand Up @@ -795,6 +786,25 @@
</else>
</choose>
</macro>
<macro name="title-and-descriptions">
<group delimiter=" ">
<text macro="title"/>
<choose>
<if variable="title interviewer" type="interview" match="any">
<group delimiter=" ">
<text macro="description"/>
<text macro="format"/>
</group>
</if>
<else>
<group delimiter=" ">
<text macro="format"/>
<text macro="description"/>
</group>
</else>
</choose>
</group>
</macro>
<macro name="archive">
<group delimiter=". ">
<group delimiter=", ">
Expand Down Expand Up @@ -1385,6 +1395,42 @@
</else-if>
</choose>
</macro>
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
<macro name="publication-history">
<choose>
<if type="patent" match="none">
<group prefix="(" suffix=")">
<choose>
<if variable="references">
<!-- This provides the option for more elaborate description
of publication history, such as full "reprinted" references
(example 26) or retracted references -->
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</else>
</choose>
</group>
</if>
<else>
<text variable="references" prefix="(" suffix=")"/>
</else>
</choose>
</macro>
<macro name="legal-cites">
<choose>
<if type="legal_case">
Expand Down Expand Up @@ -1491,57 +1537,28 @@
<key macro="title"/>
</sort>
<layout>
<group suffix=".">
<group delimiter=". ">
<group delimiter=" ">
<group delimiter=". " suffix=".">
<text macro="author"/>
<choose>
<if is-uncertain-date="issued">
<group prefix=" [" suffix="]" delimiter=" ">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="issued"/>
</group>
</if>
<else>
<text macro="issued" prefix=" (" suffix=")"/>
<text macro="issued" prefix="(" suffix=")"/>
</else>
</choose>
<group delimiter=" ">
<text macro="title"/>
<choose>
<if variable="title interviewer" type="interview" match="any">
<group delimiter=" ">
<text macro="description"/>
<text macro="format"/>
</group>
</if>
<else>
<group delimiter=" ">
<text macro="format"/>
<text macro="description"/>
</group>
</else>
</choose>
</group>
<text macro="title-and-descriptions"/>
<text macro="container"/>
<text macro="event"/>
<text macro="publisher"/>
</group>
<text macro="event" prefix=". "/>
<text macro="access"/>
<text macro="publication-history"/>
</group>
<text macro="access" prefix=" "/>
<choose>
<if is-uncertain-date="original-date">
<group prefix=" [" suffix="]" delimiter=" ">
<text macro="original-published"/>
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else-if variable="original-date">
<group prefix=" (" suffix=")" delimiter=" ">
<text macro="original-published"/>
<text macro="original-date"/>
</group>
</else-if>
</choose>
</layout>
</bibliography>
</style>
Loading

0 comments on commit 66f9974

Please sign in to comment.