Permalink
Browse files

Tweaking apa-cv to accord with discussion in https://github.com/citat… (

#3487)

Tweaking apa-cv to accord with discussion in #1619
  • Loading branch information...
reagle authored and adam3smith committed May 22, 2018
1 parent 7f3354e commit 5b84193431daf62fc01153f3d90074bc5d3b77c9
Showing with 26 additions and 92 deletions.
  1. +26 −92 apa-cv.csl
View
@@ -7,9 +7,13 @@
<link href="http://www.zotero.org/styles/apa-cv" rel="self"/>
<link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
<author>
+ <name>Joseph Reagle</name>
+ <email>joseph.2011@reagle.org</email>
+ </author>
+ <contributor>
<name>Simon Kornblith</name>
<email>simon@simonster.com</email>
- </author>
+ </contributor>
<contributor>
<name>Bruce D'Arcus</name>
</contributor>
@@ -31,8 +35,8 @@
<category citation-format="author-date"/>
<category field="psychology"/>
<category field="generic-base"/>
- <summary>APA style for CVs, sorting by date (descending), then title, then author</summary>
- <updated>2013-02-26T04:33:40+00:00</updated>
+ <summary>APA style for CVs, in-line citations becomes references; redundant bibliography is sorted by date (descending), then title, then author</summary>
+ <updated>2018-05-14T04:33:40+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">
@@ -95,50 +99,6 @@
</substitute>
</names>
</macro>
- <macro name="author-short">
- <choose>
- <if type="patent" variable="number" match="all">
- <text macro="patent-number"/>
- </if>
- <else>
- <names variable="author">
- <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- <choose>
- <if type="report">
- <text variable="publisher"/>
- <text variable="title" form="short" font-style="italic"/>
- </if>
- <else-if type="legal_case">
- <text variable="title" font-style="italic"/>
- </else-if>
- <else-if type="book graphic motion_picture song" match="any">
- <text variable="title" form="short" font-style="italic"/>
- </else-if>
- <else-if type="bill legislation" match="any">
- <text variable="title" form="short"/>
- </else-if>
- <else-if variable="reviewed-author">
- <choose>
- <if variable="reviewed-title" match="none">
- <text variable="title" form="short" font-style="italic" prefix="Review of "/>
- </if>
- <else>
- <text variable="title" form="short" quotes="true"/>
- </else>
- </choose>
- </else-if>
- <else>
- <text variable="title" form="short" quotes="true"/>
- </else>
- </choose>
- </substitute>
- </names>
- </else>
- </choose>
- </macro>
<macro name="patent-number">
<!-- genre: U.S. Patent number: 123,445-->
<group delimiter=" ">
@@ -440,31 +400,6 @@
</else>
</choose>
</macro>
- <macro name="issued-year">
- <choose>
- <if variable="issued">
- <group delimiter="/">
- <date variable="original-date">
- <date-part name="year"/>
- </date>
- <group>
- <date variable="issued">
- <date-part name="year"/>
- </date>
- <text variable="year-suffix"/>
- </group>
- </group>
- </if>
- <else-if variable="status">
- <text variable="status"/>
- <text variable="year-suffix" prefix="-"/>
- </else-if>
- <else>
- <text term="no date" form="short"/>
- <text variable="year-suffix" prefix="-"/>
- </else>
- </choose>
- </macro>
<macro name="edition">
<choose>
<if is-numeric="edition">
@@ -554,19 +489,6 @@
</else-if>
</choose>
</macro>
- <macro name="citation-locator">
- <group>
- <choose>
- <if locator="chapter">
- <label variable="locator" form="long" text-case="capitalize-first"/>
- </if>
- <else>
- <label variable="locator" form="short"/>
- </else>
- </choose>
- <text variable="locator" prefix=" "/>
- </group>
- </macro>
<macro name="container">
<choose>
<if type="post-weblog webpage" match="none">
@@ -677,17 +599,29 @@
</if>
</choose>
</macro>
- <citation et-al-min="6" 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" givenname-disambiguation-rule="primary-name">
+ <citation et-al-min="8" et-al-use-first="6" et-al-use-last="true">
<sort>
+ <key macro="issued-sort" sort="descending"/>
+ <key macro="title"/>
<key macro="author"/>
- <key macro="issued-sort"/>
</sort>
- <layout prefix="(" suffix=")" delimiter="; ">
- <group delimiter=", ">
- <text macro="author-short"/>
- <text macro="issued-year"/>
- <text macro="citation-locator"/>
+ <layout>
+ <group suffix=".">
+ <group delimiter=". ">
+ <text macro="author"/>
+ <text macro="issued"/>
+ <text macro="title-plus-extra"/>
+ <text macro="container"/>
+ </group>
+ <text macro="legal-cites"/>
+ <text macro="locators"/>
+ <group delimiter=", " prefix=". ">
+ <text macro="event"/>
+ <text macro="publisher"/>
+ </group>
</group>
+ <text macro="access" prefix=" "/>
+ <text macro="original-date" prefix=" "/>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">

0 comments on commit 5b84193

Please sign in to comment.