Fix collection-title showing for books

https://forums.zotero.org/discussion/76876/zoterobib-generating-an-incorrect-book-citation-in-apa-style-if-there-is-series-information#latest
citation-style-language · Apr 11, 2019 · 1c1228ad97f9970ac556633ad5d426ad771332d6 · 1c1228a
1 parent 75a4da6
commit 1c1228ad97f9970ac556633ad5d426ad771332d6
Unified Split

Showing with 63 additions and 7 deletions.

+9 −1 apa-annotated-bibliography.csl

+9 −1 apa-cv.csl

+9 −1 apa-no-ampersand.csl

+9 −1 apa-no-doi-no-issue.csl

+9 −1 apa-old-doi-prefix.csl

+9 −1 apa-single-spaced.csl

+9 −1 apa.csl
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
@@ -1242,7 +1242,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa-cv.csl b/apa-cv.csl
@@ -1053,7 +1053,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
@@ -1242,7 +1242,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
@@ -1262,7 +1262,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
@@ -1241,7 +1241,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
@@ -1242,7 +1242,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">

diff --git a/apa.csl b/apa.csl
@@ -1241,7 +1241,15 @@
          </else>
        </choose>
      </else-if>
-  
-      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+  
+      <else-if type="book">
+  
+        <choose>
+  
+          <!-- book and software should not cite collection-title, only container-title -->
+  
+          <if variable="container-title">
+  
+            <text macro="container-booklike"/>
+  
+          </if>
+  
+        </choose>
+  
+      </else-if>
+  
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
        <text macro="container-booklike"/>
      </else-if>
      <else-if type="bill legal_case legislation treaty" match="any">