commit d94ea54a04154fe2403a6f39a7cdd3d2c66a7e1f
parent 1ec7927cc82ac470ed235ad1638c0948da9b2e93
Author: Julian Onions <julian.onions@gmail.com>
Date: Wed, 19 Dec 2007 09:45:20 +0000
Making use of the new edition syntax
Diffstat:
29 files changed, 649 insertions(+), 279 deletions(-)
diff --git a/csl/aag.csl b/csl/aag.csl
@@ -92,6 +92,19 @@
</if>
</choose>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -125,10 +138,10 @@
</date>
<choose>
<if type="book">
- <group suffix=".">
- <text macro="title" prefix=" "/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text macro="editor" prefix=" "/>
+ <group suffix="." delimiter=" " prefix=" ">
+ <text macro="title" />
+ <text macro="edition" />
+ <text macro="editor" />
</group>
<text prefix=" " suffix="." macro="publisher"/>
</if>
diff --git a/csl/ama.csl b/csl/ama.csl
@@ -89,6 +89,19 @@
</choose>
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<sort>
@@ -113,7 +126,7 @@
<if type="book">
<group suffix=".">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" prefix=" " suffix=" ed."/>
+ <text macro="edition" prefix=" " />
<text macro="editor" prefix=" (" suffix=")"/>
</group>
<text prefix=" " suffix="" macro="publisher"/>
@@ -131,7 +144,7 @@
<text macro="editor"/>
<text variable="container-title" font-style="italic" prefix=" " suffix="."/>
<text variable="volume" prefix="Vol " suffix="."/>
- <text variable="edition" prefix=" " suffix=" ed."/>
+ <text macro="edition" prefix=" "/>
<text variable="collection-title" prefix=" " suffix="."/>
<group suffix=".">
<text macro="publisher" prefix=" "/>
diff --git a/csl/anal-chim-acta.csl b/csl/anal-chim-acta.csl
@@ -67,6 +67,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout delimiter=", " prefix="[" suffix="]">
@@ -81,7 +94,7 @@
<if type="book">
<text macro="title" suffix=", "/>
<group delimiter=", ">
- <text variable="edition"/>
+ <text macro="edition"/>
<text macro="publisher"/>
<text macro="issued"/>
</group>
diff --git a/csl/analytic-chemistry.csl b/csl/analytic-chemistry.csl
@@ -67,6 +67,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout delimiter=", " >
@@ -83,7 +96,7 @@
<text macro="title" suffix=", "/>
<group delimiter="; ">
<text macro="editor" prefix=" "/>
- <text variable="edition"/>
+ <text macro="edition"/>
<text macro="publisher"/>
<text macro="issued"/>
</group>
diff --git a/csl/antonie-van-leeuwenhoek.csl b/csl/antonie-van-leeuwenhoek.csl
@@ -65,6 +65,19 @@ International Journal of General and Molecular Microbiology.</summary>
<text variable="publisher-place"/>
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<macro name="year-date">
<date variable="issued">
<date-part name="year"/>
@@ -102,7 +115,7 @@ International Journal of General and Molecular Microbiology.</summary>
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
</group>
@@ -115,7 +128,7 @@ International Journal of General and Molecular Microbiology.</summary>
<text macro="editor"/>
<text variable="container-title" />
<text variable="collection-title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" edn."/>
+ <text macro="edition" />
</group>
</group>
<group suffix=".">
diff --git a/csl/apsa.csl b/csl/apsa.csl
@@ -84,6 +84,19 @@
</choose>
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -120,7 +133,7 @@
<if type="book">
<group prefix=" " delimiter=" ">
<text macro="title" suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" suffix="."/>
</group>
<text prefix=" " suffix="." macro="publisher"/>
diff --git a/csl/asa.csl b/csl/asa.csl
@@ -105,6 +105,19 @@
<label variable="page" form="short" suffix=". " text-case="capitalize-first"/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="3"/>
<option name="et-al-use-first" value="1"/>
@@ -152,7 +165,7 @@
<else-if type="thesis">
<text macro="title" prefix=" " suffix="." quotes="true"/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -161,7 +174,7 @@
<else-if type="book">
<group delimiter=" ">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
diff --git a/csl/bioinformatics.csl b/csl/bioinformatics.csl
@@ -68,6 +68,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="3"/>
<option name="et-al-use-first" value="1"/>
@@ -102,7 +115,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
</group>
diff --git a/csl/cell.csl b/csl/cell.csl
@@ -68,6 +68,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="2"/>
<option name="et-al-use-first" value="1"/>
@@ -104,7 +117,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
</group>
diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
@@ -1,215 +1,215 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
- <info>
- <title>Chicago Manual of Style (Author-Date format)</title>
- <id>http://www.zotero.org/styles/chicago-author-date</id>
- <author>
- <name>Julian Onions</name>
- <email>julian.onions@gmail.com</email>
- </author>
- <category term="author-date"/>
- <category term="generic-base"/>
- <updated/>
- <summary>The author-date variant of the Chicago style</summary>
- <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
- </info>
- <macro name="editor">
- <names variable="editor">
- <label form="short" text-case="capitalize-first" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
- </macro>
- <macro name="series-editor">
- <names variable="original-author">
- <label form="short" text-case="capitalize-first" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
- </macro>
- <macro name="anon">
- <text term="anonymous" form="short" text-case="capitalize-first"/>
- </macro>
- <macro name="author">
- <names variable="author">
- <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
- delimiter-precedes-last="always"/>
- <label form="short" prefix=", " suffix="." text-case="lowercase"/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- <text macro="anon"/>
- </substitute>
- </names>
- </macro>
- <macro name="author-short">
- <names variable="author">
- <name form="short" and="text" delimiter=", "/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- <text macro="anon"/>
- </substitute>
- </names>
- </macro>
- <macro name="access">
- <group>
- <text variable="URL"/>
- <group prefix=" (" suffix=")">
- <text term="accessed" text-case="capitalize-first" suffix=" "/>
- <date variable="accessed">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
- </macro>
- <macro name="title">
- <choose>
- <if type="thesis">
- <text variable="title"/>
- </if>
- <else-if type="book">
- <text variable="title" font-style="italic"/>
- </else-if>
- <else>
- <text variable="title"/>
- </else>
- </choose>
- </macro>
- <macro name="edition">
- <choose>
- <if datatype="number" variable="edition">
- <group delimiter=" ">
- <number variable="edition" form="ordinal"/>
- <text term="edition" form="short" suffix="."/>
- </group>
- </if>
- <else>
- <text variable="edition" suffix="."/>
- </else>
- </choose>
- </macro>
- <macro name="volumes">
- <group delimiter=" ">
- <number variable="number-of-volumes" form="numeric"/>
- <text term="volume" form="short" suffix="." plural="true"/>
- </group>
- </macro>
- <macro name="publisher">
- <group delimiter=": " >
- <text variable="publisher-place"/>
- <text variable="publisher"/>
- </group>
- </macro>
- <macro name="year-date">
- <date variable="issued">
- <date-part name="year"/>
- </date>
- </macro>
- <macro name="day-month">
- <date variable="issued">
- <date-part name="month"/>
- <date-part name="day" prefix=" "/>
- </date>
- </macro>
- <citation>
- <option name="et-al-min" value="4"/>
- <option name="et-al-use-first" value="1"/>
- <option name="et-al-subsequent-min" value="6"/>
- <option name="et-al-subsequent-use-first" value="1"/>
- <option name="disambiguate-add-year-suffix" value="true"/>
- <option name="disambiguate-add-names" value="true"/>
- <option name="disambiguate-add-givenname" value="true"/>
- <option name="collapse" value="year"/>
- <layout prefix="(" suffix=")" delimiter="; ">
- <group delimiter=", ">
- <group delimiter=" ">
- <text macro="author-short"/>
- <text macro="year-date"/>
- </group>
- <text variable="locator"/>
- </group>
- </layout>
- </citation>
- <bibliography>
- <option name="hanging-indent" value="true"/>
- <option name="et-al-min" value="6"/>
- <option name="et-al-use-first" value="1"/>
- <sort>
- <key macro="author"/>
- <key variable="title"/>
- </sort>
- <layout suffix=".">
- <group delimiter=" ">
- <text macro="author" suffix="."/>
- <text macro="year-date" suffix="."/>
- </group>
- <choose>
- <if type="article-newspaper article-magazine" match="any">
- <group delimiter=" ">
- <text macro="title" prefix=" " suffix="."/>
- </group>
- <group prefix=" " delimiter=", ">
- <text variable="container-title" font-style="italic"/>
- <text macro="day-month"/>
- <text variable="edition"/>
- </group>
- </if>
- <else-if type="thesis">
- <text macro="title" prefix=" " suffix="."/>
- <group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
- <text macro="editor" suffix="."/>
- <text variable="genre"/>
- <text macro="publisher"/>
- </group>
- </else-if>
- <else-if type="book">
- <group delimiter=" ">
- <text macro="title" prefix=" " suffix="."/>
- <text macro="edition"/>
- <text macro="volumes"/>
- <text macro="editor" suffix="."/>
- <text macro="publisher"/>
- </group>
- </else-if>
- <else-if type="chapter">
- <group delimiter=" ">
- <text macro="title" prefix=" " suffix="."/>
- <group class="container" delimiter=", ">
- <group delimiter=" ">
- <text term="in" text-case="capitalize-first"/>
- <text variable="container-title" font-style="italic"/>
- </group>
- <text macro="editor" prefix=" "/>
- <group delimiter=" ">
- <text variable="volume" prefix="Vol. " suffix=" of"/>
- <text variable="collection-title" font-style="italic"/>
- <text macro="series-editor"/>
- </group>
- <text variable="page"/>
- <text macro="publisher" prefix=" "/>
- </group>
- </group>
- </else-if>
- <else>
- <group suffix="." >
- <text macro="title" prefix=" " />
- <text macro="editor" prefix=" "/>
- </group>
- <group class="container" prefix=" " suffix="." delimiter=" ">
- <text variable="container-title" font-style="italic"/>
- <group delimiter=":">
- <group delimiter=", ">
- <text variable="volume" />
- <text variable="issue" prefix="no. "/>
- </group>
- <text variable="page"/>
- </group>
- </group>
- </else>
- </choose>
- <text prefix=" " macro="access" suffix="."/>
- </layout>
- </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+ <info>
+ <title>Chicago Manual of Style (Author-Date format)</title>
+ <id>http://www.zotero.org/styles/chicago-author-date</id>
+ <author>
+ <name>Julian Onions</name>
+ <email>julian.onions@gmail.com</email>
+ </author>
+ <category term="author-date"/>
+ <category term="generic-base"/>
+ <updated/>
+ <summary>The author-date variant of the Chicago style</summary>
+ <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+ </info>
+ <macro name="editor">
+ <names variable="editor">
+ <label form="short" text-case="capitalize-first" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </macro>
+ <macro name="series-editor">
+ <names variable="original-author">
+ <label form="short" text-case="capitalize-first" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </macro>
+ <macro name="anon">
+ <text term="anonymous" form="short" text-case="capitalize-first"/>
+ </macro>
+ <macro name="author">
+ <names variable="author">
+ <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
+ delimiter-precedes-last="always"/>
+ <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+ <substitute>
+ <names variable="editor"/>
+ <names variable="translator"/>
+ <text macro="anon"/>
+ </substitute>
+ </names>
+ </macro>
+ <macro name="author-short">
+ <names variable="author">
+ <name form="short" and="text" delimiter=", "/>
+ <substitute>
+ <names variable="editor"/>
+ <names variable="translator"/>
+ <text macro="anon"/>
+ </substitute>
+ </names>
+ </macro>
+ <macro name="access">
+ <group>
+ <text variable="URL"/>
+ <group prefix=" (" suffix=")">
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </group>
+ </macro>
+ <macro name="title">
+ <choose>
+ <if type="thesis">
+ <text variable="title"/>
+ </if>
+ <else-if type="book">
+ <text variable="title" font-style="italic"/>
+ </else-if>
+ <else>
+ <text variable="title"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="volumes">
+ <group delimiter=" ">
+ <number variable="number-of-volumes" form="numeric"/>
+ <text term="volume" form="short" suffix="." plural="true"/>
+ </group>
+ </macro>
+ <macro name="publisher">
+ <group delimiter=": " >
+ <text variable="publisher-place"/>
+ <text variable="publisher"/>
+ </group>
+ </macro>
+ <macro name="year-date">
+ <date variable="issued">
+ <date-part name="year"/>
+ </date>
+ </macro>
+ <macro name="day-month">
+ <date variable="issued">
+ <date-part name="month"/>
+ <date-part name="day" prefix=" "/>
+ </date>
+ </macro>
+ <citation>
+ <option name="et-al-min" value="4"/>
+ <option name="et-al-use-first" value="1"/>
+ <option name="et-al-subsequent-min" value="6"/>
+ <option name="et-al-subsequent-use-first" value="1"/>
+ <option name="disambiguate-add-year-suffix" value="true"/>
+ <option name="disambiguate-add-names" value="true"/>
+ <option name="disambiguate-add-givenname" value="true"/>
+ <option name="collapse" value="year"/>
+ <layout prefix="(" suffix=")" delimiter="; ">
+ <group delimiter=", ">
+ <group delimiter=" ">
+ <text macro="author-short"/>
+ <text macro="year-date"/>
+ </group>
+ <text variable="locator"/>
+ </group>
+ </layout>
+ </citation>
+ <bibliography>
+ <option name="hanging-indent" value="true"/>
+ <option name="et-al-min" value="6"/>
+ <option name="et-al-use-first" value="1"/>
+ <sort>
+ <key macro="author"/>
+ <key variable="title"/>
+ </sort>
+ <layout suffix=".">
+ <group delimiter=" ">
+ <text macro="author" suffix="."/>
+ <text macro="year-date" suffix="."/>
+ </group>
+ <choose>
+ <if type="article-newspaper article-magazine" match="any">
+ <group delimiter=" ">
+ <text macro="title" prefix=" " suffix="."/>
+ </group>
+ <group prefix=" " delimiter=", ">
+ <text variable="container-title" font-style="italic"/>
+ <text macro="day-month"/>
+ <text variable="edition"/>
+ </group>
+ </if>
+ <else-if type="thesis">
+ <text macro="title" prefix=" " suffix="."/>
+ <group prefix=" " delimiter=", ">
+ <text variable="edition" suffix=" ed."/>
+ <text macro="editor" suffix="."/>
+ <text variable="genre"/>
+ <text macro="publisher"/>
+ </group>
+ </else-if>
+ <else-if type="book">
+ <group delimiter=" ">
+ <text macro="title" prefix=" " suffix="."/>
+ <text macro="edition"/>
+ <text macro="volumes"/>
+ <text macro="editor" suffix="."/>
+ <text macro="publisher"/>
+ </group>
+ </else-if>
+ <else-if type="chapter">
+ <group delimiter=" ">
+ <text macro="title" prefix=" " suffix="."/>
+ <group class="container" delimiter=", ">
+ <group delimiter=" ">
+ <text term="in" text-case="capitalize-first"/>
+ <text variable="container-title" font-style="italic"/>
+ </group>
+ <text macro="editor" prefix=" "/>
+ <group delimiter=" ">
+ <text variable="volume" prefix="Vol. " suffix=" of"/>
+ <text variable="collection-title" font-style="italic"/>
+ <text macro="series-editor"/>
+ </group>
+ <text variable="page"/>
+ <text macro="publisher" prefix=" "/>
+ </group>
+ </group>
+ </else-if>
+ <else>
+ <group suffix="." >
+ <text macro="title" prefix=" " />
+ <text macro="editor" prefix=" "/>
+ </group>
+ <group class="container" prefix=" " suffix="." delimiter=" ">
+ <text variable="container-title" font-style="italic"/>
+ <group delimiter=":">
+ <group delimiter=", ">
+ <text variable="volume" />
+ <text variable="issue" prefix="no. "/>
+ </group>
+ <text variable="page"/>
+ </group>
+ </group>
+ </else>
+ </choose>
+ <text prefix=" " macro="access" suffix="."/>
+ </layout>
+ </bibliography>
+</style>
diff --git a/csl/cse.csl b/csl/cse.csl
@@ -87,6 +87,19 @@
</if>
</choose>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<sort>
@@ -109,10 +122,10 @@
<text macro="author" suffix=""/>
<choose>
<if type="book">
- <group suffix=".">
- <text macro="title" prefix=" " suffix="."/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text macro="editor" prefix=" (" suffix=")"/>
+ <group prefix=" " suffix="." delimiter=" ">
+ <text macro="title" suffix="."/>
+ <text macro="edition" />
+ <text macro="editor" prefix="(" suffix=")"/>
</group>
<text prefix=" " suffix="" macro="publisher"/>
<group suffix="." prefix="; " delimiter=" ">
@@ -124,15 +137,15 @@
</if>
<else-if type="chapter">
<text macro="title" prefix=" " suffix="."/>
- <group class="container" prefix=" ">
- <text term="in" text-case="capitalize-first" suffix=": "/>
+ <group class="container" prefix=" " delimiter=" ">
+ <text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor"/>
- <text variable="container-title" prefix=" " suffix="."/>
- <text variable="volume" prefix=" Vol. " suffix="."/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text variable="collection-title" prefix=" " suffix="."/>
+ <text variable="container-title" suffix="."/>
+ <text variable="volume" prefix="Vol. " suffix="."/>
+ <text macro="edition"/>
+ <text variable="collection-title" suffix="."/>
<group suffix=".">
- <text macro="publisher" prefix=" "/>
+ <text macro="publisher"/>
<group suffix="." prefix="; " delimiter=". ">
<date variable="issued">
<date-part name="year"/>
diff --git a/csl/fems.csl b/csl/fems.csl
@@ -97,6 +97,19 @@ FEMS Yeast Research</summary>
<label variable="page" suffix=". " form="short"/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="10"/>
<option name="et-al-use-first" value="1"/>
@@ -143,7 +156,7 @@ FEMS Yeast Research</summary>
<else-if type="thesis">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -152,7 +165,7 @@ FEMS Yeast Research</summary>
<else-if type="book">
<group delimiter=" ">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
diff --git a/csl/genesdev.csl b/csl/genesdev.csl
@@ -93,6 +93,19 @@
<label variable="page" suffix=". " form="short"/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="10"/>
<option name="et-al-use-first" value="1"/>
@@ -139,7 +152,7 @@
<else-if type="thesis">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -148,7 +161,7 @@
<else-if type="book">
<group delimiter=" ">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
diff --git a/csl/genomebiology.csl b/csl/genomebiology.csl
@@ -66,6 +66,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout prefix="[" suffix="]" delimiter=",">
@@ -82,7 +95,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title" suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" />
<text macro="publisher" suffix=";"/>
<text macro="cite-date"/>
diff --git a/csl/harvard1.csl b/csl/harvard1.csl
@@ -85,6 +85,19 @@
</else>
</choose>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -119,10 +132,10 @@
</date>
<choose>
<if type="book">
- <group suffix=",">
- <text macro="title" prefix=" "/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text macro="editor" prefix=" "/>
+ <group prefix=" " delimiter=" " suffix=",">
+ <text macro="title" />
+ <text macro="edition"/>
+ <text macro="editor"/>
</group>
<text prefix=" " suffix="." macro="publisher"/>
</if>
diff --git a/csl/harvard2.csl b/csl/harvard2.csl
@@ -87,6 +87,19 @@
</choose>
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -123,10 +136,10 @@
</date>
<choose>
<if type="book">
- <group suffix=".">
- <text macro="title" prefix=" "/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text macro="editor" prefix=" (" suffix=")"/>
+ <group prefix=" " delimiter=" " suffix=".">
+ <text macro="title" />
+ <text macro="edition" />
+ <text macro="editor" prefix="(" suffix=")"/>
</group>
<text prefix=" " suffix="." macro="publisher"/>
</if>
diff --git a/csl/harvard3.csl b/csl/harvard3.csl
@@ -93,6 +93,19 @@
<label variable="page" form="short" suffix=". "/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -127,10 +140,10 @@
</date>
<choose>
<if type="book">
- <group suffix=",">
- <text macro="title" prefix=" "/>
- <text variable="edition" prefix=" " suffix=" ed."/>
- <text macro="editor" prefix=" "/>
+ <group prefix=" " delimiter=" " suffix=",">
+ <text macro="title" />
+ <text macro="edition"/>
+ <text macro="editor"/>
</group>
<text prefix=" " suffix="." macro="publisher"/>
</if>
diff --git a/csl/jbact.csl b/csl/jbact.csl
@@ -34,6 +34,19 @@
<text variable="publisher-place" />
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<sort>
@@ -61,7 +74,7 @@
<text macro="editor"/>
<text variable="container-title" />
<text variable="collection-title" prefix=" " suffix="."/>
- <text variable="edition" />
+ <text macro="edition" />
<text variable="volume" prefix="vol. " suffix="."/>
</group>
<text macro="publisher"/>
diff --git a/csl/meteoritics.csl b/csl/meteoritics.csl
@@ -92,6 +92,19 @@
<text variable="page"/>
<label variable="page" prefix=" " suffix="." form="short"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<macro name="container">
<text term="in" text-case="capitalize-first" suffix=" "/>
<text variable="container-title" font-style="italic"/>
@@ -140,7 +153,7 @@
<else-if type="thesis">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -150,7 +163,7 @@
<group delimiter=". ">
<group delimiter=" ">
<text macro="title" prefix=" " suffix=","/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
@@ -163,7 +176,7 @@
<group class="container" delimiter=" ">
<group delimiter=", ">
<text macro="container"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition" />
<text macro="editor" />
</group>
</group>
diff --git a/csl/neuroreport.csl b/csl/neuroreport.csl
@@ -29,6 +29,19 @@
<date-part name="year" suffix=". "/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<sort>
@@ -47,13 +60,16 @@
<text macro="author"/>
<choose>
<if type="book">
- <text variable="title" suffix=". " font-style="italic"/>
- <text variable="edition" prefix=" " suffix=" ed. "/>
- <text macro="publisher" prefix=" "/>
+ <group delimiter=" ">
+ <text variable="title" suffix="." font-style="italic"/>
+ <text macro="edition"/>
+ <text macro="publisher" />
+ </group>
</if>
<else-if type="chapter">
<text variable="title" suffix=". "/>
- <group prefix=" In: " delimiter=" " suffix=". ">
+ <group delimiter=" " suffix=". ">
+ <text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor" suffix="."/>
<text variable="container-title" font-style="italic"/>
</group>
diff --git a/csl/nlm.csl b/csl/nlm.csl
@@ -55,6 +55,19 @@
</choose>
</group>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<sort>
@@ -74,7 +87,7 @@
<text macro="title" suffix=". "/>
<choose>
<if type="book">
- <text variable="edition" prefix=" " suffix=" ed. "/>
+ <text macro="edition" prefix=" " suffix=" "/>
<text macro="publisher" prefix=" "/>
</if>
<else-if type="chapter">
diff --git a/csl/nuc-acid-res.csl b/csl/nuc-acid-res.csl
@@ -61,6 +61,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout prefix="(" suffix=")" delimiter=", ">
@@ -79,7 +92,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
</group>
diff --git a/csl/ou-harvard.csl b/csl/ou-harvard.csl
@@ -102,6 +102,19 @@
<label variable="page" form="short" suffix=". "/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/>
@@ -138,7 +151,7 @@
<if type="book">
<group suffix="," delimiter=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
</group>
<group delimiter=", " prefix=" ">
diff --git a/csl/plos.csl b/csl/plos.csl
@@ -61,6 +61,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout prefix="[" suffix="]" delimiter=",">
@@ -78,7 +91,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title" suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
<text variable="page" suffix=" "/>
diff --git a/csl/pnas.csl b/csl/pnas.csl
@@ -59,6 +59,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout prefix="(" suffix=")" delimiter=", ">
@@ -79,7 +92,7 @@
<if type="book">
<group delimiter=" " prefix=" ">
<text macro="title"/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" />
<text macro="publisher" />
</group>
diff --git a/csl/rna.csl b/csl/rna.csl
@@ -93,6 +93,19 @@
<label variable="page" suffix=". " form="short"/>
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="10"/>
<option name="et-al-use-first" value="1"/>
@@ -139,7 +152,7 @@
<else-if type="thesis">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -148,7 +161,7 @@
<else-if type="book">
<group delimiter=" ">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
diff --git a/csl/royal-society-chemistry.csl b/csl/royal-society-chemistry.csl
@@ -68,6 +68,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text value="edn" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout delimiter=", " vertical-align="sup">
@@ -91,7 +104,7 @@
<text macro="title" suffix=", "/>
<group delimiter=", ">
<text macro="publisher"/>
- <text variable="edition" suffix=" edn."/>
+ <text macro="edition"/>
<text macro="issued"/>
<text variable="volume" prefix="vol. "/>
</group>
@@ -100,7 +113,7 @@
<group delimiter=", ">
<text macro="book-container"/>
<text macro="publisher" />
- <text variable="edition" suffix=" edn."/>
+ <text macro="edition"/>
<text macro="issued"/>
<text variable="volume" prefix="vol. "/>
<text macro="pages"/>
diff --git a/csl/science.csl b/csl/science.csl
@@ -61,6 +61,19 @@
<date-part name="year"/>
</date>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <text term="edition" form="short" suffix="."/>
+ <number variable="edition" form="numeric"/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="collapse" value="citation-number"/>
<layout prefix="(" suffix=")" delimiter=", " font-style="italic">
@@ -87,7 +100,7 @@
</group>
<group prefix=" (" suffix=")" delimiter=", ">
<text macro="publisher"/>
- <text variable="edition"/>
+ <text macro="edition"/>
<text macro="issued"/>
</group>
<text macro="pages" prefix=", "/>
diff --git a/csl/yeast.csl b/csl/yeast.csl
@@ -13,6 +13,9 @@
<summary>The Yeast Journal style</summary>
<link href="http://www3.interscience.wiley.com/cgi-bin/jabout/3895/ForAuthors.html?CRETRY=1%26SRETRY=0" rel="documentation"/>
</info>
+ <macro name="anon">
+ <text term="anonymous" form="short" text-case="capitalize-first"/>
+ </macro>
<macro name="editor">
<names variable="editor">
<name name-as-sort-order="all" sort-separator=" " delimiter=", "
@@ -87,6 +90,19 @@
<macro name="page">
<text variable="page"/>
</macro>
+ <macro name="edition">
+ <choose>
+ <if datatype="number" variable="edition">
+ <group delimiter=" ">
+ <number variable="edition" form="ordinal"/>
+ <text term="edition" form="short" suffix="."/>
+ </group>
+ </if>
+ <else>
+ <text variable="edition" suffix="."/>
+ </else>
+ </choose>
+ </macro>
<citation>
<option name="et-al-min" value="10"/>
<option name="et-al-use-first" value="1"/>
@@ -127,13 +143,13 @@
<group prefix=" " delimiter=", ">
<text variable="container-title" font-style="italic"/>
<text macro="day-month"/>
- <text variable="edition"/>
+ <text macro="edition"/>
</group>
</if>
<else-if type="thesis">
<text macro="title" prefix=" " suffix="."/>
<group prefix=" " delimiter=", ">
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" suffix="."/>
<text variable="genre"/>
<text macro="publisher"/>
@@ -142,7 +158,7 @@
<else-if type="book">
<group delimiter=" ">
<text macro="title" prefix=" " suffix="."/>
- <text variable="edition" suffix=" ed."/>
+ <text macro="edition"/>
<text macro="editor" suffix="."/>
<text macro="publisher"/>
</group>
