From: Mats Bengtsson <mats.bengtsson@s3.kth.se>
Date: Wed, 23 Mar 2005 12:21:32 +0000 (+0000)
Subject: 	* lily/parser.yy (bass_number),
X-Git-Tag: release/2.5.17~50
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=700206cab83f93e39f9895e2e8ca94cc42b067bf;p=lilypond.git

	* 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 705f44a93c..b80a3d0a02 100644
--- 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 55f8a5feab..bba3adbd97 100644
--- 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 21076e3930..c2e714d3e6 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2074,6 +2074,7 @@ bass_number:
 				$$);
 	}
 	| STRING { $$ = $1; }
+	| full_markup { $$ = $1; }
 	;
 
 bass_mod: