From: Jan Nieuwenhuizen Date: Mon, 6 Jan 2003 23:51:06 +0000 (+0000) Subject: (double-plus-new-chord->markup): Fix sub->markup. X-Git-Tag: release/1.7.11~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c1751b07b84828e6243b76970f7e110947d7aabd;p=lilypond.git (double-plus-new-chord->markup): Fix sub->markup. --- diff --git a/ChangeLog b/ChangeLog index 9ee7a8b9d7..6fce883f2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-07 Jan Nieuwenhuizen + + * scm/double-plus-new-chord-name.scm + (double-plus-new-chord->markup): Fix sub->markup. + 2003-01-06 Jan Nieuwenhuizen * input/test/dpncnt.ly: New file. diff --git a/scm/double-plus-new-chord-name.scm b/scm/double-plus-new-chord-name.scm index 703f02ed42..11c2e71850 100644 --- a/scm/double-plus-new-chord-name.scm +++ b/scm/double-plus-new-chord-name.scm @@ -138,13 +138,15 @@ input/test/dpncnt.ly). (list (accidental->markup (step-alteration pitch)) (make-simple-markup (number->string (step-nr pitch)))))) - - (define (sub->markup pitch) - ;;(make-line-markup (list (make-simple-markup "no") (step->markup pitch)))) - ;; urg - (make-line-markup (list (make-simple-markup "no") - (step->markup-plusminus pitch)))) - + + ;; tja, kennok + (define (make-sub->markup step->markup) + (lambda (pitch) + (make-line-markup (list (make-simple-markup "no") + (step->markup pitch))))) + + (define (step-based-sub->markup step->markup pitch) + (make-line-markup (list (make-simple-markup "no") (step->markup pitch)))) (define (get-full-list pitch) (if (< (step-nr pitch) (step-nr (tail pitches))) @@ -190,6 +192,10 @@ input/test/dpncnt.ly). (assoc-default 'tonic->markup options pitch->markup)) (step->markup (assoc-default 'step->markup options step->markup-plusminus)) + (sub->markup + (assoc-default + 'sub->markup options + (lambda (x) (step-based-sub->markup step->markup x)))) (sep (assoc-default 'separator options (make-simple-markup "/"))))