Add dependent styles, update independent styles

terber2 · Mar 2, 2011 · a7d32ff · a7d32ff
1 parent 53a153b
commit a7d32ff
Show file tree

Hide file tree

Showing 1,229 changed files with 17,279 additions and 1,624 deletions.
diff --git a/Chinese-Building-Structure.csl b/Chinese-Building-Structure.csl
@@ -2,8 +2,8 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
    <info>
       <title>Building Structure [Chinese]</title>
-      <id>http://www.zotero.org/styles/Chinese-Building-Structure</id>
-      <link href="http://www.zotero.org/styles/Chinese-Building-Structure" rel="self"/>
+      <id>http://www.zotero.org/styles/chinese-building-structure</id>
+      <link href="http://www.zotero.org/styles/chinese-building-structure" rel="self"/>
       <author>
          <name>Ben</name>
          <email>bodxp@163.com</email>

diff --git a/Chinese-GB7714-1987-Numeric.csl b/Chinese-GB7714-1987-Numeric.csl
@@ -2,8 +2,8 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
    <info>
       <title>Chinese Std GB/T 7714-1987 (Numeric)</title>
-      <id>http://www.zotero.org/styles/Chinese-GB7714-1987-Numeric</id>
-      <link href="http://www.zotero.org/styles/Chinese-GB7714-1987-Numeric" rel="self"/>
+      <id>http://www.zotero.org/styles/chinese-gb7714-1987-numeric</id>
+      <link href="http://www.zotero.org/styles/chinese-gb7714-1987-numeric" rel="self"/>
       <link href="http://www.lib.tsinghua.edu.cn/service/GB7714-87.doc" rel="documentation"/>
       <author>
          <name>heromyth</name>

diff --git a/Chinese-GB7714-2005-Numeric.csl b/Chinese-GB7714-2005-Numeric.csl
@@ -2,8 +2,8 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
    <info>
       <title>Chinese Std GB/T 7714-2005 (Numeric)</title>
-      <id>http://www.zotero.org/styles/Chinese-GB7714-2005-Numeric</id>
-      <link href="http://www.zotero.org/styles/Chinese-GB7714-2005-Numeric" rel="self"/>
+      <id>http://www.zotero.org/styles/chinese-gb7714-2005-numeric</id>
+      <link href="http://www.zotero.org/styles/chinese-gb7714-2005-numeric" rel="self"/>
       <link href="http://gradschool.ustc.edu.cn/ylb/material/xw/wdxz/19.pdf" rel="documentation"/>
       <author>
          <name>heromyth</name>

diff --git a/MLA2009.csl b/MLA2009.csl
diff --git a/McGill-Guide-v7.csl b/McGill-Guide-v7.csl
@@ -1,18 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" default-locale="en">
 <info>
     <title>Canadian Guide to Uniform Legal Citation, 7th ed. (McGill Guide)</title>
-	<id>http://www.zotero.org/styles/mcgillv7</id>
-	<link href="http://www.zotero.org/styles/McGillv7" rel="self" />
+	<id>http://www.zotero.org/styles/mcgill-guide-v7</id>
+	<link href="http://www.zotero.org/styles/mcgill-guide-v7" rel="self" />
 	<link href="http://lawjournal.mcgill.ca/citeguide.php" rel="documentation" />
     <author>
       <name>Liam McHugh-Russell</name>
       <email>liam.mchugh.russell@gmail.com</email>
 	</author>
-	 <author>
-      <name>Philippe Tousignant</name>
-      <email>philippe.tousignant@gmail.com</email>
-    </author>
 	<updated>2008-10-29T21:01:24+00:00</updated>
 	 <rights>This work is licensed under a Creative Commons
          Attribution-Share Alike 3.0 Unported License
@@ -22,6 +18,9 @@
 </info> 
 <locale xml:lang="en">
     <style-options punctuation-in-quote="false" />
+	<terms>
+	 <term name="et-al" >et al</term>
+	</terms> 
 </locale>
 
   <macro name="citation-number">
@@ -32,11 +31,9 @@
   </macro>
   <macro name="editor">
 	<names variable="editor"  >
-        <name and="symbol" />
+        <name and="symbol" delimiter-precedes-last="never" />
+		<et-al term="et-al" /> 
 		<label form="short" prefix=", " />
-		<substitute>
-			<text variable="container-title" />
-		</substitute>
 	</names>
   </macro>
   <macro name="translator">
@@ -79,9 +76,10 @@
 	<choose>
 		<if position="first" > 
 			<names variable="author"  >
