release: 1.3.88

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 97b7a18a24055e383eb235b569e815ef8afe3dbb..ffb578c120a4132cfff224872f8f68e221eb8768 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -7,14 +7,13 @@
   
  */
 
-#include "dimension-cache.hh"
+
 #include "engraver.hh"
 #include "side-position-interface.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "musical-request.hh"
-#include "note-head.hh"
 #include "stem.hh"
-#include "staff-symbol.hh"
+#include "rhythmic-head.hh"
 
 /**
    typeset directions that are  plain text.
@@ -22,9 +21,8 @@
 class Text_engraver : public Engraver
 {
   Link_array<Text_script_req> reqs_;
-  Link_array<Text_item> texts_;
+  Link_array<Item> texts_;
 public:
-
   VIRTUAL_COPY_CONS(Translator);
 protected:
   virtual bool do_try_music (Music* m);
@@ -40,6 +38,9 @@ Text_engraver::do_try_music (Music *m)
 {
   if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
     {
+      if (r->style_str_ == "dynamic")
+       return false;
+      
       reqs_.push (r);
       return true;
     }
@@ -48,25 +49,24 @@ Text_engraver::do_try_music (Music *m)
 
 
 void
-Text_engraver::acknowledge_element (Score_element_info i)
+Text_engraver::acknowledge_element (Score_element_info inf)
 {
-  if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
+  if (Rhythmic_head::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
        {
-         Side_position_interface st (texts_[i]);
-         st.add_support (n);
-         if (st.get_axis( ) == X_AXIS
-             && !texts_[i]->parent_l (Y_AXIS))
-           texts_[i]->set_parent (n, Y_AXIS);
+         Score_element*t = texts_[i];
+         Side_position::add_support (t,inf.elem_l_);
+         if (Side_position::get_axis( t) == X_AXIS
+             && !t->parent_l (Y_AXIS))
+           t->set_parent (inf.elem_l_, Y_AXIS);
        }
     }
-  if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
+  if (Stem::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
        {
-         Side_position_interface st(texts_[i]);
-         st.add_support (n);
+         Side_position::add_support(texts_[i],inf.elem_l_);
        }
     }
 }
@@ -78,23 +78,21 @@ Text_engraver::do_process_music ()
     {
       Text_script_req * r = reqs_[i];
 
-      Text_item *text = new Text_item;
-      Side_position_interface stafy (text);
+      Item *text = new Item (get_property ("basicTextScriptProperties"));
+      
 
       SCM axisprop = get_property ("scriptHorizontal");
-      if (to_boolean (axisprop))
-       {
-         stafy.set_axis (X_AXIS);
-         //      text->set_parent (ss, Y_AXIS);
-       }
-      else
-       stafy.set_axis (Y_AXIS);
-      
+
+      Side_position::set_axis (text, to_boolean (axisprop) ? X_AXIS : Y_AXIS);
+
+      /*
+       make sure they're in order by adding i to the priority field.
+       */
       text->set_elt_property ("script-priority",
-                           gh_int2scm (200));
+                           gh_int2scm (200 + i));
 
       if (r->get_direction ())
-       stafy.set_direction (r->get_direction ());
+       Side_position::set_direction (text, r->get_direction ());
       
       text->set_elt_property ("text",
                              ly_str02scm ( r->text_str_.ch_C ()));
@@ -102,11 +100,21 @@ Text_engraver::do_process_music ()
       if (r->style_str_.length_i ())
        text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
       
-      SCM empty = get_property ("textNonEmpty");
-      if (!to_boolean (empty))
-       text->set_empty (X_AXIS);
-
-      announce_element (Score_element_info (text, r));
+      /*
+       Text is empty by default, which means that the only condition
+       for not setting 'no-spacing-rods' should be: boolean && true.
+
+       Anyway, non-empty text has been broken for some time now.
+       */
+      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_T);
+
+               
+      announce_element (text, r);
       texts_.push (text);
     }
 }
@@ -116,8 +124,9 @@ Text_engraver::do_pre_move_processing ()
 {
   for (int i=0; i < texts_.size (); i++)
     {
-      side_position (texts_[i]).add_staff_support ();
-      typeset_element (texts_[i]);
+      Item *ti = texts_[i];
+      Side_position::add_staff_support (ti);
+      typeset_element (ti);
     }
   texts_.clear ();
 }