Skip to content

Commit 66f9974

Browse files
bwiernikbwiernik
authored
Always print publisher in APA 6th edition (JabRef#4899)
* 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.
1 parent 868809c commit 66f9974

File tree

4 files changed

+260
-200
lines changed

4 files changed

+260
-200
lines changed

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

Lines changed: 64 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -503,19 +503,10 @@
503503
<text variable="archive_location" prefix="(" suffix=")"/>
504504
</group>
505505
</if>
506-
<else>
507-
<text macro="publisher" suffix="."/>
508-
</else>
509506
</choose>
510507
</if>
511-
<else>
512-
<text macro="publisher" suffix="."/>
513-
</else>
514508
</choose>
515509
</else-if>
516-
<else>
517-
<text macro="publisher" suffix="."/>
518-
</else>
519510
</choose>
520511
</macro>
521512
<macro name="title">
@@ -796,6 +787,25 @@
796787
</else>
797788
</choose>
798789
</macro>
790+
<macro name="title-and-descriptions">
791+
<group delimiter=" ">
792+
<text macro="title"/>
793+
<choose>
794+
<if variable="title interviewer" type="interview" match="any">
795+
<group delimiter=" ">
796+
<text macro="description"/>
797+
<text macro="format"/>
798+
</group>
799+
</if>
800+
<else>
801+
<group delimiter=" ">
802+
<text macro="format"/>
803+
<text macro="description"/>
804+
</group>
805+
</else>
806+
</choose>
807+
</group>
808+
</macro>
799809
<macro name="archive">
800810
<group delimiter=". ">
801811
<group delimiter=", ">
@@ -1386,6 +1396,42 @@
13861396
</else-if>
13871397
</choose>
13881398
</macro>
1399+
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
1400+
<macro name="publication-history">
1401+
<choose>
1402+
<if type="patent" match="none">
1403+
<group prefix="(" suffix=")">
1404+
<choose>
1405+
<if variable="references">
1406+
<!-- This provides the option for more elaborate description
1407+
of publication history, such as full "reprinted" references
1408+
(example 26) or retracted references -->
1409+
<text variable="references"/>
1410+
</if>
1411+
<else>
1412+
<group delimiter=" ">
1413+
<text macro="original-published"/>
1414+
<choose>
1415+
<if is-uncertain-date="original-date">
1416+
<group prefix="[" suffix="]" delimiter=" ">
1417+
<text term="circa" form="short"/>
1418+
<text macro="original-date"/>
1419+
</group>
1420+
</if>
1421+
<else>
1422+
<text macro="original-date"/>
1423+
</else>
1424+
</choose>
1425+
</group>
1426+
</else>
1427+
</choose>
1428+
</group>
1429+
</if>
1430+
<else>
1431+
<text variable="references" prefix="(" suffix=")"/>
1432+
</else>
1433+
</choose>
1434+
</macro>
13891435
<macro name="legal-cites">
13901436
<choose>
13911437
<if type="legal_case">
@@ -1492,57 +1538,28 @@
14921538
<key macro="title"/>
14931539
</sort>
14941540
<layout>
1495-
<group suffix=".">
1496-
<group delimiter=". ">
1541+
<group delimiter=" ">
1542+
<group delimiter=". " suffix=".">
14971543
<text macro="author"/>
14981544
<choose>
14991545
<if is-uncertain-date="issued">
1500-
<group prefix=" [" suffix="]" delimiter=" ">
1546+
<group prefix="[" suffix="]" delimiter=" ">
15011547
<text term="circa" form="short"/>
15021548
<text macro="issued"/>
15031549
</group>
15041550
</if>
15051551
<else>
1506-
<text macro="issued" prefix=" (" suffix=")"/>
1552+
<text macro="issued" prefix="(" suffix=")"/>
15071553
</else>
15081554
</choose>
1509-
<group delimiter=" ">
1510-
<text macro="title"/>
1511-
<choose>
1512-
<if variable="title interviewer" type="interview" match="any">
1513-
<group delimiter=" ">
1514-
<text macro="description"/>
1515-
<text macro="format"/>
1516-
</group>
1517-
</if>
1518-
<else>
1519-
<group delimiter=" ">
1520-
<text macro="format"/>
1521-
<text macro="description"/>
1522-
</group>
1523-
</else>
1524-
</choose>
1525-
</group>
1555+
<text macro="title-and-descriptions"/>
15261556
<text macro="container"/>
1557+
<text macro="event"/>
1558+
<text macro="publisher"/>
15271559
</group>
1528-
<text macro="event" prefix=". "/>
1560+
<text macro="access"/>
1561+
<text macro="publication-history"/>
15291562
</group>
1530-
<text macro="access" prefix=" "/>
1531-
<choose>
1532-
<if is-uncertain-date="original-date">
1533-
<group prefix=" [" suffix="]" delimiter=" ">
1534-
<text macro="original-published"/>
1535-
<text term="circa" form="short"/>
1536-
<text macro="original-date"/>
1537-
</group>
1538-
</if>
1539-
<else-if variable="original-date">
1540-
<group prefix=" (" suffix=")" delimiter=" ">
1541-
<text macro="original-published"/>
1542-
<text macro="original-date"/>
1543-
</group>
1544-
</else-if>
1545-
</choose>
15461563
</layout>
15471564
</bibliography>
15481565
</style>

‎apa-6th-edition.csl‎

Lines changed: 64 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -502,19 +502,10 @@
502502
<text variable="archive_location" prefix="(" suffix=")"/>
503503
</group>
504504
</if>
505-
<else>
506-
<text macro="publisher" suffix="."/>
507-
</else>
508505
</choose>
509506
</if>
510-
<else>
511-
<text macro="publisher" suffix="."/>
512-
</else>
513507
</choose>
514508
</else-if>
515-
<else>
516-
<text macro="publisher" suffix="."/>
517-
</else>
518509
</choose>
519510
</macro>
520511
<macro name="title">
@@ -795,6 +786,25 @@
795786
</else>
796787
</choose>
797788
</macro>
789+
<macro name="title-and-descriptions">
790+
<group delimiter=" ">
791+
<text macro="title"/>
792+
<choose>
793+
<if variable="title interviewer" type="interview" match="any">
794+
<group delimiter=" ">
795+
<text macro="description"/>
796+
<text macro="format"/>
797+
</group>
798+
</if>
799+
<else>
800+
<group delimiter=" ">
801+
<text macro="format"/>
802+
<text macro="description"/>
803+
</group>
804+
</else>
805+
</choose>
806+
</group>
807+
</macro>
798808
<macro name="archive">
799809
<group delimiter=". ">
800810
<group delimiter=", ">
@@ -1385,6 +1395,42 @@
13851395
</else-if>
13861396
</choose>
13871397
</macro>
1398+
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
1399+
<macro name="publication-history">
1400+
<choose>
1401+
<if type="patent" match="none">
1402+
<group prefix="(" suffix=")">
1403+
<choose>
1404+
<if variable="references">
1405+
<!-- This provides the option for more elaborate description
1406+
of publication history, such as full "reprinted" references
1407+
(example 26) or retracted references -->
1408+
<text variable="references"/>
1409+
</if>
1410+
<else>
1411+
<group delimiter=" ">
1412+
<text macro="original-published"/>
1413+
<choose>
1414+
<if is-uncertain-date="original-date">
1415+
<group prefix="[" suffix="]" delimiter=" ">
1416+
<text term="circa" form="short"/>
1417+
<text macro="original-date"/>
1418+
</group>
1419+
</if>
1420+
<else>
1421+
<text macro="original-date"/>
1422+
</else>
1423+
</choose>
1424+
</group>
1425+
</else>
1426+
</choose>
1427+
</group>
1428+
</if>
1429+
<else>
1430+
<text variable="references" prefix="(" suffix=")"/>
1431+
</else>
1432+
</choose>
1433+
</macro>
13881434
<macro name="legal-cites">
13891435
<choose>
13901436
<if type="legal_case">
@@ -1491,57 +1537,28 @@
14911537
<key macro="title"/>
14921538
</sort>
14931539
<layout>
1494-
<group suffix=".">
1495-
<group delimiter=". ">
1540+
<group delimiter=" ">
1541+
<group delimiter=". " suffix=".">
14961542
<text macro="author"/>
14971543
<choose>
14981544
<if is-uncertain-date="issued">
1499-
<group prefix=" [" suffix="]" delimiter=" ">
1545+
<group prefix="[" suffix="]" delimiter=" ">
15001546
<text term="circa" form="short"/>
15011547
<text macro="issued"/>
15021548
</group>
15031549
</if>
15041550
<else>
1505-
<text macro="issued" prefix=" (" suffix=")"/>
1551+
<text macro="issued" prefix="(" suffix=")"/>
15061552
</else>
15071553
</choose>
1508-
<group delimiter=" ">
1509-
<text macro="title"/>
1510-
<choose>
1511-
<if variable="title interviewer" type="interview" match="any">
1512-
<group delimiter=" ">
1513-
<text macro="description"/>
1514-
<text macro="format"/>
1515-
</group>
1516-
</if>
1517-
<else>
1518-
<group delimiter=" ">
1519-
<text macro="format"/>
1520-
<text macro="description"/>
1521-
</group>
1522-
</else>
1523-
</choose>
1524-
</group>
1554+
<text macro="title-and-descriptions"/>
15251555
<text macro="container"/>
1556+
<text macro="event"/>
1557+
<text macro="publisher"/>
15261558
</group>
1527-
<text macro="event" prefix=". "/>
1559+
<text macro="access"/>
1560+
<text macro="publication-history"/>
15281561
</group>
1529-
<text macro="access" prefix=" "/>
1530-
<choose>
1531-
<if is-uncertain-date="original-date">
1532-
<group prefix=" [" suffix="]" delimiter=" ">
1533-
<text macro="original-published"/>
1534-
<text term="circa" form="short"/>
1535-
<text macro="original-date"/>
1536-
</group>
1537-
</if>
1538-
<else-if variable="original-date">
1539-
<group prefix=" (" suffix=")" delimiter=" ">
1540-
<text macro="original-published"/>
1541-
<text macro="original-date"/>
1542-
</group>
1543-
</else-if>
1544-
</choose>
15451562
</layout>
15461563
</bibliography>
15471564
</style>

0 commit comments

Comments
 (0)