From d23a3abd79e2976a34cf2ff57775e1f8ed0a2fdc Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 6 Aug 2020 22:45:06 -0400
Subject: [PATCH] Bug fix in APA 6 original publication macro (#4959)

I had forgotten that macro output is not suppressed when a group is otherwise empty.
---
 apa-6th-edition-no-ampersand.csl | 32 ++++++++++++++++++--------------
 apa-6th-edition.csl              | 32 ++++++++++++++++++--------------
 apa-no-doi-no-issue.csl          | 32 ++++++++++++++++++--------------
 apa-old-doi-prefix.csl           | 32 ++++++++++++++++++--------------
 4 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index ee4a74e09867..c3b16aabf242 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -1409,20 +1409,24 @@
               <text variable="references"/>
             </if>
             <else>
-              <group delimiter=" ">
-                <text macro="original-published"/>
-                <choose>
-                  <if is-uncertain-date="original-date">
-                    <group prefix="[" suffix="]" delimiter=" ">
-                      <text term="circa" form="short"/>
-                      <text macro="original-date"/>
-                    </group>
-                  </if>
-                  <else>
-                    <text macro="original-date"/>
-                  </else>
-                </choose>
-              </group>
+              <choose>
+                <if variable="original-date">
+                  <group delimiter=" ">
+                    <text macro="original-published"/>
+                    <choose>
+                      <if is-uncertain-date="original-date">
+                        <group prefix="[" suffix="]" delimiter=" ">
+                          <text term="circa" form="short"/>
+                          <text macro="original-date"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text macro="original-date"/>
+                      </else>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
             </else>
           </choose>
         </group>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 40739538bf5b..f49c6b135320 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -1408,20 +1408,24 @@
               <text variable="references"/>
             </if>
             <else>
-              <group delimiter=" ">
-                <text macro="original-published"/>
-                <choose>
-                  <if is-uncertain-date="original-date">
-                    <group prefix="[" suffix="]" delimiter=" ">
-                      <text term="circa" form="short"/>
-                      <text macro="original-date"/>
-                    </group>
-                  </if>
-                  <else>
-                    <text macro="original-date"/>
-                  </else>
-                </choose>
-              </group>
+              <choose>
+                <if variable="original-date">
+                  <group delimiter=" ">
+                    <text macro="original-published"/>
+                    <choose>
+                      <if is-uncertain-date="original-date">
+                        <group prefix="[" suffix="]" delimiter=" ">
+                          <text term="circa" form="short"/>
+                          <text macro="original-date"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text macro="original-date"/>
+                      </else>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
             </else>
           </choose>
         </group>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index ad487cbd63cb..03ca7ff86be0 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -1422,20 +1422,24 @@
               <text variable="references"/>
             </if>
             <else>
-              <group delimiter=" ">
-                <text macro="original-published"/>
-                <choose>
-                  <if is-uncertain-date="original-date">
-                    <group prefix="[" suffix="]" delimiter=" ">
-                      <text term="circa" form="short"/>
-                      <text macro="original-date"/>
-                    </group>
-                  </if>
-                  <else>
-                    <text macro="original-date"/>
-                  </else>
-                </choose>
-              </group>
+              <choose>
+                <if variable="original-date">
+                  <group delimiter=" ">
+                    <text macro="original-published"/>
+                    <choose>
+                      <if is-uncertain-date="original-date">
+                        <group prefix="[" suffix="]" delimiter=" ">
+                          <text term="circa" form="short"/>
+                          <text macro="original-date"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text macro="original-date"/>
+                      </else>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
             </else>
           </choose>
         </group>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 86ed0a1e1363..a7ef73be8aa6 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -1409,20 +1409,24 @@
               <text variable="references"/>
             </if>
             <else>
-              <group delimiter=" ">
-                <text macro="original-published"/>
-                <choose>
-                  <if is-uncertain-date="original-date">
-                    <group prefix="[" suffix="]" delimiter=" ">
-                      <text term="circa" form="short"/>
-                      <text macro="original-date"/>
-                    </group>
-                  </if>
-                  <else>
-                    <text macro="original-date"/>
-                  </else>
-                </choose>
-              </group>
+              <choose>
+                <if variable="original-date">
+                  <group delimiter=" ">
+                    <text macro="original-published"/>
+                    <choose>
+                      <if is-uncertain-date="original-date">
+                        <group prefix="[" suffix="]" delimiter=" ">
+                          <text term="circa" form="short"/>
+                          <text macro="original-date"/>
+                        </group>
+                      </if>
+                      <else>
+                        <text macro="original-date"/>
+                      </else>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
             </else>
           </choose>
         </group>