release: 1.3.131

[lilypond.git] / lily / text-engraver.cc

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 508ac78268c94625ba4b6bd8c9810380fa60b650..cb668b414608a00662aede9453005f015fcdaa9b 100644 (file)
--- 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -26,35 +26,33 @@ class Text_engraver : public Engraver
 public:
   VIRTUAL_COPY_CONS(Translator);
 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 (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
+  if (dynamic_cast<Text_script_req*> (m)
+      && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic"))
     {
-      if (r->style_str_ == "dynamic")
-       return false;
-      
-      reqs_.push (r);
+      reqs_.push (dynamic_cast<Text_script_req*> (m));
       return true;
     }
   return false;
 }
 
 void
-Text_engraver::acknowledge_element (Score_element_info inf)
+Text_engraver::acknowledge_grob (Grob_info inf)
 {
   if (Rhythmic_head::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
        {
-         Score_element*t = texts_[i];
+         Grob*t = texts_[i];
          Side_position::add_support (t,inf.elem_l_);
 
          /*
@@ -79,78 +77,82 @@ Text_engraver::acknowledge_element (Score_element_info inf)
 }
 
 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];
+      
+      // URG: Text vs TextScript
+      String basic = "TextScript";
 
-      String basic =  "basicTextScriptProperties";
-
-                               // separate engraver?
-      if (r->style_str_== "finger")
+      if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger"))
        {
-         basic = "basicFingeringProperties";
+         basic = "Fingering";
        }
-      Item *text = new Item (get_property (basic.ch_C()));
 
+      Item *text = new Item (get_property (basic.ch_C ()));
 
+      /*
+       FIXME -> need to use basic props.
+       */
       SCM axisprop = get_property ("scriptHorizontal");
+      
       Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS;
       Side_position::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, X_AXIS);
-         text->add_offset_callback (Side_position::centered_on_parent, X_AXIS);
+         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.
        */
-      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 ());
       
-      text->set_elt_property ("text",
-                             ly_str02scm ( r->text_str_.ch_C ()));
+      text->set_grob_property ("text", r->get_mus_property ("text"));
       
-      if (r->style_str_.length_i ())
-       text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
-
       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);
+       text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F);
                
-      announce_element (text, r);
+      announce_grob (text, r);
       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);
+      typeset_grob (ti);
     }
   texts_.clear ();
 }
 
 void
-Text_engraver::do_post_move_processing ()
+Text_engraver::start_translation_timestep ()
 {
   reqs_.clear ();
 }