Improve edition macro for din-1505-2 (#3559)

citation-style-language · Jun 23, 2018 · f5602498582716adab53931b97ac38304d2c36c0 · f560249
1 parent c89fe2d
commit f5602498582716adab53931b97ac38304d2c36c0
Unified Split

Showing with 44 additions and 16 deletions.

+11 −4 din-1505-2-alphanumeric.csl

+11 −4 din-1505-2-numeric-alphabetical.csl

+11 −4 din-1505-2-numeric.csl

+11 −4 din-1505-2.csl
diff --git a/din-1505-2-alphanumeric.csl b/din-1505-2-alphanumeric.csl
@@ -168,10 +168,17 @@
    </group>
  </macro>
  <macro name="edition">
-  
-    <group>
-  
-      <number variable="edition" form="numeric" suffix=". "/>
-  
-      <text term="edition" form="short" plural="false"/>
-  
-    </group>
+  
+    <choose>
+  
+      <if is-numeric="edition">
+  
+        <group delimiter=" ">
+  
+          <number variable="edition" form="numeric" suffix=". "/>
+  
+          <text term="edition" form="short" plural="false"/>
+  
+        </group>
+  
+      </if>
+  
+      <else>
+  
+        <text variable="edition" suffix="."/>
+  
+      </else>
+  
+    </choose>
  </macro>
  <macro name="pages">
    <choose>

diff --git a/din-1505-2-numeric-alphabetical.csl b/din-1505-2-numeric-alphabetical.csl
@@ -163,10 +163,17 @@
    </group>
  </macro>
  <macro name="edition">
-  
-    <group>
-  
-      <number variable="edition" form="numeric" suffix=". "/>
-  
-      <text term="edition" form="short" plural="false"/>
-  
-    </group>
+  
+    <choose>
+  
+      <if is-numeric="edition">
+  
+        <group delimiter=" ">
+  
+          <number variable="edition" form="numeric" suffix=". "/>
+  
+          <text term="edition" form="short" plural="false"/>
+  
+        </group>
+  
+      </if>
+  
+      <else>
+  
+        <text variable="edition" suffix="."/>
+  
+      </else>
+  
+    </choose>
  </macro>
  <macro name="pages">
    <choose>

diff --git a/din-1505-2-numeric.csl b/din-1505-2-numeric.csl
@@ -153,10 +153,17 @@
    </group>
  </macro>
  <macro name="edition">
-  
-    <group>
-  
-      <number variable="edition" form="numeric" suffix=". "/>
-  
-      <text term="edition" form="short" plural="false"/>
-  
-    </group>
+  
+    <choose>
+  
+      <if is-numeric="edition">
+  
+        <group delimiter=" ">
+  
+          <number variable="edition" form="numeric" suffix=". "/>
+  
+          <text term="edition" form="short" plural="false"/>
+  
+        </group>
+  
+      </if>
+  
+      <else>
+  
+        <text variable="edition" suffix="."/>
+  
+      </else>
+  
+    </choose>
  </macro>
  <macro name="pages">
    <choose>

diff --git a/din-1505-2.csl b/din-1505-2.csl
@@ -186,10 +186,17 @@
    </group>
  </macro>
  <macro name="edition">
-  
-    <group>
-  
-      <number variable="edition" form="numeric" suffix=". "/>
-  
-      <text term="edition" form="short" plural="false"/>
-  
-    </group>
+  
+    <choose>
+  
+      <if is-numeric="edition">
+  
+        <group delimiter=" ">
+  
+          <number variable="edition" form="numeric" suffix=". "/>
+  
+          <text term="edition" form="short" plural="false"/>
+  
+        </group>
+  
+      </if>
+  
+      <else>
+  
+        <text variable="edition" suffix="."/>
+  
+      </else>
+  
+    </choose>
  </macro>
  <macro name="pages">
    <choose>