X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=fe64b4473dcfb0be833ce17dbfc5dc35eb313c8b;hb=ff3d20fcb28e7ccf0fa9ad242dc16afb9cf0f7ba;hp=308df0ee5596868ec906249b09f6baf1b91610bc;hpb=a0b072ed070ca6abb36a11e015073b117103e35d;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 308df0ee55..fe64b4473d 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,9 +11,10 @@
 #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,7 +22,7 @@
  */
 class Text_engraver : public Engraver
 {
-  Link_array<Text_script_req> reqs_;
+  Link_array<Music> reqs_;
   Link_array<Item> texts_;
 public:
   TRANSLATOR_DECLARATIONS(Text_engraver);
@@ -36,11 +37,9 @@ protected:
 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"))
+  if (m->is_mus_type ("text-script-event"))
     {
-      reqs_.push (dynamic_cast<Text_script_req*> (m));
+      reqs_.push (m);
       return true;
     }
   return false;
@@ -49,30 +48,30 @@ 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->get_parent (Y_AXIS))
-	    t->set_parent (inf.grob_l_, Y_AXIS);
+	    t->set_parent (inf.grob_, 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);
+	    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_);
 	}
     }
 }
@@ -84,12 +83,12 @@ Text_engraver::process_acknowledged_grobs ()
     return;
   for (int i=0; i < reqs_.size (); i++)
     {
-      Text_script_req * r = reqs_[i];
+      Music * r = reqs_[i];
       
       // URG: Text vs TextScript
       String basic = "TextScript";
 
-      Item *text = new Item (get_property (basic.ch_C ()));
+      Item *text = new Item (get_property (basic.to_str0 ()));
 
       /*
 	FIXME -> need to use basic props.
@@ -99,16 +98,25 @@ Text_engraver::process_acknowledged_grobs ()
       Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
       Side_position_interface::set_axis (text, ax);
 
-      /*
-	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 ());
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_grob_property ("script-priority");
+      if (gh_number_p (s))
+	priority = gh_scm2int (s);
       
-      text->set_grob_property ("text", r->get_mus_property ("text"));
+      /* see script-engraver.cc */
+      priority += i;
+      
+      text->set_grob_property ("script-priority", gh_int2scm (priority));
+
+      Direction dir = to_dir (r->get_mus_property ("direction"));
+      if (dir)
+	Side_position_interface::set_direction (text, dir);
+
+
+      SCM mark = r->get_mus_property ("text");
+
+      text->set_grob_property ("text", mark);
       announce_grob (text, r->self_scm ());
       texts_.push (text);
     }
@@ -139,6 +147,7 @@ Text_engraver::Text_engraver(){}
 ENTER_DESCRIPTION(Text_engraver,
 /* descr */       "Create text-scripts",
 /* creats*/       "TextScript",
-/* acks  */       "rhythmic-head-interface stem-interface",
+/* accepts */     "text-script-event",
+/* acks  */      "rhythmic-head-interface stem-interface",
 /* reads */       "scriptHorizontal",
 /* write */       "");