* scm/output-lib.scm (fret-number-tablature-format): vcenter and

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

diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index 804198a6c91c3ce7a41e3a45e57522997358279a..46d4af745769d71078ea0731fff07c1b373746c1 100644 (file)
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -1,34 +1,36 @@
-;;;; figured bass support ...
+;;;; bass-figure.scm -- implement Scheme output routines for TeX
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
 
 (ly:add-interface
-'bass-figure-interface
+ 'bass-figure-interface
  "A bass figure, including bracket"
  '())
 
-
-
 (define-public (format-bass-figure figures context grob)
   ;; TODO: support slashed numerals here.
   (define (fig-to-markup fig-music)
-    (let*
-       ((align-accs (eq? #t (ly:context-property context 'alignBassFigureAccidentals)))
-        (fig  (ly:music-property fig-music 'figure))
-        (acc  (ly:music-property fig-music 'alteration))
-        (acc-markup #f)
-        (fig-markup
-         (if (string? fig)
-             (make-simple-markup fig)
-             (if align-accs (make-simple-markup " ")
-                 (if (not (eq? acc '()))
-                     (make-simple-markup "")
-                     (make-strut-markup)))
-             )))
+    (let* ((align-accs
+           (eq? #t (ly:context-property context 'alignBassFigureAccidentals)))
+          (fig (ly:music-property fig-music 'figure))
+          (acc (ly:music-property fig-music 'alteration))
+          (acc-markup #f)
+          (fig-markup
+           (if (markup? fig)
+               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)
-      ))
+         fig-markup)))
 
   (define (filter-brackets i figs acc)
     (cond
@@ -37,10 +39,10 @@
       (filter-brackets (1+ i) (cdr figs)
 
                       (append
-                       (if  (eq? (ly:music-property (car figs) 'bracket-start) #t)
+                       (if (eq? (ly:music-property (car figs) 'bracket-start) #t)
                             (list i)
                             '())
-                       (if  (eq? (ly:music-property (car figs) 'bracket-stop) #t)
+                       (if (eq? (ly:music-property (car figs) 'bracket-stop) #t)
                             (list i)
                             '())
                        
@@ -49,5 +51,4 @@
   (set! (ly:grob-property grob 'text)
        (make-bracketed-y-column-markup
         (sort (filter-brackets 0 figures '()) <)
-        (map fig-to-markup figures)
-        )))
+        (map fig-to-markup figures))))