(double-plus-new-chord->markup): Fix sub->markup.

diff --git a/ChangeLog b/ChangeLog
index 9ee7a8b9d78abc36ab28e050416e0c9cc94abf9f..6fce883f2ad5c5e6a7f257abd100f0eedee045c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/double-plus-new-chord-name.scm
+       (double-plus-new-chord->markup): Fix sub->markup.
+
 2003-01-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * 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 703f02ed4238a0bad6d8adad8cf12107dc3177c2..11c2e71850303425c6bbb1a6e5c41e32bd36005b 100644 (file)
--- 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 "/"))))