commit b67a636c950e717d6a27db0345cdb37c7ba65628
parent cee5e9aae69f94fb54298c33fa76e9711cc0d3c0
Author: Dan Stillman <dstillman@zotero.org>
Date: Tue, 13 May 2008 01:24:54 +0000
Made MLA w/italics the default MLA; moved old version to MLA (underline)
Diffstat:
| D | csl/mla-italic.csl | | | 173 | ------------------------------------------------------------------------------- |
| A | csl/mla-underline.csl | | | 170 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | csl/mla.csl | | | 31 | +++++++++++++++++-------------- |
3 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/csl/mla-italic.csl b/csl/mla-italic.csl
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
- <info>
- <title>Modern Language Association (italic)</title>
- <id>http://www.zotero.org/styles/mla-italic</id>
- <link href="http://www.zotero.org/styles/mla"/>
- <author>
- <name>Simon Kornblith</name>
- <email>simon@simonster.com</email>
- </author>
- <contributor>
- <name> modified by Christian Werthschulte</name>
- <email>Christian.Werthschulte@rub.de</email>
- </contributor>
- <category term="generic-base"/>
- <category term="author-date"/>
- <updated></updated>
- </info>
- <macro name="editor-translator">
- <names variable="editor translator" delimiter=". ">
- <label form="verb-short" text-case="capitalize-first" suffix=". "/>
- <name and="symbol" delimiter=", "/>
- </names>
- </macro>
- <macro name="author">
- <names variable="author">
- <name name-as-sort-order="first" and="text" sort-separator=", "
- delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=", " suffix="."/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- <text macro="title"/>
- </substitute>
- </names>
- </macro>
- <macro name="author-short">
- <names variable="author">
- <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
- <substitute>
- <names variable="editor"/>
- <names variable="translator"/>
- <text macro="title-short"/>
- </substitute>
- </names>
- </macro>
- <macro name="access">
- <group delimiter=" ">
- <date variable="accessed">
- <date-part name="day" suffix=" "/>
- <date-part name="month" form="short" include-period="true" suffix=" "/>
- <date-part name="year"/>
- </date>
- <text variable="URL" prefix="<" suffix=">"/>
- </group>
- </macro>
- <macro name="title">
- <choose>
- <if type="book">
- <text variable="title" font-style="italic"/>
- </if>
- <else>
- <text variable="title" quotes="true"/>
- </else>
- </choose>
- </macro>
- <macro name="title-short">
- <choose>
- <if type="book">
- <text variable="title" form="short" font-style="italic"/>
- </if>
- <else>
- <text variable="title" form="short" quotes="true"/>
- </else>
- </choose>
- </macro>
- <macro name="publisher-year">
- <group delimiter=", ">
- <group delimiter=": ">
- <text variable="publisher-place"/>
- <text variable="publisher"/>
- </group>
- <date variable="issued">
- <date-part name="year"/>
- </date>
- </group>
- </macro>
- <citation>
- <option name="et-al-min" value="4"/>
- <option name="et-al-use-first" value="1"/>
- <option name="disambiguate-add-names" value="true"/>
- <option name="disambiguate-add-givenname" value="true"/>
- <layout prefix="(" suffix=")" delimiter="; ">
- <group delimiter=" ">
- <choose>
- <if variable="author editor translator" match="any">
- <group delimiter=", ">
- <text macro="author-short"/>
- <choose>
- <if disambiguate="true">
- <text macro="title-short"/>
- </if>
- </choose>
- </group>
- </if>
- <else>
- <text macro="title-short"/>
- </else>
- </choose>
- <text variable="locator"/>
- </group>
- </layout>
- </citation>
- <bibliography>
- <option name="hanging-indent" value="true"/>
- <option name="et-al-min" value="4"/>
- <option name="et-al-use-first" value="1"/>
- <option name="line-spacing" value="2"/>
- <option name="subsequent-author-substitute" value="---"/>
- <sort>
- <key macro="author"/>
- <key variable="title"/>
- </sort>
- <layout>
- <text macro="author" suffix="."/>
- <text macro="title" prefix=" " suffix="."/>
- <choose>
- <if type="book">
- <text macro="editor-translator" prefix=" " suffix="."/>
- <text macro="publisher-year" prefix=" " suffix="."/>
- </if>
- <else-if type="chapter">
- <group class="container">
- <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
- <text macro="editor-translator" prefix=" " suffix="."/>
- <text macro="publisher-year" prefix=" " suffix="."/>
- </group>
- <text variable="page" prefix=" " suffix="."/>
- </else-if>
- <else>
- <group class="container" prefix=" " suffix="." delimiter=": ">
- <group delimiter=" ">
- <text macro="editor-translator" suffix="."/>
- <text variable="container-title" font-style="italic"/>
- <choose>
- <if type="article-journal">
- <group delimiter=" ">
- <group delimiter=".">
- <text variable="volume"/>
- <text variable="issue"/>
- </group>
- <date variable="issued" prefix="(" suffix=")">
- <date-part name="year"/>
- </date>
- </group>
- </if>
- <else>
- <date variable="issued">
- <date-part name="day" suffix=" "/>
- <date-part name="month" form="short" include-period="true" suffix=" "/>
- <date-part name="year"/>
- </date>
- </else>
- </choose>
- </group>
- <text variable="page"/>
- </group>
- </else>
- </choose>
- <text prefix=" " suffix="." macro="access"/>
- </layout>
- </bibliography>
-</style>
diff --git a/csl/mla-underline.csl b/csl/mla-underline.csl
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+ <info>
+ <title>Modern Language Association (underline)</title>
+ <id>http://www.zotero.org/styles/mla-underline</id>
+ <link href="http://www.zotero.org/styles/mla-underline"/>
+ <author>
+ <name>Simon Kornblith</name>
+ <email>simon@simonster.com</email>
+ </author>
+ <category term="generic-base"/>
+ <category term="author-date"/>
+ <updated></updated>
+ </info>
+ <macro name="editor-translator">
+ <names variable="editor translator" delimiter=". ">
+ <label form="verb-short" text-case="capitalize-first" suffix=". "/>
+ <name and="symbol" delimiter=", "/>
+ </names>
+ </macro>
+ <macro name="author">
+ <names variable="author">
+ <name name-as-sort-order="first" and="text" sort-separator=", "
+ delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=", " suffix="."/>
+ <substitute>
+ <names variable="editor"/>
+ <names variable="translator"/>
+ <text macro="title"/>
+ </substitute>
+ </names>
+ </macro>
+ <macro name="author-short">
+ <names variable="author">
+ <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+ <substitute>
+ <names variable="editor"/>
+ <names variable="translator"/>
+ <text macro="title-short"/>
+ </substitute>
+ </names>
+ </macro>
+ <macro name="access">
+ <group delimiter=" ">
+ <date variable="accessed">
+ <date-part name="day" suffix=" "/>
+ <date-part name="month" form="short" include-period="true" suffix=" "/>
+ <date-part name="year"/>
+ </date>
+ <text variable="URL" prefix="<" suffix=">"/>
+ </group>
+ </macro>
+ <macro name="title">
+ <choose>
+ <if type="book">
+ <text variable="title" text-decoration="underline"/>
+ </if>
+ <else>
+ <text variable="title" quotes="true"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="title-short">
+ <choose>
+ <if type="book">
+ <text variable="title" form="short" text-decoration="underline"/>
+ </if>
+ <else>
+ <text variable="title" form="short" quotes="true"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="publisher-year">
+ <group delimiter=", ">
+ <group delimiter=": ">
+ <text variable="publisher-place"/>
+ <text variable="publisher"/>
+ </group>
+ <date variable="issued">
+ <date-part name="year"/>
+ </date>
+ </group>
+ </macro>
+ <citation>
+ <option name="et-al-min" value="4"/>
+ <option name="et-al-use-first" value="1"/>
+ <option name="disambiguate-add-names" value="true"/>
+ <option name="disambiguate-add-givenname" value="true"/>
+ <layout prefix="(" suffix=")" delimiter="; ">
+ <group delimiter=" ">
+ <choose>
+ <if variable="author editor translator" match="any">
+ <group delimiter=", ">
+ <text macro="author-short"/>
+ <choose>
+ <if disambiguate="true">
+ <text macro="title-short"/>
+ </if>
+ </choose>
+ </group>
+ </if>
+ <else>
+ <text macro="title-short"/>
+ </else>
+ </choose>
+ <text variable="locator"/>
+ </group>
+ </layout>
+ </citation>
+ <bibliography>
+ <option name="hanging-indent" value="true"/>
+ <option name="et-al-min" value="4"/>
+ <option name="et-al-use-first" value="1"/>
+ <option name="line-spacing" value="2"/>
+ <option name="subsequent-author-substitute" value="---"/>
+ <sort>
+ <key macro="author"/>
+ <key variable="title"/>
+ </sort>
+ <layout>
+ <text macro="author" suffix="."/>
+ <text macro="title" prefix=" " suffix="."/>
+ <choose>
+ <if type="book">
+ <text macro="editor-translator" prefix=" " suffix="."/>
+ <text macro="publisher-year" prefix=" " suffix="."/>
+ </if>
+ <else-if type="chapter">
+ <group class="container">
+ <text variable="container-title" text-decoration="underline" prefix=" " suffix="."/>
+ <text macro="editor-translator" prefix=" " suffix="."/>
+ <text macro="publisher-year" prefix=" " suffix="."/>
+ </group>
+ <text variable="page" prefix=" " suffix="."/>
+ </else-if>
+ <else>
+ <group class="container" prefix=" " suffix="." delimiter=": ">
+ <group delimiter=" ">
+ <text macro="editor-translator" suffix="."/>
+ <text variable="container-title" text-decoration="underline"/>
+ <choose>
+ <if type="article-journal">
+ <group delimiter=" ">
+ <group delimiter=".">
+ <text variable="volume"/>
+ <text variable="issue"/>
+ </group>
+ <date variable="issued" prefix="(" suffix=")">
+ <date-part name="year"/>
+ </date>
+ </group>
+ </if>
+ <else>
+ <date variable="issued">
+ <date-part name="day" suffix=" "/>
+ <date-part name="month" form="short" include-period="true" suffix=" "/>
+ <date-part name="year"/>
+ </date>
+ </else>
+ </choose>
+ </group>
+ <text variable="page"/>
+ </group>
+ </else>
+ </choose>
+ <text prefix=" " suffix="." macro="access"/>
+ </layout>
+ </bibliography>
+</style>
diff --git a/csl/mla.csl b/csl/mla.csl
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
<info>
<title>Modern Language Association</title>
@@ -9,6 +8,10 @@
<name>Simon Kornblith</name>
<email>simon@simonster.com</email>
</author>
+ <contributor>
+ <name> modified by Christian Werthschulte</name>
+ <email>Christian.Werthschulte@rub.de</email>
+ </contributor>
<category term="generic-base"/>
<category term="author-date"/>
<updated></updated>
@@ -44,9 +47,9 @@
<macro name="access">
<group delimiter=" ">
<date variable="accessed">
- <date-part name="day" suffix=" "/>
- <date-part name="month" form="short" include-period="true" suffix=" "/>
- <date-part name="year"/>
+ <date-part name="day" suffix=" "/>
+ <date-part name="month" form="short" include-period="true" suffix=" "/>
+ <date-part name="year"/>
</date>
<text variable="URL" prefix="<" suffix=">"/>
</group>
@@ -54,7 +57,7 @@
<macro name="title">
<choose>
<if type="book">
- <text variable="title" text-decoration="underline"/>
+ <text variable="title" font-style="italic"/>
</if>
<else>
<text variable="title" quotes="true"/>
@@ -64,7 +67,7 @@
<macro name="title-short">
<choose>
<if type="book">
- <text variable="title" form="short" text-decoration="underline"/>
+ <text variable="title" form="short" font-style="italic"/>
</if>
<else>
<text variable="title" form="short" quotes="true"/>
@@ -92,12 +95,12 @@
<choose>
<if variable="author editor translator" match="any">
<group delimiter=", ">
- <text macro="author-short"/>
- <choose>
- <if disambiguate="true">
- <text macro="title-short"/>
- </if>
- </choose>
+ <text macro="author-short"/>
+ <choose>
+ <if disambiguate="true">
+ <text macro="title-short"/>
+ </if>
+ </choose>
</group>
</if>
<else>
@@ -128,7 +131,7 @@
</if>
<else-if type="chapter">
<group class="container">
- <text variable="container-title" text-decoration="underline" prefix=" " suffix="."/>
+ <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
<text macro="editor-translator" prefix=" " suffix="."/>
<text macro="publisher-year" prefix=" " suffix="."/>
</group>
@@ -138,7 +141,7 @@
<group class="container" prefix=" " suffix="." delimiter=": ">
<group delimiter=" ">
<text macro="editor-translator" suffix="."/>
- <text variable="container-title" text-decoration="underline"/>
+ <text variable="container-title" font-style="italic"/>
<choose>
<if type="article-journal">
<group delimiter=" ">