X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=46e029e79b6775349ff65bd7c9abc36e8ff56ce8;hb=d6e3999c729586616d61b97556f3844413697b51;hp=ba48473450e0da8ea869d48cb70cac022a7e183d;hpb=a341f45c2cf1494d291ebb21fd64d5c679ee6e19;p=lilypond.git

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index ba48473450..46e029e79b 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,118 +3,154 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
+
 #include "engraver.hh"
-#include "g-staff-side.hh"
-#include "g-text-item.hh"
-#include "text-def.hh"
-#include "note-head.hh"
+#include "side-position-interface.hh"
+#include "item.hh"
+#include "event.hh"
 #include "stem.hh"
-#include "staff-sym.hh"
+#include "rhythmic-head.hh"
+#include "text-item.hh"
+
 
+/**
+   typeset directions that are  plain text.
+ */
 class Text_engraver : public Engraver
 {
-  Link_array<Script_req> reqs_;
-  Link_array<G_staff_side_item> positionings_;
-  Link_array<G_text_item> texts_;
+  Link_array<Music> reqs_;
+  Link_array<Item> texts_;
 public:
-  Text_engraver();
-  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_requests ();
-  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 process_acknowledged_grobs ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-Text_engraver::Text_engraver ()
-{
-  
-}
-
 bool
-Text_engraver::do_try_music (Music *m)
+Text_engraver::try_music (Music *m)
 {
-  if (Script_req *r = dynamic_cast<Script_req*> (m))
+  if (m->is_mus_type ("text-script-event"))
     {
-      Text_def * t = dynamic_cast<Text_def*> (r->scriptdef_p_);
-      if (!t)
-	return false;
-      reqs_.push (r);
+      reqs_.push (m);
       return true;
     }
   return false;
 }
 
-
 void
-Text_engraver::acknowledge_element (Score_element_info i)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
+  if (Rhythmic_head::has_interface (inf.grob_))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i=0; i < texts_.size (); i++)
 	{
-	  positionings_[i]->add_support (n);
+	  Grob*t = texts_[i];
+	  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_, Y_AXIS);
+	  else if (Side_position_interface::get_axis (t) == Y_AXIS
+	      && !t->get_parent (X_AXIS))
+	    t->set_parent (inf.grob_, X_AXIS);
 	}
     }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
+  
+  if (Stem::has_interface (inf.grob_))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i=0; i < texts_.size (); i++)
 	{
-	  positionings_[i]->add_support (n);
+	  Side_position_interface::add_support (texts_[i],inf.grob_);
 	}
     }
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::process_acknowledged_grobs ()
 {
+  if (texts_.size ())
+    return;
   for (int i=0; i < reqs_.size (); i++)
     {
-      Script_req * r = reqs_[i];
-      Text_def * t= dynamic_cast<Text_def*> (r->scriptdef_p_);
+      Music * r = reqs_[i];
+      
+      // URG: Text vs TextScript
+      String basic = "TextScript";
+
+      Item *text = new Item (get_property (basic.to_str0 ()));
+
+      /*
+	FIXME -> need to use basic props.
+       */
+      SCM axisprop = get_property ("scriptHorizontal");
+      
+      Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
+      Side_position_interface::set_axis (text, ax);
 
-      G_text_item *text = new G_text_item;
-      G_staff_side_item *ss = new G_staff_side_item;
-      ss->set_victim (text);
-      ss->dir_ = r->dir_;
+      // Hmm
+      int priority = 200;
+      SCM s = text->get_grob_property ("script-priority");
+      if (gh_number_p (s))
+	priority = gh_scm2int (s);
+      
+      /* see script-engraver.cc */
+      priority += i;
+      
+      text->set_grob_property ("script-priority", gh_int2scm (priority));
 
-      text->text_str_ = t->text_str_;
+      Direction dir = to_dir (r->get_mus_property ("direction"));
+      if (dir)
+	Side_position_interface::set_direction (text, dir);
 
-      announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
 
+      SCM mark = r->get_mus_property ("text");
+
+      if (new_markup_p (mark))
+	text->set_grob_property ("molecule-callback", new_markup_brewer());
+      
+      text->set_grob_property ("text", mark);
+      announce_grob (text, r->self_scm ());
       texts_.push (text);
-      positionings_.push (ss);
     }
 }
 
 void
-Text_engraver::do_pre_move_processing ()
+Text_engraver::stop_translation_timestep ()
 {
-  Staff_symbol* s_l = get_staff_info().staff_sym_l_;
   for (int i=0; i < texts_.size (); i++)
     {
-      if (s_l != 0)
-	{
-	  positionings_[i]->add_support (s_l);
-	}
-
-      typeset_element (texts_[i]);
-      typeset_element (positionings_[i]);
+      Item *ti = texts_[i];
+      if (!to_boolean (get_property ("scriptHorizontal")))
+	Side_position_interface::add_staff_support (ti);
+      typeset_grob (ti);
     }
   texts_.clear ();
-  positionings_.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",
+/* accepts */     "text-script-event",
+/* acks  */      "rhythmic-head-interface stem-interface",
+/* reads */       "scriptHorizontal",
+/* write */       "");