From bfa7f6481c08b5b7e30a84eef3b2dbcc83b4a0f0 Mon Sep 17 00:00:00 2001
From: Ser Podrick <ser.podrick@gmail.com>
Date: Tue, 10 Feb 2015 09:44:58 -0600
Subject: [PATCH] The edition succeeds the title and is separated by it with a
 comma (p. 301).

---
 american-chemical-society-author-date.csl                  | 7 +++++--
 american-chemical-society-page-first.csl                   | 6 ++++--
 american-chemical-society-with-titles-no-et-al.csl         | 6 ++++--
 american-chemical-society-with-titles-page-first.csl       | 6 ++++--
 ...ican-chemical-society-with-titles-sentence-case-doi.csl | 6 ++++--
 american-chemical-society-with-titles-sentence-case.csl    | 6 ++++--
 american-chemical-society-with-titles.csl                  | 6 ++++--
 american-chemical-society.csl                              | 6 ++++--
 8 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/american-chemical-society-author-date.csl b/american-chemical-society-author-date.csl
index 74c880b371..daef6c9cfb 100644
--- a/american-chemical-society-author-date.csl
+++ b/american-chemical-society-author-date.csl
@@ -161,10 +161,13 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
+            
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-page-first.csl b/american-chemical-society-page-first.csl
index d4d4914eac..0b688acf79 100644
--- a/american-chemical-society-page-first.csl
+++ b/american-chemical-society-page-first.csl
@@ -119,10 +119,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text variable="title" font-style="italic"/>
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-with-titles-no-et-al.csl b/american-chemical-society-with-titles-no-et-al.csl
index d29adb29f1..0c55eb53c5 100644
--- a/american-chemical-society-with-titles-no-et-al.csl
+++ b/american-chemical-society-with-titles-no-et-al.csl
@@ -133,10 +133,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-with-titles-page-first.csl b/american-chemical-society-with-titles-page-first.csl
index 755c1cad9b..ad227fcfd0 100644
--- a/american-chemical-society-with-titles-page-first.csl
+++ b/american-chemical-society-with-titles-page-first.csl
@@ -134,10 +134,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-with-titles-sentence-case-doi.csl b/american-chemical-society-with-titles-sentence-case-doi.csl
index b5901c0e4a..3b7690ef34 100644
--- a/american-chemical-society-with-titles-sentence-case-doi.csl
+++ b/american-chemical-society-with-titles-sentence-case-doi.csl
@@ -134,10 +134,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-with-titles-sentence-case.csl b/american-chemical-society-with-titles-sentence-case.csl
index c4dd672817..5e7a1cda8b 100644
--- a/american-chemical-society-with-titles-sentence-case.csl
+++ b/american-chemical-society-with-titles-sentence-case.csl
@@ -134,10 +134,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society-with-titles.csl b/american-chemical-society-with-titles.csl
index 5f702e2185..7724e9fcbc 100644
--- a/american-chemical-society-with-titles.csl
+++ b/american-chemical-society-with-titles.csl
@@ -133,10 +133,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
diff --git a/american-chemical-society.csl b/american-chemical-society.csl
index 4d3fee322f..b39efc008c 100644
--- a/american-chemical-society.csl
+++ b/american-chemical-society.csl
@@ -118,10 +118,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text variable="title" font-style="italic"/>
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">