From: fred <fred>
Date: Wed, 27 Mar 2002 00:34:27 +0000 (+0000)
Subject: lilypond-1.3.116
X-Git-Tag: release/1.5.59~1048
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ccd45b8dc9cbd77afc06c19018a1b8be458daec5;p=lilypond.git

lilypond-1.3.116
---

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e903781f7e..ad7051f04c 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -47,23 +47,16 @@ Instrument_name_engraver::stop_translation_timestep ()
     }
 }
 
-/*
-  FIXME: use different mechanics, and use a markup-p function?
- */
 void
 Instrument_name_engraver::create_text (SCM txt)
 {
   if(!text_)
     {
       text_ = new Item (get_property ("InstrumentName"));
-      if (txt != SCM_EOL)
-        {
-          text_->set_grob_property ("text", txt);
-        }
-      else if (text_->get_grob_property ("text") == SCM_EOL)
-        {
-          return;
-        }
+      
+      if (text_->get_grob_property ("text") != txt)
+	text_->set_grob_property ("text", txt);
+     
       if (delim_)
         text_->set_parent (delim_, Y_AXIS);
       
@@ -81,10 +74,12 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
       if (now_mom () > Moment (0))
 	s = get_property ("instr");
 
-      //      if (gh_string_p (s))
-      //	{
-	  create_text (s);
-	  //	}
+      /*
+	FIXME: use markup_p () to check type.
+      */
+      if (gh_string_p (s))
+	create_text (s);
+	  
     }
 
   if (Align_interface::has_interface (i.elem_l_)