Run `make grand-replace'.

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

diff --git a/scm/c++.scm b/scm/c++.scm
index bcd343470a3bf8e293aa8b183be33f4ab25cde71..ee4de99005758b11de20e9de53a1e0cdb0349a83 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -2,15 +2,15 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;; Note: this file can't be used without LilyPond executable
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; type predicates.
-(define-public (number-pair?  x)
+(define-public (number-pair? x)
   (and (pair? x)
        (number? (car x)) (number? (cdr x))))
 
@@ -20,13 +20,16 @@
 (define-public (grob-list? x)
   (list? x))
 
-(define-public (moment-pair?  x)
+(define-public (moment-pair? x)
   (and (pair? x)
        (ly:moment? (car x)) (ly:moment? (cdr x))))
 
 (define-public (boolean-or-symbol? x)
   (or (boolean? x) (symbol? x)))
 
+(define-public (string-or-symbol? x)
+  (or (string? x) (symbol? x)))
+
 (define-public (number-or-string? x)
   (or (number? x) (string? x)))
 
@@ -47,7 +50,10 @@
 (define-public (object-type obj)
   (match-predicate obj type-p-name-alist))
 
-(define-public (type-name  predicate)
+(define-public (object-type-name obj)
+  (type-name (match-predicate obj type-p-name-alist)))
+
+(define-public (type-name predicate)
   (let ((entry (assoc predicate type-p-name-alist)))
     (if (pair? entry) (cdr entry)
        "unknown")))