-				<name and="symbol" delimiter-precedes-last="never" />
+				<name and="symbol" delimiter-precedes-last="never"  />
+				<et-al term="et-al" />
 				<substitute>
-					<text macro="editor" />
+					<text macro="editor"  />
 				</substitute>
 			</names>
 		</if>
@@ -97,16 +95,19 @@
 						and="symbol"
 						sort-separator=", "
 						delimiter-precedes-last="never" />
+						<label form="short" prefix=", " />
 					</names>
 				</substitute>
 			</names>
 		</else>
 	</choose>
   </macro>
   <macro name="author">
+	<!-- because <cs-name> doesn't take strip-periods, need to use awkward 'stripped' macro -->
 	<text macro="author-stripped" strip-periods="true" />
+	<!-- could just use strip-periods on the macro call, except adding the comma or period here 
+	means that rendering macros work both for biblio and citation -->
 	<choose>
-	<!-- because <cs-name> doesn't take strip-periods, need to use awkward 'stripped' macro -->
 		<if position="first" > 
 			<text value="," />
 		</if>
@@ -231,10 +232,11 @@
 </macro>
 <macro name="pinpoint">
     <!-- Not implemented: currently only works for "page"; needs implementation for para in cases, 
-	s and art in bills, etc., -->
+	s and art in bills, etc., also: not clear if this is possible, but in some cases a second pinpoint 
+	is called for to identify not only page, but the footnote on that page -->
 	<choose>
 		<if variable="locator" >
-			<text term="at" prefix=" " />
+			<text term="at" />
 			<text variable="locator" prefix=" " />
 		</if>
 	</choose>
@@ -264,25 +266,28 @@
 	  <choose>
 		<!-- Not implemented: ibid only needs capitalize-first if it's the first word in a footnote -->
 		<if position="ibid-with-locator">
-			  <group delimiter=", ">
-					<text term="ibid" font-style="italic" text-case="capitalize-first" />
+			  <group delimiter=" ">
+					<text term="ibid" font-style="italic" strip-periods="true" text-case="capitalize-first" />
 					<text macro="pinpoint" />
 			  </group>
 		</if>
 		<else-if position="ibid">
-			<text term="ibid" font-style="italic" text-case="capitalize-first"  />
+			<text term="ibid" font-style="italic" strip-periods="true" text-case="capitalize-first"  />
         </else-if>
-		<!-- Not implemented: does not seem to be any way of indicating ordinal of previous mention in 
+		<!-- For future versions? No way of indicating footnote # of previous citation 
 			e.g. "supra note X"; X is not stored, or is not available -->
+		<!-- For future versions? Cannot test for whether short form exists 
+			(Supra should be capitalized if no short form) -->	
 		<else-if position="subsequent">
 			  <group delimiter=", ">
 					<text macro="short-form"/>
-					<text value="supra" font-style="italic" prefix=", " />
+					<text value="supra" font-style="italic" />
 			  </group>
-			  <text macro="pinpoint"/>
+			  <text value="note ---" prefix=" "/>
+			  <text macro="pinpoint" prefix=" " />
         </else-if>
 		<else>
-			<group delimiter=", ">
+			<group delimiter=" ">
 				<choose>
 					<if type="bill">
 						<text macro="render-bill" />
@@ -303,7 +308,7 @@
 						<text macro="render-article-newspaper" />
 					</else-if>
 					<else>
-						<text macro="author" strip-periods="true" suffix=" " />
+						<text macro="author"  />
 						<text macro="title" font-style="italic"/>
 						<text macro="edition" prefix=", " />
 						<text macro="publisher-place" prefix=" (" suffix=": " />
@@ -344,7 +349,7 @@
 				<text macro="render-article-newspaper" />
 			</else-if>
 			<else>
-				<text macro="author" strip-periods="true" suffix=" " />
+				<text macro="author" suffix=" " />
 				<text macro="title" font-style="italic" />
 				<text macro="edition" prefix=", " />
 				<text macro="translator" prefix=", " /> 

diff --git a/SMALL-wiley.csl b/SMALL-wiley.csl
@@ -2,8 +2,8 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
    <info>
       <title>SMALL-wiley</title>
-      <id>http://www.zotero.org/styles/SMALL-wiley</id>
-      <link href="http://www.zotero.org/styles/SMALL-wiley" rel="self"/>
+      <id>http://www.zotero.org/styles/small-wiley</id>
+      <link href="http://www.zotero.org/styles/small-wiley" rel="self"/>
       <author>
          <name>Richard Karnesky</name>
          <email>karnesky+zotero@gmail.com</email>