Added render-book macro and fixed problem with rendering of residual …

…case.

mcgill-guide-v7.csl

@@ -14,8 +14,8 @@
     </contributor>
     <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
-	http://creativecommons.org/licenses/by-sa/3.0/</rights>
+Attribution-Share Alike 3.0 Unported License
+http://creativecommons.org/licenses/by-sa/3.0/</rights>
     <category field="law"/>
     <category citation-format="note"/>
   </info>
@@ -108,9 +108,9 @@
       </else>
     </choose>
   </macro>
-  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed 
-	   right. Only actually need to check for 'first' because w/i cite, 
-	   all the other tests should have been done... -->
+  <!-- the 'rendering' macros mostly check if called from w/i bibliography so that author gets printed
+right. Only actually need to check for 'first' because w/i cite,
+all the other tests should have been done... -->
   <macro name="render-chapter">
     <group delimiter=" ">
       <text variable="title" quotes="true"/>
@@ -132,6 +132,15 @@
     <text macro="container-title" prefix=" "/>
     <text variable="page-first" prefix=" "/>
   </macro>
+  <macro name="render-book">
+		<group delimiter=", ">
+			<text variable="title" font-style="italic" />
+			<text macro="edition"/>
+			<text macro="translator"/>
+			<text macro="editor"/>
+		</group>
+		<text macro="publisher-place-year"/>
+  </macro>
   <macro name="render-thesis">
     <group delimiter=" ">
       <text variable="title" font-style="italic"/>
@@ -189,8 +198,8 @@
     </group>
   </macro>
   <macro name="short-form">
-    <!-- Hump to overcome: cannot check against existence of short title. 
-		 Not implemented: "cited to" for cases, construct short casenames, adding ref to article -->
+    <!-- Hump to overcome: cannot check against existence of short title.
+Not implemented: "cited to" for cases, construct short casenames, adding ref to article -->
     <choose>
       <if type="bill legal_case" match="none">
         <names variable="author">
@@ -230,8 +239,8 @@
         <else-if position="ibid">
           <text term="ibid" font-style="italic" strip-periods="true" text-case="capitalize-first"/>
         </else-if>
-        <!-- For future versions? Cannot test for whether short form exists 
-			 (Supra should be capitalized if no short form) -->
+        <!-- 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"/>
@@ -327,20 +336,25 @@
               </else-if>
               <else-if type="article-newspaper">
                 <text macro="render-article-newspaper"/>
+              </else-if>
+		<else-if type="book">
+		  <text macro="render-book"/>
               </else-if>
               <else>
-                <group delimiter=", ">
-                  <text variable="title" font-style="italic"/>
-                  <text macro="edition"/>
-                  <text macro="translator"/>
-                  <text macro="editor"/>
-                </group>
-                <text macro="publisher-place-year"/>
+			<group>
+				<group delimiter=", ">
+					<text variable="title" font-style="italic"/>
+					<text macro="edition"/>
+					<text macro="translator"/>
+					<text macro="editor"/>
+				</group>
+				<text macro="publisher-place-year"/>
+			</group>
               </else>
             </choose>
           </group>
         </else>
       </choose>
     </layout>
   </bibliography>
-</style>
+</style>