From: hanwen <hanwen>
Date: Tue, 30 Dec 2003 15:58:59 +0000 (+0000)
Subject: (process_music): only set rehearsalMark if
X-Git-Tag: release/2.1.4~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f3e3c06bea2d9e038685466a6fde978f0b26d771;p=lilypond.git

(process_music): only set rehearsalMark if
it is a string or number.
---

diff --git a/ChangeLog b/ChangeLog
index e93695117b..d57f00960c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-12-30  Han-Wen Nienhuys   <hanwen@cs.uu.nl>
 
+	* lily/mark-engraver.cc (process_music): only set rehearsalMark if
+	it is a string or number.
+
 	* scm/output-lib.scm (note-head-style->attachment-coordinates):
 	change calling convention of stem-attachment function. 
 
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index f4d34e8f2c..325bdd1896 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -10,9 +10,8 @@
 @itemize
 @item
 The weight of the stafflines is now heavier at smaller staff sizes.
-To match this, the font has been revamped completely for looking: the
-font is now much heavier for smaller sizes, and the note heads are
-more rounded in smaller sizes.
+The font has been modified to match this look: at smaller sizes, the
+font is heavier and the note heads are more rounded.
 
 @item Processing scores is now done while parsing the file. New
 Scheme functions give more flexibility: for example, it is now possible
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index de66bca0ec..dc75369fc7 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -111,6 +111,8 @@ Mark_engraver::try_music (Music* r)
 
   TODO: make the increment function in Scheme.
 
+
+  TODO: junk the number type for rehearsalMark
 */
 void
 Mark_engraver::process_music ()
@@ -186,7 +188,8 @@ Mark_engraver::process_music ()
 	    text_->set_grob_property ("font-family",  family);
 	}
 
-      daddy_trans_->set_property ("rehearsalMark", m);
+      if (gh_number_p (m) || gh_string_p (m))
+	daddy_trans_->set_property ("rehearsalMark", m);
     }
 }