X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=f0c5d3aea9f546980949318d6498d1dcef483ba8;hb=721b84a22f7da5cb3eea8a5fbe82995cc43b0807;hp=0ea05c944c8e0553ab91f60813e1fcb4e8185fba;hpb=fed50e05f7759ca14f2726c970f572c9cd00cd13;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 0ea05c944c..f0c5d3aea9 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -27,8 +27,7 @@
 
 (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 +38,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 +48,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)
 
@@ -70,7 +88,7 @@
   (or (symbol? x) (boolean? x)))
 
 (define-public (void? x)
-  (eq? x (begin)))
+  (unspecified? x))
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.