X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=fd965ac4d59d394bf5cd34e341689ad74b82ea45;hb=62b428826f37228ab4644dbaabac7935c17ecdcd;hp=12c38a397f0ac7d4b297c6c3c2dbb463cfc25124;hpb=c11f496ac9e637cf9a6c6794c631b148560548fa;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 12c38a397f..fd965ac4d5 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -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)))
 
@@ -74,8 +86,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)
 
@@ -93,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))