* lily/relocate.cc (setup_paths) [__MINGW32__]: Comment-out broken

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

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 5c8fe4bf0b6ad4950618b241de3c150a67d9e49e..9c4866a9ac6999eec1dd5eae1f147d8e0d095bfc 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -58,21 +58,30 @@
 ;; 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))
+                        (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
+                     #: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 +108,21 @@
                      #:pad-x 0.2 alt-markup
                      )))
 
-    (if (markup?  fig-markup)
-       fig-markup
-       empty-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)
+
+    ))