From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 7 May 2004 10:41:04 +0000 (+0000)
Subject: * scm/bass-figure.scm (format-bass-figure): don't set
X-Git-Tag: release/2.3.1~15
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=07be9fcc058e41ab2cec96e852a60c1aff6333f8;p=lilypond.git

* 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 59a9a7f878..347c3a8b8d 100644
--- 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 8d40fcbd5c..27de09a203 100644
--- 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 261aa720f7..33d9e0e4a6 100644
--- 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 4d7b19e247..104793b86f 100644
--- 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 bf7545bba2..031bef9a9d 100644
--- 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