X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fc%2B%2B.scm;h=adc21cea2301769664b8cdc1cd20e78a0f09d2af;hb=8557544c9f7d8b3650a94895c0098356d9e89f9e;hp=20d14b93354122fce47e13395dedec85c0b30d5a;hpb=fc6dec21f05dc474dde44ee6d0da3b83525f0430;p=lilypond.git diff --git a/scm/c++.scm b/scm/c++.scm index 20d14b9335..adc21cea23 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -2,25 +2,25 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2002 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; (c) 1998--2006 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys ;;; 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)))) @@ -30,15 +30,8 @@ (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 (scheme? x) #t) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; - ;; moved list to end of lily.scm: then all type-predicates are ;; defined. @@ -49,15 +42,13 @@ "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")))