* scm/bass-figure.scm (format-bass-figure): don't set

number-markup for strings. This fixes string in bass
figure. (backportme)

* lily/parser.yy (bass_number): insert number-markup into figure
definition.

* scm/define-music-properties.scm (all-music-properties): make
'figure a markup.

diff --git a/ChangeLog b/ChangeLog
index 59a9a7f8784bcfae1a9573ae12758eec30365fe6..347c3a8b8df4112e4a6daf8825d32ebfcdb05f31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-05-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/bass-figure.scm (format-bass-figure): don't set
+       number-markup for strings. This fixes string in bass
+       figure. (backportme)
+
+       * lily/parser.yy (bass_number): insert number-markup into figure
+       definition.
+
+       * scm/define-music-properties.scm (all-music-properties): make
+       'figure a markup.
+
        * scripts/convert-ly.py (conv): \apply -> \applymusic
 
 2004-05-06  Kristof Bastiaensen  <kristof.bastiaensen@vleeuwen.org>

diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index 8d40fcbd5c1f3a26ef411237815087c3e88c7d3b..27de09a2030f8f0d72d6e963e1bed0a11794401f 100644 (file)
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -6,7 +6,9 @@ figured bass requests and  rest-requests.  You must enter these using
 the special @code{\figures @{ @}} mode, which allows you to type
 numbers, like @code{<4 6+>}.
 
-You can also type letters by entering quoted strings.
+You can also type letters by entering quoted strings, which is shown in the
+last bass figure.
+
 " }
 
 \score { \notes  <<
@@ -19,8 +21,8 @@ You can also type letters by entering quoted strings.
        <3+ 5- 7!>
        <3 _! 5 _- 7>
        <3 _ 5 _ 7>
-\override FiguredBass.BassFigure  #'font-family = #'roman
        <"V7" ["bla" 6] 7>
+       
     }
  }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 261aa720f712af381521faecff4f4cf8ee991d7a..33d9e0e4a647b6eb24cd98ef6ec03623d3bef0aa 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2101,9 +2101,13 @@ tremolo_type:
 bass_number:
        DIGIT   {
                $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+               $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+                               $$);
        }
        | UNSIGNED {
                $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+               $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+                               $$);
        }
        | STRING { $$ = $1; }
        ;

diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index 4d7b19e24781f469381243377cbc931bd03aff9b..104793b86ffe57ea54dd63060cd4de6f161d15f0 100644 (file)
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -16,8 +16,8 @@
         (acc  (ly:music-property fig-music 'alteration))
         (acc-markup #f)
         (fig-markup
-         (if (string? fig)
-             (make-number-markup (make-simple-markup fig))
+         (if (markup? fig)
+             fig
              (if align-accs (make-simple-markup " ")
                  (if (not (eq? acc '()))
                      (make-simple-markup "")

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index bf7545bba2af94138c4cc99501bf56bd6f93b6b2..031bef9a9d6b49f824d605a7afceccdf23ac74e5 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -106,7 +106,7 @@ translation property")
                          "Change to what kind of state? Options are
 solo1, solo2 and unisono")
 
-     (figure ,string? "a `figure' (which may be
+     (figure ,markup? "a `figure' (which may be
 a string) for figured bass")
      (alteration ,number? "alteration for figured bass")
      (bracket-start ,boolean? "start a bracket