From 038a8f57f8f8007f04ca38957e4d8b7c6beeba88 Mon Sep 17 00:00:00 2001
From: "Brenton M. Wiernik" <bwiernik@users.noreply.github.com>
Date: Thu, 18 Nov 2021 21:04:15 -0500
Subject: [PATCH] Remove group around no-date cluster (#5731)

Unnecessary and removing ensures good performance across citeprocs

https://github.com/andras-simonyi/citeproc-el/issues/70#issuecomment-971911773
---
 apa-6th-edition-no-ampersand.csl     | 6 ++----
 apa-6th-edition.csl                  | 6 ++----
 apa-annotated-bibliography.csl       | 6 ++----
 apa-cv.csl                           | 6 ++----
 apa-no-ampersand.csl                 | 6 ++----
 apa-no-doi-no-issue.csl              | 6 ++----
 apa-numeric-superscript-brackets.csl | 6 ++----
 apa-numeric-superscript.csl          | 6 ++----
 apa-old-doi-prefix.csl               | 6 ++----
 apa-single-spaced.csl                | 6 ++----
 apa-with-abstract.csl                | 6 ++----
 apa.csl                              | 6 ++----
 12 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl
index 3b4d4b6f42a4..b0f618ec31fd 100644
--- a/apa-6th-edition-no-ampersand.csl
+++ b/apa-6th-edition-no-ampersand.csl
@@ -965,10 +965,8 @@
         </group>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl
index 4114521112b1..775857accbe2 100644
--- a/apa-6th-edition.csl
+++ b/apa-6th-edition.csl
@@ -964,10 +964,8 @@
         </group>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index 7b6e3e7129b2..717078a82083 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -481,10 +481,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-cv.csl b/apa-cv.csl
index 3c5a048c1485..7e9de64aa940 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -426,10 +426,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 879e752292f7..82a9e6c8ebc3 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -481,10 +481,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl
index 38fdd454a98e..08306362d766 100644
--- a/apa-no-doi-no-issue.csl
+++ b/apa-no-doi-no-issue.csl
@@ -971,10 +971,8 @@
         </group>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index 2132ba8f1278..a9a321fecd08 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -284,10 +284,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index 23861440c6b3..b402a827774d 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -284,10 +284,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl
index 1c1dec0426a7..02ecfc75fac7 100644
--- a/apa-old-doi-prefix.csl
+++ b/apa-old-doi-prefix.csl
@@ -965,10 +965,8 @@
         </group>
       </else-if>
       <else>
-        <group>
-          <text term="no date" form="short"/>
-          <text variable="year-suffix" prefix="-"/>
-        </group>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index ee287e4a80ac..c01db77be4f8 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -481,10 +481,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index b34b035c9b2a..fd70d29584f1 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -481,10 +481,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>
diff --git a/apa.csl b/apa.csl
index 915d4e07f4a4..f3de14b8ccf3 100644
--- a/apa.csl
+++ b/apa.csl
@@ -481,10 +481,8 @@
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="no date" form="short"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
           </else>
         </choose>
       </group>