(listen_beam): add method for

[lilypond.git] / scm / translation-functions.scm

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index aa536c2e5c0d7830568a3b422fc2c8e8cb02fe0a..e687c32faef5cd411d8714de847d378f4a3605c2 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -2,18 +2,9 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
-(define-public (denominator-tuplet-formatter mus)
-  (number->string (ly:music-property mus 'denominator)))
-
-(define-public (fraction-tuplet-formatter mus)
-  (string-append
-   (number->string (ly:music-property mus 'denominator))
-   ":"
-   (number->string (ly:music-property mus 'numerator))))
-
 ;; metronome marks
 (define-public (format-metronome-markup event context)
   (let* ((dur (ly:music-property event 'tempo-unit))
@@ -34,6 +25,9 @@
 (define-public (format-mark-box-alphabet mark context)
   (make-bold-markup (make-box-markup (make-markalphabet-markup (1- mark)))))
 
+(define-public (format-mark-circle-alphabet mark context)
+  (make-bold-markup (make-circle-markup (make-markalphabet-markup (1- mark)))))
+
 (define-public (format-mark-letters mark context)
   (make-bold-markup (make-markletter-markup (1- mark))))
 
@@ -46,33 +40,61 @@
 (define-public (format-mark-box-letters mark context)
   (make-bold-markup (make-box-markup (make-markletter-markup (1- mark)))))
 
+(define-public (format-mark-circle-letters mark context)
+  (make-bold-markup (make-circle-markup (make-markletter-markup (1- mark)))))
+
 (define-public (format-mark-box-numbers mark context)
   (make-bold-markup (make-box-markup (number->string mark))))
 
+(define-public (format-mark-circle-numbers mark context)
+  (make-bold-markup (make-circle-markup (number->string mark))))
+
 (define-public (format-mark-box-barnumbers mark context)
   (make-bold-markup (make-box-markup
     (number->string (ly:context-property context 'currentBarNumber)))))
 
+(define-public (format-mark-circle-barnumbers mark context)
+  (make-bold-markup (make-circle-markup
+    (number->string (ly:context-property context 'currentBarNumber)))))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Bass figures.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-public (format-new-bass-figure figure event context)
+(define-public (format-bass-figure figure event context)
   (let* ((fig (ly:music-property event 'figure))
         (fig-markup (if (number? figure)
-                        (markup #:number (number->string figure 10))
+
+                        ;; this is not very elegant, but center-aligning all digits
+                        ;; is problematic with other markups, and shows problems
+                        ;; in the (lack of) overshoot of feta alphabet glyphs.
+                        
+                        ((if (<= 10 figure)
+                             (lambda (y) (make-translate-scaled-markup (cons -0.7 0) y))
+                             identity)
+
+                         (if (eq? #t (ly:music-property event 'diminished))
+                             (markup #:slashed-digit figure)
+                             (markup #:number (number->string figure 10))))
                         #f
                         ))
         (alt (ly:music-property event 'alteration))
         (alt-markup
          (if (number? alt)
              (markup
-                     #:general-align Y DOWN #:smaller #:smaller
-                     (alteration->text-accidental-markup alt))
+              #:general-align Y DOWN #:fontsize
+              (if (not (= alt DOUBLE-SHARP))
+                  -2 2)
+              (alteration->text-accidental-markup alt))
              
              #f))
+        (plus-markup (if (eq? #t (ly:music-property event 'augmented))
+                         (markup #:number "+")
+                         #f))
+
         (alt-dir (ly:context-property context 'figuredBassAlterationDirection))
+        (plus-dir (ly:context-property context 'figuredBassPlusDirection))
         )
 
     (if (and (not fig-markup) alt-markup)
@@ -99,7 +121,21 @@
                      #:pad-x 0.2 alt-markup
                      )))
 
+    
+    (if plus-markup
+       (set! fig-markup
+             (if fig-markup
+                 (markup #:put-adjacent
+                         fig-markup
+                         X (if (number? plus-dir)
+                               plus-dir
+                               LEFT)
+                         #:pad-x 0.2 plus-markup)
+                 plus-markup)))
+    
     (if (markup? fig-markup)
        (markup #:fontsize -2 fig-markup)
-       empty-markup)))
+       empty-markup)
+
+    ))