Add number-or-markup? predicate

diff --git a/scm/c++.scm b/scm/c++.scm
index 8d1df2aed7487b22c742780e4f73c0c12833fbd2..f0c5d3aea9f546980949318d6498d1dcef483ba8 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -62,6 +62,9 @@
 (define-public (number-or-string? x)
   (or (number? x) (string? x)))
 
+(define-public (number-or-markup? x)
+  (or (number? x) (markup? x)))
+
 (define-public (string-or-pair? x)
   (or (string? x) (pair? x)))
 

diff --git a/scm/lily.scm b/scm/lily.scm
index 4905e0687b6977e1284728d4fa0eae561e16a510..e5e8cd93d67d871ef2be83499d2b572db9a5bee3 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -575,6 +575,7 @@ messages into errors.")
     (,moment-pair? . "pair of moment objects")
     (,number-list? . "number list")
     (,number-or-grob? . "number or grob")
+    (,number-or-markup? . "number or markup")
     (,number-or-pair? . "number or pair")
     (,number-or-string? . "number or string")
     (,number-pair? . "pair of numbers")