release: 1.3.0

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 088ca5577c62f8b0da4992340d68064ae4427073..9ecc46f43402a598e2565f94702b2014ca585dd7 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -6,20 +6,21 @@
   (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+#include "dimension-cache.hh"
 
 #include "engraver.hh"
-#include "g-staff-side.hh"
-#include "g-text-item.hh"
-#include "text-def.hh"
+#include "staff-side.hh"
+#include "text-item.hh"
+#include "musical-request.hh"
 #include "note-head.hh"
 #include "stem.hh"
-#include "staff-sym.hh"
+#include "staff-symbol.hh"
 
 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<Text_script_req> reqs_;
+  Link_array<Staff_side_item> positionings_;
+  Link_array<Text_item> texts_;
 public:
   Text_engraver();
   VIRTUAL_COPY_CONS(Translator);
@@ -39,11 +40,8 @@ Text_engraver::Text_engraver ()
 bool
 Text_engraver::do_try_music (Music *m)
 {
-  if (Script_req *r = dynamic_cast<Script_req*> (m))
+  if (Text_script_req *r = dynamic_cast<Text_script_req*> (m))
     {
-      Text_def * t = dynamic_cast<Text_def*> (r->scriptdef_p_);
-      if (!t)
-       return false;
       reqs_.push (r);
       return true;
     }
@@ -59,6 +57,9 @@ Text_engraver::acknowledge_element (Score_element_info i)
       for (int i=0; i < positionings_.size (); i++)
        {
          positionings_[i]->add_support (n);
+         if (positionings_[i]->axis_ == X_AXIS
+             && !positionings_[i]->parent_l (Y_AXIS))
+           positionings_[i]->set_parent (n, Y_AXIS);
        }
     }
   if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
@@ -75,17 +76,48 @@ Text_engraver::do_process_requests ()
 {
   for (int i=0; i < reqs_.size (); i++)
     {
-      Script_req * r = reqs_[i];
-      Text_def * t= dynamic_cast<Text_def*> (r->scriptdef_p_);
+      Text_script_req * r = reqs_[i];
 
-      G_text_item *text = new G_text_item;
-      G_staff_side_item *ss = new G_staff_side_item;
+      Text_item *text = new Text_item;
+      Staff_side_item *ss = new Staff_side_item;
+
+
+
+      SCM axisprop = get_property ("scriptHorizontal",0);
+      if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))
+       {
+         ss->axis_ = X_AXIS;
+         text->set_parent (ss, Y_AXIS);
+                              
+       }
       ss->set_victim (text);
+      ss->set_elt_property (script_priority_scm_sym,
+                           gh_int2scm (200));
+
       ss->dir_ = r->dir_;
-      Scalar p (get_property ("textstyle", 0)); // textStyle?
-      if (p.length_i ())
-       text->style_str_ = p;
-      text->text_str_ = t->text_str_;
+
+      text->text_str_ = r->text_str_;
+      
+      if (r->style_str_.empty_b ())
+       {
+         SCM p (get_property ("textStyle", 0));
+         if (gh_string_p (p))
+           text->style_str_ = ly_scm2string(p);
+       }
+      else
+       text->style_str_ = r->style_str_;
+      
+      SCM padding = get_property ("textScriptPadding", 0);
+      if (SCM_NUMBERP(padding))
+       {
+         ss->set_elt_property (padding_scm_sym, padding);
+       }
+
+      SCM empty = get_property ("textEmptyDimension", 0);
+      if (gh_boolean_p (empty) && gh_scm2bool (empty))
+       {
+         text->set_empty (true, X_AXIS);
+       }
 
       announce_element (Score_element_info (text, r));
       announce_element (Score_element_info (ss, r));
@@ -98,14 +130,8 @@ Text_engraver::do_process_requests ()
 void
 Text_engraver::do_pre_move_processing ()
 {
-  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]);
     }