From: fred <fred>
Date: Tue, 26 Mar 2002 23:57:27 +0000 (+0000)
Subject: lilypond-1.3.99
X-Git-Tag: release/1.5.59~1231
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1696776adfa471ba7f5d8154b6da41821aef5603;p=lilypond.git

lilypond-1.3.99
---

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 2322691825..c18a61f614 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -36,9 +36,10 @@ protected:
 bool
 Text_engraver::do_try_music (Music *m)
 {
-  if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
+  if (dynamic_cast<Text_script_req*> (m)
+      && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
     {
-      reqs_.push (r);
+      reqs_.push (dynamic_cast<Text_script_req*> (m));
       return true;
     }
   return false;
@@ -85,15 +86,11 @@ Text_engraver::do_process_music ()
       // URG: Text vs TextScript
       String basic = "TextScript";
 
-#if 0
-      // maybe use some sort of TYPE for script/dynamic/finger?
-      
-				// separate engraver?
-      if (r->style_str_== "finger")
+      if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger"))
 	{
 	  basic = "Fingering";
 	}
-#endif
+
       Item *text = new Item (get_property (basic.ch_C ()));
 
       /*