(format-new-bass-figure): also

allow plus in combination with _

diff --git a/ChangeLog b/ChangeLog
index 0959ed04492e5aac4b6ec2b4e06fd5acef2479e1..fa054fa29e1c1262daecf3ace96e4a0e7b25c8f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/translation-functions.scm (format-new-bass-figure): also
+       allow plus in combination with _
+
 2005-10-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/note-collision.cc (check_meshing_chords): don't wipe

diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index b16768d5fdae20d9afd43af9b82cea976b1390a9..3f72803b286c8dd90138d378a59cb3a12e79b621 100644 (file)
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -77,6 +77,7 @@
         (plus-markup (if (eq? #t (ly:music-property event 'augmented))
                          (markup #:number "+")
                          #f))
+
         (alt-dir (ly:context-property context 'figuredBassAlterationDirection))
         )
 
@@ -104,12 +105,15 @@
                      #:pad-x 0.2 alt-markup
                      )))
 
+    
     (if plus-markup
        (set! fig-markup
-             (markup #:put-adjacent
-                     fig-markup
-                     X LEFT
-                     #:pad-x 0.2 plus-markup)))
+             (if fig-markup
+                 (markup #:put-adjacent
+                         fig-markup
+                         X LEFT
+                         #:pad-x 0.2 plus-markup)
+                 plus-markup)))
     
     (if (markup? fig-markup)
        (markup #:fontsize -2 fig-markup)