diff --git a/csl/aag.csl b/csl/aag.csl
index d42372e34..609d8d7f0 100644
--- a/csl/aag.csl
+++ b/csl/aag.csl
@@ -94,7 +94,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/ama.csl b/csl/ama.csl
index 1376bf4a7..fc0fe640a 100644
--- a/csl/ama.csl
+++ b/csl/ama.csl
@@ -91,7 +91,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/anal-chim-acta.csl b/csl/anal-chim-acta.csl
index 25b5c8531..9af3f712a 100644
--- a/csl/anal-chim-acta.csl
+++ b/csl/anal-chim-acta.csl
@@ -69,7 +69,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/analytic-chemistry.csl b/csl/analytic-chemistry.csl
index f7089934b..5cbb8ebd7 100644
--- a/csl/analytic-chemistry.csl
+++ b/csl/analytic-chemistry.csl
@@ -69,7 +69,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/antonie-van-leeuwenhoek.csl b/csl/antonie-van-leeuwenhoek.csl
index 438a8d30d..a86d018a4 100644
--- a/csl/antonie-van-leeuwenhoek.csl
+++ b/csl/antonie-van-leeuwenhoek.csl
@@ -67,7 +67,7 @@ International Journal of General and Molecular Microbiology.</summary>
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/apsa.csl b/csl/apsa.csl
index a30acf24e..cc1ea468e 100644
--- a/csl/apsa.csl
+++ b/csl/apsa.csl
@@ -86,7 +86,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/asa.csl b/csl/asa.csl
index 35beba58a..573efd38f 100644
--- a/csl/asa.csl
+++ b/csl/asa.csl
@@ -107,7 +107,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/bioinformatics.csl b/csl/bioinformatics.csl
index c87f42627..d04abaed8 100644
--- a/csl/bioinformatics.csl
+++ b/csl/bioinformatics.csl
@@ -70,7 +70,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/cell.csl b/csl/cell.csl
index de76af7a4..5d3ff40ad 100644
--- a/csl/cell.csl
+++ b/csl/cell.csl
@@ -70,7 +70,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
index 8b558d9a8..0c60e7f00 100644
--- a/csl/chicago-author-date.csl
+++ b/csl/chicago-author-date.csl
@@ -78,7 +78,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/cse.csl b/csl/cse.csl
index d56c3778c..f1be8e6e8 100644
--- a/csl/cse.csl
+++ b/csl/cse.csl
@@ -89,7 +89,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/fems.csl b/csl/fems.csl
index 6fbbcaf37..de531079d 100644
--- a/csl/fems.csl
+++ b/csl/fems.csl
@@ -99,7 +99,7 @@ FEMS Yeast Research</summary>
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/genesdev.csl b/csl/genesdev.csl
index 816850b77..071846268 100644
--- a/csl/genesdev.csl
+++ b/csl/genesdev.csl
@@ -95,7 +95,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/genomebiology.csl b/csl/genomebiology.csl
index 04cc19d6a..49d769fac 100644
--- a/csl/genomebiology.csl
+++ b/csl/genomebiology.csl
@@ -68,7 +68,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/harvard1.csl b/csl/harvard1.csl
index f868a17ae..d59ef50e2 100644
--- a/csl/harvard1.csl
+++ b/csl/harvard1.csl
@@ -87,7 +87,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/harvard2.csl b/csl/harvard2.csl
index 14546bdee..11261014b 100644
--- a/csl/harvard2.csl
+++ b/csl/harvard2.csl
@@ -89,7 +89,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/harvard3.csl b/csl/harvard3.csl
index 31703cb1f..837d74d59 100644
--- a/csl/harvard3.csl
+++ b/csl/harvard3.csl
@@ -95,7 +95,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/jbact.csl b/csl/jbact.csl
index 141a46e98..a910aa5c8 100644
--- a/csl/jbact.csl
+++ b/csl/jbact.csl
@@ -36,7 +36,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/meteoritics.csl b/csl/meteoritics.csl
index 4bbaeacb3..1101c3b45 100644
--- a/csl/meteoritics.csl
+++ b/csl/meteoritics.csl
@@ -94,7 +94,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/neuroreport.csl b/csl/neuroreport.csl
index 82abe71f3..e9ba5dab1 100644
--- a/csl/neuroreport.csl
+++ b/csl/neuroreport.csl
@@ -31,7 +31,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/nlm.csl b/csl/nlm.csl
index 538300ab9..a35454c7d 100644
--- a/csl/nlm.csl
+++ b/csl/nlm.csl
@@ -57,7 +57,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/nuc-acid-res.csl b/csl/nuc-acid-res.csl
index 7815d46cd..e7c60263d 100644
--- a/csl/nuc-acid-res.csl
+++ b/csl/nuc-acid-res.csl
@@ -63,7 +63,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/ou-harvard.csl b/csl/ou-harvard.csl
index 4a12e01b2..6c7355a15 100644
--- a/csl/ou-harvard.csl
+++ b/csl/ou-harvard.csl
@@ -104,7 +104,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/plos.csl b/csl/plos.csl
index 414bc7d64..8e4063cab 100644
--- a/csl/plos.csl
+++ b/csl/plos.csl
@@ -63,7 +63,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/pnas.csl b/csl/pnas.csl
index c27d425d4..091fb66ee 100644
--- a/csl/pnas.csl
+++ b/csl/pnas.csl
@@ -61,7 +61,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/rna.csl b/csl/rna.csl
index 932c80c35..f89c3f59f 100644
--- a/csl/rna.csl
+++ b/csl/rna.csl
@@ -95,7 +95,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>
diff --git a/csl/royal-society-chemistry.csl b/csl/royal-society-chemistry.csl
index 3d733cd31..7261b9a06 100644
--- a/csl/royal-society-chemistry.csl
+++ b/csl/royal-society-chemistry.csl
@@ -70,7 +70,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text value="edn" suffix="."/>
diff --git a/csl/science.csl b/csl/science.csl
index d3615c841..7cb7975af 100644
--- a/csl/science.csl
+++ b/csl/science.csl
@@ -63,7 +63,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <text term="edition" form="short" suffix="."/>
 	  <number variable="edition" form="numeric"/>
diff --git a/csl/yeast.csl b/csl/yeast.csl
index cd74e944a..af025105c 100644
--- a/csl/yeast.csl
+++ b/csl/yeast.csl
@@ -92,7 +92,7 @@
   </macro>
   <macro name="edition">
     <choose>
-      <if datatype="number" variable="edition">
+      <if is-numeric="edition">
 	<group delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
 	  <text term="edition" form="short" suffix="."/>