Skip to content
Browse files

Merge pull request #287 from karnesky/master

Improvements to Elsevier Harvard styles
  • Loading branch information...
2 parents 7a9e568 + fca2c28 commit 630f780d22394f4b64287d2af5da8c5be40b4f37 @rmzelle rmzelle committed Nov 16, 2012
Showing with 42 additions and 46 deletions.
  1. +11 −15 elsevier-harvard-without-titles.csl
  2. +15 −15 elsevier-harvard.csl
  3. +16 −16 elsevier-harvard2.csl
View
26 elsevier-harvard-without-titles.csl
@@ -91,9 +91,17 @@
<macro name="access">
<choose>
<if type="webpage">
- <group>
- <text value="URL" suffix=" "/>
+ <group delimiter=" ">
+ <text value="URL"/>
<text variable="URL"/>
+ <group prefix="(" suffix=").">
+ <text term="accessed" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" form="numeric" suffix="."/>
+ <date-part name="day" suffix="."/>
+ <date-part name="year" form="short"/>
+ </date>
+ </group>
</group>
</if>
</choose>
@@ -151,18 +159,6 @@
<date-part name="year"/>
</date>
</if>
- <else-if variable="accessed">
- <choose>
- <if type="webpage">
- <date variable="accessed">
- <date-part name="year"/>
- </date>
- </if>
- <else>
- <text term="no date" form="short"/>
- </else>
- </choose>
- </else-if>
<else>
<text term="no date" form="short"/>
</else>
@@ -209,7 +205,7 @@
</else-if>
</choose>
</macro>
- <citation et-al-min="3" 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" collapse="year">
+ <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
<sort>
<key macro="issued"/>
<key macro="author"/>
View
30 elsevier-harvard.csl
@@ -92,9 +92,17 @@
<macro name="access">
<choose>
<if type="webpage">
- <group>
- <text value="URL" suffix=" "/>
+ <group delimiter=" ">
+ <text value="URL"/>
<text variable="URL"/>
+ <group prefix="(" suffix=").">
+ <text term="accessed" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" form="numeric" suffix="."/>
+ <date-part name="day" suffix="."/>
+ <date-part name="year" form="short"/>
+ </date>
+ </group>
</group>
</if>
</choose>
@@ -152,18 +160,6 @@
<date-part name="year"/>
</date>
</if>
- <else-if variable="accessed">
- <choose>
- <if type="webpage">
- <date variable="accessed">
- <date-part name="year"/>
- </date>
- </if>
- <else>
- <text term="no date" form="short"/>
- </else>
- </choose>
- </else-if>
<else>
<text term="no date" form="short"/>
</else>
@@ -210,7 +206,11 @@
</else-if>
</choose>
</macro>
- <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year" cite-group-delimiter=", ">
+ <!--
+ cite-group-delimiter will be available with csl 1.0.1, but is not valid csl 1.0 & it doesn't work reliably with the released zotero version
+ <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+ -->
+ <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
<sort>
<key macro="author"/>
<key macro="issued" sort="descending"/>
View
32 elsevier-harvard2.csl
@@ -77,9 +77,17 @@
<macro name="access">
<choose>
<if type="webpage">
- <group>
- <text value="URL" suffix=" "/>
+ <group delimiter=" ">
+ <text value="URL"/>
<text variable="URL"/>
+ <group prefix="(" suffix=").">
+ <text term="accessed" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" form="numeric" suffix="."/>
+ <date-part name="day" suffix="."/>
+ <date-part name="year" form="short"/>
+ </date>
+ </group>
</group>
</if>
</choose>
@@ -137,19 +145,7 @@
<date-part name="year"/>
</date>
</if>
- <else-if variable="accessed">
- <choose>
- <if type="webpage">
- <date variable="accessed">
- <date-part name="year"/>
- </date>
- </if>
- <else>
- <text term="no date" form="short"/>
- </else>
- </choose>
- </else-if>
- <else>
+ <else>
<text term="no date" form="short"/>
</else>
</choose>
@@ -195,7 +191,11 @@
</else-if>
</choose>
</macro>
- <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year" cite-group-delimiter=", ">
+ <!--
+ cite-group-delimiter will be available with csl 1.0.1, but is not valid csl 1.0 & it doesn't work reliably with the released zotero version
+ <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+ -->
+ <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
<sort>
<key macro="author"/>
<key macro="issued" sort="descending"/>

0 comments on commit 630f780

Please sign in to comment.
Something went wrong with that request. Please try again.