Merge branch 'master' of github.com:citation-style-language/styles

mlimaloureiro · Aug 25, 2011 · 24c5813 · 24c5813
2 parents 83c1e95 + fe1cf1d
commit 24c5813
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/wheaton-phd-bith.csl b/wheaton-phd-bith.csl
@@ -4,7 +4,7 @@
     <title>Wheaton College PhD BITH</title>
     <id>http://www.zotero.org/styles/wheaton-phd-bith</id>
     <link href="http://www.zotero.org/styles/wheaton-phd-bith" rel="self"/>
-    <link href="http://www.wheatongrad.com/xm_client/client_documents/Style%20Guide%20August%202010a%20electronic%20version.pdf" rel="documentation"/>
+    <link href="http://www.wheatongrad.com/xm_client/client_documents/Style_Guide_August_2011_electronic_version.pdf" rel="documentation"/>
     <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
@@ -396,21 +396,26 @@
         <text macro="edition-note"/>
       </else-if>
       <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-          <group prefix=", " delimiter=", ">
-            <group>
-              <text term="volume" form="short" suffix=". " strip-periods="true"/>
-              <number variable="volume" form="numeric"/>
+  <choose>
+          <if variable="locator" match="any"></if>
+	  <else>
+            <group prefix=", " delimiter=", ">
+              <group>
+                <text term="volume" form="short" suffix=". " strip-periods="true"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+              <choose>
+                <if variable="locator" match="none">
+                  <group>
+                    <number variable="number-of-volumes" form="numeric"/>
+                    <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
+                  </group>
+                </if>
+              </choose>
+              <text macro="edition-note"/>
             </group>
-            <choose>
-              <if variable="locator" match="none">
-                <group>
-                  <number variable="number-of-volumes" form="numeric"/>
-                  <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
-                </group>
-              </if>
-            </choose>
-            <text macro="edition-note"/>
-          </group>
+	  </else>
+	</choose>
       </else-if>
     </choose>
   </macro>
@@ -798,4 +803,4 @@
       <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
-</style>
+</style>