X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=8f4986a257ba72fe1ef0cefba10f792062cb2c6f;hb=0fe21050c324f0c9fe4d06d68178172623df2493;hp=444a3e9ba6534b9201c26937785bcbb4fc9e6a5d;hpb=cb951038d3e74a85ec8539d0dc51260088251556;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 444a3e9ba6..8f4986a257 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -48,12 +48,23 @@
 (define-public (boolean-or-symbol? x)
   (or (boolean? x) (symbol? x)))
 
+(define-public (symbol-list? x)
+  (and (list? x) (every symbol? x)))
+
+(define-public (symbol-list-or-music? x)
+  (if (list? x)
+      (every symbol? x)
+      (ly:music? x)))
+
 (define-public (string-or-symbol? x)
   (or (string? x) (symbol? x)))
 
 (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)))
 
@@ -66,8 +77,10 @@
 (define-public (cheap-list? x)
   (or (pair? x) (null? x)))
 
-(define-public (list-or-symbol? x)
-  (or (cheap-list? x) (symbol? x)))
+(define-public (symbol-list-or-symbol? x)
+  (if (list? x)
+      (every symbol? x)
+      (symbol? x)))
 
 (define-public (scheme? x) #t)
 
@@ -85,8 +98,8 @@
   (if (null? alist)
       "Unknown type"
       (if (apply (caar alist) obj)
-	  (cdar alist)
-	  (match-predicate obj (cdr alist)))))
+          (cdar alist)
+          (match-predicate obj (cdr alist)))))
 
 (define-public (object-type obj)
   (match-predicate obj type-p-name-alist))