X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=b6ec6a4ee7602c31e8daca2ac365102bd64a12e7;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=61fb34e7826130dc4b9ce6865ea20a18aba7f137;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 61fb34e782..b6ec6a4ee7 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -2,8 +2,8 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 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
 
@@ -27,9 +27,15 @@
 (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)
 
 
@@ -46,8 +52,10 @@
 
 (define-public (object-type obj)
   (match-predicate obj type-p-name-alist))
+
 (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)