The term in should only appear when container-title has a value.

CrumpLab · Jul 20, 2015 · ed472f7 · ed472f7
1 parent 9c00bfd
commit ed472f7
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 30 deletions.
diff --git a/american-chemical-society-author-date.csl b/american-chemical-society-author-date.csl
@@ -105,14 +105,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-page-first.csl b/american-chemical-society-page-first.csl
@@ -75,13 +75,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-with-titles-no-et-al.csl b/american-chemical-society-with-titles-no-et-al.csl
@@ -87,14 +87,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-with-titles-page-first.csl b/american-chemical-society-with-titles-page-first.csl
@@ -88,14 +88,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-with-titles-sentence-case-doi.csl b/american-chemical-society-with-titles-sentence-case-doi.csl
@@ -88,14 +88,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-with-titles-sentence-case.csl b/american-chemical-society-with-titles-sentence-case.csl
@@ -88,14 +88,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society-with-titles.csl b/american-chemical-society-with-titles.csl
@@ -87,14 +87,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">

diff --git a/american-chemical-society.csl b/american-chemical-society.csl
@@ -74,13 +74,19 @@
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
+    <group delimiter=". ">
+      <text macro="title"/>
       <choose>
         <if type="entry-dictionary entry-encyclopedia" match="none">
-          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
         </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
       </choose>
-      <text variable="container-title" font-style="italic"/>
     </group>
   </macro>
   <macro name="issued">