From b67a636c950e717d6a27db0345cdb37c7ba65628 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 13 May 2008 01:24:54 +0000
Subject: [PATCH] Made MLA w/italics the default MLA; moved old version to MLA
 (underline)

---
 csl/{mla-italic.csl => mla-underline.csl} | 37 +++++++++++------------
 csl/mla.csl                               | 31 ++++++++++---------
 2 files changed, 34 insertions(+), 34 deletions(-)
 rename csl/{mla-italic.csl => mla-underline.csl} (83%)

diff --git a/csl/mla-italic.csl b/csl/mla-underline.csl
similarity index 83%
rename from csl/mla-italic.csl
rename to csl/mla-underline.csl
index 3a4512d857..f3dc620feb 100644
--- a/csl/mla-italic.csl
+++ b/csl/mla-underline.csl
@@ -1,17 +1,14 @@
 <?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 (italic)</title>
-    <id>http://www.zotero.org/styles/mla-italic</id>
-    <link href="http://www.zotero.org/styles/mla"/>
+    <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>
-    <contributor>
-      <name> modified by Christian Werthschulte</name>
-      <email>Christian.Werthschulte@rub.de</email>
-    </contributor>
     <category term="generic-base"/>
     <category term="author-date"/>
     <updated></updated>
@@ -47,9 +44,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="&lt;" suffix="&gt;"/>
     </group>
@@ -57,7 +54,7 @@
   <macro name="title">
     <choose>
       <if type="book">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" text-decoration="underline"/>
       </if>
       <else>
         <text variable="title" quotes="true"/>
@@ -67,7 +64,7 @@
   <macro name="title-short">
     <choose>
       <if type="book">
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" text-decoration="underline"/>
       </if>
       <else>
         <text variable="title" form="short" quotes="true"/>
@@ -95,12 +92,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>
@@ -131,7 +128,7 @@
         </if>
         <else-if type="chapter">
           <group class="container">
-            <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+            <text variable="container-title" text-decoration="underline" prefix=" " suffix="."/>
             <text macro="editor-translator" prefix=" " suffix="."/>
             <text macro="publisher-year"  prefix=" " suffix="."/>
           </group>
@@ -141,7 +138,7 @@
           <group class="container" prefix=" " suffix="." delimiter=": ">
             <group delimiter=" ">
               <text macro="editor-translator" suffix="."/>
-              <text variable="container-title" font-style="italic"/>
+              <text variable="container-title" text-decoration="underline"/>
               <choose>
                 <if type="article-journal">
                   <group delimiter=" ">
diff --git a/csl/mla.csl b/csl/mla.csl
index b17eb7c870..5c0405cb7b 100644
--- 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="&lt;" suffix="&gt;"/>
     </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=" ">