* lily/parser.yy (bass_number),

	Documentation/user/instrument-notation.itely (Figured bass):
	Add the possibility to use text markup in figured bass.

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 705f44a93c283082c4223ba22971d941e77813c4..b80a3d0a02c21bb1482ef3896c6ff7ee7e3a6c37 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -3773,16 +3773,18 @@ to the numbers
 @end lilypond
 
 Spaces or dashes may be inserted by using @code{_}.  Brackets are
-introduced with @code{[} and @code{]}
+introduced with @code{[} and @code{]}. You can also include text
+strings and text markups, see @ref{Overview of text markup commands}.
 
 @example
-< [4 6] 8 [_! 12] >
+< [4 6] 8 [_! 12] > < 5 \markup{ + \number 6 } >
 @end example
 @lilypond[quote,raggedright,fragment]
 \context FiguredBass
-\figuremode { < [4 6] 8 [_! 12] > }
+\figuremode { < [4 6] 8 [_! 12] > < 5 \markup{ + \number 6 } > }
 @end lilypond
 
+
 Although the support for figured bass may superficially resemble chord
 support, it works much simpler.  The @code{\figuremode} mode simply
 stores the numbers and @internalsref{FiguredBass} context prints

diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index 55f8a5feabfe0bdbeefe4b7a01f4b35476a1ff83..bba3adbd97d02171d688fe816b9fe54a49fb5aa1 100644 (file)
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -20,7 +20,7 @@ last bass figure.
        <3+ 5- 7!>
        <3 _! 5 _- 7>
        <3 _ 5 _ 7>
-       <"V7" ["bla" 6] 7>
+       <"V7" ["bla" 6] \markup{ \musicglyph #"rests.2"} >
        
     }
     \context Voice {

diff --git a/lily/parser.yy b/lily/parser.yy
index 21076e39300578e515f0a319d45a5b675653f09a..c2e714d3e6890b388c3cce8b31162467ff47205f 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2074,6 +2074,7 @@ bass_number:
                                $$);
        }
        | STRING { $$ = $1; }
+       | full_markup { $$ = $1; }
        ;
 
 bass_mod: