Skip to content

Commit

Permalink
APA: Use Report series where genre isn't present
Browse files Browse the repository at this point in the history 
JCR: Correct in-text sort order
African Zoology: Basically rewrite based on new format
  • Loading branch information
@adam3smith
adam3smith committed Nov 7, 2015
1 parent 37de974 commit 6e68d11
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 48 deletions.
114 changes: 69 additions & 45 deletions african-zoology.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,74 @@
<title>African Zoology</title>
<id>http://www.zotero.org/styles/african-zoology</id>
<link href="http://www.zotero.org/styles/african-zoology" rel="self"/>
<link href="http://www.journals.co.za/ej/images/afzoo_auth.pdf" rel="documentation"/>
<link href="http://www.nisc.co.za/products/59/journals/african-zoology#downloads" rel="documentation"/>
<author>
<name>Aliza le Roux</name>
</author>
<contributor>
<name>Sebastian Karcher</name>
</contributor>
<category citation-format="author-date"/>
<category field="zoology"/>
<issn>1562-7020</issn>
<eissn>2224-073X</eissn>
<updated>2013-01-21T01:58:08+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale>
<terms>
<term name="edition" form="short">edn.</term>
</terms>
</locale>
<macro name="container-contributors">
<choose>
<if type="chapter paper-conference" match="any">
<names variable="editor translator" delimiter=", ">
<label form="short" prefix=" (" suffix=") " strip-periods="true"/>
<name and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
</names>
</if>
</choose>
</macro>
<macro name="secondary-contributors">
<choose>
<if type="chapter paper-conference" match="none">
<names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
<name and="text" initialize-with=". " delimiter=", "/>
<name sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never" name-as-sort-order="all"/>
<label form="short" prefix=" (" suffix=")" strip-periods="true"/>
</names>
</if>
</choose>
</macro>
<macro name="author">
<names variable="author">
<name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never">
<name-part name="family" text-case="uppercase"/>
<name-part name="given" text-case="uppercase"/>
</name>
<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", "/>
<label form="short" prefix=" (" suffix=")" strip-periods="true"/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<text variable="title"/>
<text macro="anonymous"/>
</substitute>
</names>
</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="symbol" delimiter=", " initialize-with=". "/>
<name form="short" and="text" delimiter=", " initialize-with=". "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<choose>
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
<text variable="title" form="short" font-style="italic"/>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
</else>
</choose>
<text macro="anonymous"/>
</substitute>
</names>
</macro>
<macro name="anonymous">
<text term="anonymous" form="short" text-case="capitalize-first"/>
</macro>
<macro name="publisher">
<text variable="genre" suffix=", "/>
<group delimiter=", ">
<text variable="publisher"/>
<text variable="publisher-place"/>
</group>
<choose>
<if type="article-journal article-magazine article-newspaper" match="none">
<group delimiter=". ">
<group delimiter=" ">
<text variable="genre"/>
<text variable="number"/>
</group>
<group delimiter=": ">
<text variable="publisher-place"/>
<text variable="publisher"/>
</group>
</group>
</if>
</choose>
</macro>
<macro name="issued">
<choose>
Expand Down Expand Up @@ -107,13 +107,28 @@
</else>
</choose>
</macro>
<macro name="title">
<choose>
<if type="book report" match="any">
<group delimiter=" ">
<text variable="title" font-style="italic"/>
<text macro="edition"/>
</group>
</if>
<else>
<text variable="title"/>
</else>
</choose>
</macro>
<macro name="edition">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="edition">
<number variable="edition" form="ordinal" prefix=" ("/>
<text term="edition" form="long" prefix=" " suffix=")"/>
<group delimiter=" " prefix="(" suffix=")">
<number variable="edition" form="ordinal"/>
<text term="edition" form="short" strip-periods="true"/>
</group>
</if>
<else>
<text variable="edition" prefix=" (" suffix=")"/>
Expand All @@ -129,17 +144,28 @@
<text variable="volume" prefix=" "/>
<text variable="page" prefix=": "/>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group prefix=". In: ">
<text variable="container-title" suffix=", "/>
<text macro="container-contributors" suffix=", "/>
<text macro="secondary-contributors"/>
<label variable="page" form="short"/>
<text variable="page" prefix=" "/>
<else-if type="chapter paper-conference" match="any">
<group prefix=". " delimiter=": ">
<text term="in" text-case="capitalize-first"/>
<group delimiter=", ">
<text macro="container-contributors"/>
<group delimiter=" ">
<text variable="container-title" font-style="italic"/>
<text macro="edition"/>
</group>
</group>
</group>
</else-if>
</choose>
</macro>
<macro name="pages">
<choose>
<if type="chapter paper-conference" match="any">
<label variable="page" form="short"/>
<text variable="page" prefix=" "/>
</if>
</choose>
</macro>
<macro name="citation-locator">
<group>
<label variable="locator" form="short"/>
Expand Down Expand Up @@ -167,12 +193,10 @@
<layout suffix=".">
<text macro="author" suffix="."/>
<text macro="issued" suffix=" "/>
<text variable="title"/>
<text macro="title"/>
<text macro="locators"/>
<text macro="edition"/>
<group delimiter=". " prefix=". ">
<text macro="publisher"/>
</group>
<text macro="publisher" prefix=". "/>
<text macro="pages" prefix=". "/>
</layout>
</bibliography>
</style>
11 changes: 9 additions & 2 deletions apa.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<category citation-format="author-date"/>
<category field="psychology"/>
<category field="generic-base"/>
<updated>2015-04-07T11:18:00+00:00</updated>
<updated>2015-10-25T09:01:49+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
Expand Down Expand Up @@ -228,7 +228,14 @@
<if type="report thesis" match="any">
<group prefix=" (" suffix=")" delimiter=", ">
<group delimiter=" ">
<text variable="genre"/>
<choose>
<if variable="genre" match="any">
<text variable="genre"/>
</if>
<else>
<text variable="collection-title"/>
</else>
</choose>
<text variable="number" prefix="No. "/>
</group>
<group delimiter=" ">
Expand Down
2 changes: 1 addition & 1 deletion journal-of-consumer-research.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@
</macro>
<citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
<sort>
<key macro="year-date"/>
<key macro="author-short"/>
<key macro="year-date"/>
</sort>
<layout prefix="(" suffix=")" delimiter="; ">
<group delimiter=", ">
Expand Down

0 comments on commit 6e68d11

Please sign in to comment.