X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=39b0a973ffb7b719efec4f054c5e5a3fd055a540;hb=6b89a99dbfb2e208c42ba1510be9e638d21be4a9;hp=05b078285da0f39c4b7e5b6218008cce0506f91a;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 05b078285d..39b0a973ff 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,13 +24,12 @@ 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 try_music (Music* m);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
-  void deprecated_process_music ();
   virtual void acknowledge_grob (Grob_info);
 };
 
@@ -38,6 +37,7 @@ bool
 Text_engraver::try_music (Music *m)
 {
   if (dynamic_cast<Text_script_req*> (m)
+      && m->get_mus_property ("text-type") != ly_symbol2scm ("finger")
       && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
     {
       reqs_.push (dynamic_cast<Text_script_req*> (m));
@@ -49,42 +49,36 @@ Text_engraver::try_music (Music *m)
 void
 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++)
 	{
 	  Grob*t = texts_[i];
-	  Side_position::add_support (t,inf.elem_l_);
+	  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::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Text_engraver::deprecated_process_music ()
 {
   if (texts_.size ())
     return;
@@ -95,11 +89,6 @@ Text_engraver::deprecated_process_music ()
       // URG: Text vs TextScript
       String basic = "TextScript";
 
-      if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger"))
-	{
-	  basic = "Fingering";
-	}
-
       Item *text = new Item (get_property (basic.ch_C ()));
 
       /*
@@ -108,21 +97,8 @@ Text_engraver::deprecated_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)
-	{
-	  /*
-	    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);
-	}
-#endif
-      
-
-      
       /*
 	make sure they're in order by adding i to the priority field.
 	*/
@@ -130,18 +106,10 @@ Text_engraver::deprecated_process_music ()
 			      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_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_grob_property ("no-spacing-rods" , SCM_BOOL_F);
-		
-      announce_grob (text, r);
+      announce_grob (text, r->self_scm ());
       texts_.push (text);
     }
 }
@@ -152,7 +120,8 @@ Text_engraver::stop_translation_timestep ()
   for (int i=0; i < texts_.size (); i++)
     {
       Item *ti = texts_[i];
-      Side_position::add_staff_support (ti);
+      if (!to_boolean (get_property ("scriptHorizontal")))
+	Side_position_interface::add_staff_support (ti);
       typeset_grob (ti);
     }
   texts_.clear ();
@@ -164,5 +133,12 @@ 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",
+/* write */       "");