X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=38716da2af5d008b43a8145f37feccc89cc97cf1;hb=ce521e79fd7669b45c8c1132e4b5693a03b5d90a;hp=c18a61f614c9e023e440b0e031dc8f09934aa96c;hpb=5cbe821608ec464ea8f418cba15f012b9b1cad80;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index c18a61f614..38716da2af 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -24,17 +24,17 @@ class Text_engraver : public Engraver
   Link_array<Text_script_req> reqs_;
   Link_array<Item> texts_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Text_engraver);
 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 (dynamic_cast<Text_script_req*> (m)
       && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
@@ -46,39 +46,41 @@ Text_engraver::do_try_music (Music *m)
 }
 
 void
-Text_engraver::acknowledge_element (Score_element_info inf)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.elem_l_))
+  if (Rhythmic_head::has_interface (inf.grob_l_))
     {
       for (int i=0; i < texts_.size (); i++)
 	{
-	  Score_element*t = texts_[i];
-	  Side_position::add_support (t,inf.elem_l_);
+	  Grob*t = texts_[i];
+	  Side_position_interface::add_support (t,inf.grob_l_);
 
 	  /*
 	    ugh.
 	   */
-	  if (Side_position::get_axis( t) == X_AXIS
-	      && !t->parent_l (Y_AXIS))
-	    t->set_parent (inf.elem_l_, Y_AXIS);
-	  else if (Side_position::get_axis(t) == Y_AXIS
-	      && !t->parent_l (X_AXIS))
-	    t->set_parent (inf.elem_l_, X_AXIS);
+	  if (Side_position_interface::get_axis (t) == X_AXIS
+	      && !t->get_parent (Y_AXIS))
+	    t->set_parent (inf.grob_l_, Y_AXIS);
+	  else if (Side_position_interface::get_axis (t) == Y_AXIS
+	      && !t->get_parent (X_AXIS))
+	    t->set_parent (inf.grob_l_, X_AXIS);
 	}
     }
   
-  if (Stem::has_interface (inf.elem_l_))
+  if (Stem::has_interface (inf.grob_l_))
     {
       for (int i=0; i < texts_.size (); i++)
 	{
-	  Side_position::add_support(texts_[i],inf.elem_l_);
+	  Side_position_interface::add_support (texts_[i],inf.grob_l_);
 	}
     }
 }
 
 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];
@@ -99,7 +101,7 @@ Text_engraver::do_process_music ()
       SCM axisprop = get_property ("scriptHorizontal");
       
       Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
-      Side_position::set_axis (text, ax);
+      Side_position_interface::set_axis (text, ax);
 
 #if 0
       if (r->style_str_ == "finger" && ax == Y_AXIS)
@@ -107,8 +109,8 @@ Text_engraver::do_process_music ()
 	  /*
 	    nicely center the scripts.
 	   */ 
-	  text->add_offset_callback (Side_position::aligned_on_self_proc, X_AXIS);
-	  text->add_offset_callback (Side_position::centered_on_parent_proc, X_AXIS);
+	  text->add_offset_callback (Side_position_interface::aligned_on_self_proc, X_AXIS);
+	  text->add_offset_callback (Side_position_interface::centered_on_parent_proc, X_AXIS);
 	}
 #endif
       
@@ -117,43 +119,56 @@ 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 ());
+	Side_position_interface::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);
-		
-      announce_element (text, r);
+
+      if (gh_boolean_p (nonempty))
+	if (gh_scm2bool (nonempty))
+	  /*
+	    empty text: signal that no rods should be applied.
+	    Default nowadays.
+	  */
+	  text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
+	else
+	  text->set_grob_property ("no-spacing-rods" , SCM_BOOL_T);
+       
+      announce_grob (text, r->self_scm ());
       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);
+      if (!to_boolean (get_property ("scriptHorizontal")))
+	Side_position_interface::add_staff_support (ti);
+      typeset_grob (ti);
     }
   texts_.clear ();
 }
 
 void
-Text_engraver::do_post_move_processing ()
+Text_engraver::start_translation_timestep ()
 {
   reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);
 
+Text_engraver::Text_engraver(){}
+
+ENTER_DESCRIPTION(Text_engraver,
+/* descr */       "Create text-scripts",
+/* creats*/       "TextScript",
+/* acks  */       "rhythmic-head-interface stem-interface",
+/* reads */       "scriptHorizontal textNonEmpty",
+/* write */       "");