X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=a131e7f3428d95870bcc3ec05b1643fe7d899552;hb=067e2c253099a922cc42d8720f76484cf00f2dc5;hp=7d5c85a8bee6ee8e3df34c4e722840c283bb2b50;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 7d5c85a8be..a131e7f342 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -25,10 +25,13 @@
   (and (pair? x)
        (number? (car x)) (number? (cdr x))))
 
+(define-public (number-pair-list? x)
+  (and (list? x)
+       (every number-pair? x)))
+
 (define-public (fraction? x)
   (and (pair? x)
-       (integer? (car x)) (integer? (cdr x))
-       (>= (car x) 0) (>= (cdr x) 0)))
+       (index? (car x)) (index? (cdr x))))
 
 (define-public (number-or-grob? x)
   (or (ly:grob? x) (number? x)))
@@ -39,6 +42,9 @@
 (define-public (number-list? x)
   (and (list? x) (every number? x)))
 
+(define-public (index? x)
+  (and (integer? x) (>= x 0)))
+
 (define-public (moment-pair? x)
   (and (pair? x)
        (ly:moment? (car x)) (ly:moment? (cdr x))))
@@ -46,23 +52,39 @@
 (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)))
 
+(define-public (string-or-music? x)
+  (or (string? x) (ly:music? x)))
+
 (define-public (number-or-pair? x)
   (or (number? x) (pair? x)))
 
 (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)
 
@@ -80,8 +102,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))