patch::: 1.3.96.jcn9

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 521b7ac1125a95436be8ac3147bae5d9471d61d5..232269182510925be878c96cadcdb2ad67feebce 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -15,6 +15,7 @@
 #include "stem.hh"
 #include "rhythmic-head.hh"
 
+
 /**
    typeset directions that are  plain text.
  */
@@ -32,22 +33,17 @@ protected:
   virtual void acknowledge_element (Score_element_info);
 };
 
-
 bool
 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;
     }
   return false;
 }
 
-
 void
 Text_engraver::acknowledge_element (Score_element_info inf)
 {
@@ -57,11 +53,19 @@ Text_engraver::acknowledge_element (Score_element_info inf)
        {
          Score_element*t = texts_[i];
          Side_position::add_support (t,inf.elem_l_);
+
+         /*
+           ugh.
+          */
          if (Side_position::get_axis( t) == X_AXIS
              && !t->parent_l (Y_AXIS))
            t->set_parent (inf.elem_l_, Y_AXIS);
+         else if (Side_position::get_axis(t) == Y_AXIS
+             && !t->parent_l (X_AXIS))
+           t->set_parent (inf.elem_l_, X_AXIS);
        }
     }
+  
   if (Stem::has_interface (inf.elem_l_))
     {
       for (int i=0; i < texts_.size (); i++)
@@ -77,17 +81,42 @@ Text_engraver::do_process_music ()
   for (int i=0; i < reqs_.size (); i++)
     {
       Text_script_req * r = reqs_[i];
+      
+      // URG: Text vs TextScript
+      String basic = "TextScript";
 
-      /*
-       Urg:  Text_engraver loads TextScriptProperties
-       */
-      Item *text = new Item (get_property ("basicTextScriptProperties"));
+#if 0
+      // maybe use some sort of TYPE for script/dynamic/finger?
       
+                               // separate engraver?
+      if (r->style_str_== "finger")
+       {
+         basic = "Fingering";
+       }
+#endif
+      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);
 
-      Side_position::set_axis (text, to_boolean (axisprop) ? X_AXIS : Y_AXIS);
+#if 0
+      if (r->style_str_ == "finger" && ax == Y_AXIS)
+       {
+         /*
+           nicely center the scripts.
+          */ 
+         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.
        */
@@ -97,12 +126,8 @@ Text_engraver::do_process_music ()
       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_elt_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))
        /*