Merge branch 'translation'

[lilypond.git] / scm / c++.scm

diff --git a/scm/c++.scm b/scm/c++.scm
index 8d1df2aed7487b22c742780e4f73c0c12833fbd2..ec54ed28c9ebb9c57542154356958d14acd30fce 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -25,10 +25,19 @@
   (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)
        (index? (car x)) (index? (cdr x))))
 
+(define-public (rational-or-procedure? x)
+  (or
+   (and (rational? x) (exact? x))
+   (procedure? x)))
+
 (define-public (number-or-grob? x)
   (or (ly:grob? x) (number? x)))
 
@@ -62,6 +71,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)))
 
@@ -95,8 +107,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))