Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index c3cd17ecdf3f3c02038a07b9d2a1ae013de50b16..f3bd6163828558557a9f30d5c581e28d98eaf690 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -34,6 +34,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,13 +49,23 @@
 (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.
@@ -61,19 +74,28 @@
 (define-public (format-bass-figure figure event context)
   (let* ((fig (ly:music-property event 'figure))
         (fig-markup (if (number? figure)
-                        (if (eq? #t (ly:music-property event 'diminished))
-                            (markup #:slashed-digit 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 #:fontsize
-                     (if (not (= alt DOUBLE-SHARP))
-                         -2 2)
-                     (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))