X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftext-engraver.cc;h=cb668b414608a00662aede9453005f015fcdaa9b;hb=94189ec2b8da6d7e89dc619c646a927adead9b19;hp=232269182510925be878c96cadcdb2ad67feebce;hpb=8ecd09ad7514d57630fb611d38c161f3c3c708db;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 2322691825..cb668b4146 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -26,32 +26,33 @@ class Text_engraver : public Engraver
 public:
   VIRTUAL_COPY_CONS(Translator);
 protected:
-  virtual bool do_try_music (Music* m);
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void do_process_music ();
-  virtual void acknowledge_element (Score_element_info);
+  virtual bool try_music (Music* m);
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
+  virtual void create_grobs ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
 bool
-Text_engraver::do_try_music (Music *m)
+Text_engraver::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;
 }
 
 void
-Text_engraver::acknowledge_element (Score_element_info inf)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Rhythmic_head::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
 	{
-	  Score_element*t = texts_[i];
+	  Grob*t = texts_[i];
 	  Side_position::add_support (t,inf.elem_l_);
 
 	  /*
@@ -76,8 +77,10 @@ Text_engraver::acknowledge_element (Score_element_info inf)
 }
 
 void
-Text_engraver::do_process_music ()
+Text_engraver::create_grobs ()
 {
+  if (texts_.size ())
+    return;
   for (int i=0; i < reqs_.size (); i++)
     {
       Text_script_req * r = reqs_[i];
@@ -85,15 +88,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 ()));
 
       /*
@@ -120,40 +119,40 @@ Text_engraver::do_process_music ()
       /*
 	make sure they're in order by adding i to the priority field.
 	*/
-      text->set_elt_property ("script-priority",
+      text->set_grob_property ("script-priority",
 			      gh_int2scm (200 + i));
 
       if (r->get_direction ())
 	Side_position::set_direction (text, r->get_direction ());
       
-      text->set_elt_property ("text", r->get_mus_property ("text"));
+      text->set_grob_property ("text", r->get_mus_property ("text"));
       
       SCM nonempty = get_property ("textNonEmpty");
       if (to_boolean (nonempty))
 	/*
 	  empty text: signal that no rods should be applied.  
 	 */
-	text->set_elt_property ("no-spacing-rods" , SCM_BOOL_F);
+	text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
 		
-      announce_element (text, r);
+      announce_grob (text, r);
       texts_.push (text);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
   for (int i=0; i < texts_.size (); i++)
     {
       Item *ti = texts_[i];
       Side_position::add_staff_support (ti);
-      typeset_element (ti);
+      typeset_grob (ti);
     }
   texts_.clear ();
 }
 
 void
-Text_engraver::do_post_move_processing ()
+Text_engraver::start_translation_timestep ()
 {
   reqs_.clear ();
 }