X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftext-engraver.cc;h=af6e4c5869aac5d2d54e9a4e9165eb2d3427bbf9;hb=99433c54bea756a38ed6b2a70bc8c90cd0d37902;hp=5db60e1750c93f641f14cc2021ef8475674771ac;hpb=736bfdaea194aade5d20d9f749f009c96d41b953;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 5db60e1750..af6e4c5869 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,17 +3,17 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
-
+#include "directional-element-interface.hh"
 #include "engraver.hh"
 #include "side-position-interface.hh"
 #include "item.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
+#include "text-item.hh"
 
 
 /**
@@ -21,25 +21,23 @@
  */
 class Text_engraver : public Engraver
 {
-  Link_array<Text_script_req> reqs_;
+  Link_array<Music> evs_;
   Link_array<Item> texts_;
 public:
-  TRANSLATOR_DECLARATIONS(Text_engraver);
+  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 ();
+  virtual void process_acknowledged_grobs ();
   virtual void acknowledge_grob (Grob_info);
 };
 
 bool
 Text_engraver::try_music (Music *m)
 {
-  if (dynamic_cast<Text_script_req*> (m)
-      && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
+  if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (dynamic_cast<Text_script_req*> (m));
+      evs_.push (m);
       return true;
     }
   return false;
@@ -48,93 +46,69 @@ Text_engraver::try_music (Music *m)
 void
 Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Rhythmic_head::has_interface (inf.grob_l_))
+  if (Rhythmic_head::has_interface (inf.grob_))
     {
       for (int i=0; i < texts_.size (); i++)
 	{
 	  Grob*t = texts_[i];
-	  Side_position_interface::add_support (t,inf.grob_l_);
+	  Side_position_interface::add_support (t,inf.grob_);
 
 	  /*
 	    ugh.
 	   */
 	  if (Side_position_interface::get_axis (t) == X_AXIS
-	      && !t->parent_l (Y_AXIS))
-	    t->set_parent (inf.grob_l_, Y_AXIS);
+	      && !t->get_parent (Y_AXIS))
+	    t->set_parent (inf.grob_, Y_AXIS);
 	  else if (Side_position_interface::get_axis (t) == Y_AXIS
-	      && !t->parent_l (X_AXIS))
-	    t->set_parent (inf.grob_l_, X_AXIS);
+	      && !t->get_parent (X_AXIS))
+	    t->set_parent (inf.grob_, X_AXIS);
 	}
     }
   
-  if (Stem::has_interface (inf.grob_l_))
+  if (Stem::has_interface (inf.grob_))
     {
       for (int i=0; i < texts_.size (); i++)
 	{
-	  Side_position_interface::add_support (texts_[i],inf.grob_l_);
+	  Side_position_interface::add_support (texts_[i],inf.grob_);
 	}
     }
 }
 
 void
-Text_engraver::create_grobs ()
+Text_engraver::process_acknowledged_grobs ()
 {
   if (texts_.size ())
     return;
-  for (int i=0; i < reqs_.size (); i++)
+  for (int i=0; i < evs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
+      Music * r = evs_[i];
       
       // 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 ()));
+      Item *text = make_item ("TextScript", r->self_scm ());
 
-      /*
-	FIXME -> need to use basic props.
-       */
-      SCM axisprop = get_property ("scriptHorizontal");
       
-      Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
+      Axis ax = Y_AXIS;
       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_interface::aligned_on_self_proc, X_AXIS);
-	  text->add_offset_callback (Side_position_interface::centered_on_parent_proc, X_AXIS);
-	}
-#endif
-      
-
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_property ("script-priority");
+      if (ly_c_number_p (s))
+	priority = ly_scm2int (s);
       
-      /*
-	make sure they're in order by adding i to the priority field.
-	*/
-      text->set_grob_property ("script-priority",
-			      gh_int2scm (200 + i));
-
-      if (r->get_direction ())
-	Side_position_interface::set_direction (text, r->get_direction ());
+      /* see script-engraver.cc */
+      priority += i;
       
-      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);
+      text->set_property ("script-priority", scm_int2num (priority));
+
+      Direction dir = to_dir (r->get_property ("direction"));
+      if (dir)
+	set_grob_direction (text, dir);
+
+
+      SCM mark = r->get_property ("text");
+
+      text->set_property ("text", mark);
       texts_.push (text);
     }
 }
@@ -142,28 +116,19 @@ Text_engraver::create_grobs ()
 void
 Text_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < texts_.size (); i++)
-    {
-      Item *ti = texts_[i];
-      if (!to_boolean (get_property ("scriptHorizontal")))
-	Side_position_interface::add_staff_support (ti);
-      typeset_grob (ti);
-    }
   texts_.clear ();
+  evs_.clear ();
 }
 
-void
-Text_engraver::start_translation_timestep ()
+
+Text_engraver::Text_engraver ()
 {
-  reqs_.clear ();
 }
 
-
-Text_engraver::Text_engraver(){}
-
-ENTER_DESCRIPTION(Text_engraver,
+ENTER_DESCRIPTION (Text_engraver,
 /* descr */       "Create text-scripts",
 /* creats*/       "TextScript",
-/* acks  */       "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal textNonEmpty",
+/* accepts */     "text-script-event",
+/* acks  */      "rhythmic-head-interface stem-interface",
+/* reads */       "",
 /* write */       "");