From 4313b2099aaba332d419637d64bf497eb3f5f678 Mon Sep 17 00:00:00 2001
From: Rintze Zelle <rintze.zelle@gmail.com>
Date: Sun, 17 Aug 2008 19:03:36 +0000
Subject: [PATCH] Corrected more issues with the JBC (Journal of Biological
 Chemistry) style:

* Edition should be included for books
* Punctuation for books/book chapters

Validated with RNV.
---
 csl/jbc.csl | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/csl/jbc.csl b/csl/jbc.csl
index 38d4812fd..05b920220 100644
--- a/csl/jbc.csl
+++ b/csl/jbc.csl
@@ -78,6 +78,19 @@
       <text variable="publisher-place"/>
     </group>
   </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+	  <number variable="edition" form="ordinal"/>
+	  <text term="edition" form="short" suffix="."/>
+        </group>
+      </if>
+      <else>
+	    <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
   <citation>
     <option name="collapse" value="citation-number"/>
     <layout prefix="(" suffix=")" delimiter=", ">
@@ -97,9 +110,10 @@
 	<if type="book">
 	  <group suffix=",">
 	    <text macro="title" prefix=" "/>
+	    <text macro="edition" prefix=", "/>
 	    <text macro="editor" prefix=" "/>
 	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
+	  <text prefix=" " macro="publisher"/>
 	</if>
 	<else-if type="chapter">
 	  <text macro="title" prefix=" " quotes="true"/>
@@ -111,8 +125,9 @@
 	    </names>
 	    <text variable="container-title"  prefix=" " suffix="."/>
 	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
+	    <group>
+	      <text macro="edition" prefix=" "/>
+	      <text macro="publisher" prefix=", "/>
 	      <group prefix=", ">
 		<text variable="page"/>
 	      </group>