Imported sources

[lilypond.git] / scm / bass-figure.scm

diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index cfe44b6b94d9796dfbefb716e9c65c3f5989faa2..9c72b95ed07977e162df4e8bf7d372433aa6be81 100644 (file)
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -9,12 +9,13 @@
   (if (null? l)
       '()
       (let*
-         ((x (split-at pred? l)))
+         ((x (split-at-predicate pred? l)))
        (set-cdr! x (recursive-split-at pred? (cdr x)))
        x
        )))
 
 (define-public (make-bass-figure-markup figures context)
+  
   (define (no-end-bracket? f1 f2)
     (eq? (ly:get-mus-property f1 'bracket-stop) '())
     )
@@ -25,22 +26,24 @@
   ;; TODO: support slashed numerals here.
   (define (fig-to-markup fig-music)
     (let*
-       (
+       ((align-accs (eq? #t (ly:get-context-property context 'alignBassFigureAccidentals)))
         (fig  (ly:get-mus-property fig-music 'figure))
         (acc  (ly:get-mus-property fig-music 'alteration))
         (acc-markup #f)
         (fig-markup
-         (if (number? fig)
-             (make-number-markup (number->string fig))
-             (make-simple-markup " ")
-             ))
-        )
+         (if (string? fig)
+             (make-simple-markup fig)
+             (if align-accs (make-simple-markup " ")
+                 (if (not (eq? acc '()))
+                     (make-simple-markup "")
+                     (make-strut-markup)))
+             )))
 
-    (if (number? acc)
-       (make-line-markup (list fig-markup
-                               (alteration->text-accidental-markup acc)))
-       fig-markup)
-    ))
+      (if (number? acc)
+         (make-line-markup (list fig-markup
+                                 (alteration->text-accidental-markup acc)))
+         fig-markup)
+      ))
   
   (define (fig-seq-to-markup figs)
     (let*