X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=8db8bb96c079185d54da0b887180e0545a094227;hb=794dcbdb52faf4292036cd1b0270a956cf4316a3;hp=bcd343470a3bf8e293aa8b183be33f4ab25cde71;hpb=55a36d7beef61098884e49d6b853ce3d7a79811a;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index bcd343470a..8db8bb96c0 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -1,16 +1,16 @@
 ;;;; c++.scm -- implement Scheme frontends to C++ functions
 ;;;;
 ;;;;  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--2009 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,22 +20,28 @@
 (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)))
 
+(define-public (string-or-pair? x)
+  (or (string? x) (pair? x)))
+
 (define-public (scheme? x) #t)
 
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.
-(define type-p-name-alist '()) 
+(define type-p-name-alist '())
 
 (define (match-predicate obj alist)
   (if (null? alist)
@@ -47,7 +53,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")))