* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 5db60e1750c93f641f14cc2021ef8475674771ac..723e111741e04760f4bac5cde99403b68eb8f5cf 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -29,7 +29,7 @@ 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);
 };
 
@@ -37,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));
@@ -48,36 +49,36 @@ 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;
@@ -88,12 +89,7 @@ Text_engraver::create_grobs ()
       // 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 = new Item (get_property (basic.to_str0 ()));
 
       /*
        FIXME -> need to use basic props.
@@ -103,38 +99,22 @@ Text_engraver::create_grobs ()
       Axis ax = to_boolean (axisprop) ? X_AXIS : 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_grob_property ("script-priority");
+      if (gh_number_p (s))
+       priority = gh_scm2int (s);
       
-
+      /* see script-engraver.cc */
+      priority += i;
       
-      /*
-       make sure they're in order by adding i to the priority field.
-       */
-      text->set_grob_property ("script-priority",
-                             gh_int2scm (200 + i));
+      text->set_grob_property ("script-priority", gh_int2scm (priority));
 
       if (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);
     }
 }
@@ -165,5 +145,5 @@ ENTER_DESCRIPTION(Text_engraver,
 /* descr */       "Create text-scripts",
 /* creats*/       "TextScript",
 /* acks  */       "rhythmic-head-interface stem-interface",
-/* reads */       "scriptHorizontal textNonEmpty",
+/* reads */       "scriptHorizontal",
 /* write */       "");