APA: Always print Version label (#7154)

Co-authored-by: Rafał Kopicki <[email protected]>
citation-style-language · Aug 6, 2024 · 4e4bc8f · 4e4bc8f
1 parent df939b8
commit 4e4bc8f
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 99 deletions.
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-cv.csl b/apa-cv.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
@@ -1363,17 +1363,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-no-initials.csl b/apa-no-initials.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
@@ -1314,17 +1314,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
@@ -1314,17 +1314,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>

diff --git a/apa.csl b/apa.csl
@@ -1313,17 +1313,10 @@
     </choose>
   </macro>
   <macro name="version">
-    <choose>
-      <if is-numeric="version">
-        <group delimiter=" ">
-          <label variable="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </if>
-      <else>
-        <text variable="version"/>
-      </else>
-    </choose>
+    <group delimiter=" ">
+      <label variable="version" text-case="capitalize-first"/>
+      <text variable="version"/>
+    </group>
   </macro>
   <macro name="edition">
     <choose>