X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=8e5fc8d447d8774b81857bb0d27781729bc99419;hb=1910858321182f0f642ec766f90254a81ac69c2f;hp=20d14b93354122fce47e13395dedec85c0b30d5a;hpb=fc6dec21f05dc474dde44ee6d0da3b83525f0430;p=lilypond.git

diff --git a/scm/c++.scm b/scm/c++.scm
index 20d14b9335..8e5fc8d447 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -2,43 +2,42 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2002 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))))
+
 (define-public (number-or-grob? x)
-  (or (ly:grob? x) (number? x))
-  )
+  (or (ly:grob? x) (number? x)))
 
 (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 (markup? x)
-  (or (string? x) (list? x)
-      (new-markup? 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.
@@ -49,15 +48,15 @@
       "Unknown type"
       (if (apply (caar alist) obj)
 	  (cdar alist)
-	  (match-predicate obj (cdr alist))
-	  )
-      ))
+	  (match-predicate obj (cdr alist)))))
 
 (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"
-	)))
+	"unknown")))