Update book for revised standard

RadicalLibre · Oct 4, 2013 · e35a234 · e35a234
1 parent 7b3b8d3
commit e35a234
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/harvard-coventry-university.csl b/harvard-coventry-university.csl
@@ -229,6 +229,12 @@
       </else>
     </choose>
   </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <label variable="volume" form="short" plural="never"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
   <macro name="pages">
     <text variable="page"/>
   </macro>
@@ -286,11 +292,6 @@
       <group delimiter=" ">
         <text macro="author"/>
         <text macro="year-date" prefix=" (" suffix=")"/>
-        <choose>
-          <if type="chapter paper-conference" match="none">
-            <text macro="edby"/>
-          </if>
-        </choose>
         <group delimiter=". ">
           <choose>
             <if type="bill legislation" match="any">
@@ -405,20 +406,20 @@
             </else-if>
             <else-if type="book graphic legal_case report" match="any">
               <group delimiter=". ">
-                <group prefix=" ">
+                <group delimiter=" ">
                   <text macro="title"/>
                   <text macro="online" prefix=" "/>
-                  <group delimiter=" " prefix=". ">
-                    <text macro="transby"/>
-                    <text variable="collection-title"/>
-                    <text variable="collection-number"/>
-                    <text variable="number"/>
-                  </group>
-                  <group delimiter=". " prefix=". ">
-                    <text macro="volumes"/>
-                    <text macro="edition"/>
-                  </group>
                 </group>
+                <text macro="edition"/>
+                <text macro="edby"/>
+                <text macro="transby"/>
+                <group delimiter=" " prefix=" ">
+                  <text variable="collection-title"/>
+                  <text variable="collection-number"/>
+                  <text variable="number"/>
+                </group>
+                <text macro="volume"/>
+                <text macro="volumes"/>
                 <text variable="note"/>                
                 <text macro="publisher" prefix=" "/>
               </group>
@@ -524,10 +525,7 @@
                   <text macro="online"/>
                 </group>
                 <text macro="edition"/>
-                <group delimiter=" ">
-                  <label variable="volume" form="short" plural="never"/>
-                  <text variable="volume"/>
-                </group>   
+                <text macro="volume"/>  
                 <text macro="transby"/>
                 <text variable="number"/>
                 <group delimiter=", ">