patch::: 1.3.18.jcn3

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index e1748316b35b9a3311dcba1515fb04aaa04edcfb..3c18529ed74477ad328db1edfb42ebbd10b6bfd5 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -6,23 +6,25 @@
   (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "dimension-cache.hh"
 
+#include "dimension-cache.hh"
 #include "engraver.hh"
-#include "staff-side.hh"
+#include "side-position-interface.hh"
 #include "text-item.hh"
 #include "musical-request.hh"
 #include "note-head.hh"
 #include "stem.hh"
 #include "staff-symbol.hh"
 
+/**
+   typeset directions that are  plain text.
+ */
 class Text_engraver : public Engraver
 {
   Link_array<Text_script_req> reqs_;
-  Link_array<Staff_side_item> positionings_;
   Link_array<Text_item> texts_;
 public:
-  Text_engraver();
+
   VIRTUAL_COPY_CONS(Translator);
 protected:
   virtual bool do_try_music (Music* m);
@@ -32,10 +34,7 @@ protected:
   virtual void acknowledge_element (Score_element_info);
 };
 
-Text_engraver::Text_engraver ()
-{
-  
-}
+ADD_THIS_TRANSLATOR (Text_engraver);
 
 bool
 Text_engraver::do_try_music (Music *m)
@@ -54,16 +53,21 @@ Text_engraver::acknowledge_element (Score_element_info i)
 {
   if (Note_head *n = dynamic_cast<Note_head*> (i.elem_l_))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i=0; i < texts_.size (); i++)
        {
-         positionings_[i]->add_support (n);
+         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);
        }
     }
   if (Stem *n = dynamic_cast<Stem*> (i.elem_l_))
     {
-      for (int i=0; i < positionings_.size (); i++)
+      for (int i=0; i < texts_.size (); i++)
        {
-         positionings_[i]->add_support (n);
+         Side_position_interface st(texts_[i]);
+         st.add_support (n);
        }
     }
 }
@@ -76,42 +80,37 @@ Text_engraver::do_process_requests ()
       Text_script_req * r = reqs_[i];
 
       Text_item *text = new Text_item;
-      Staff_side_item *ss = new Staff_side_item;
-
-      ss->set_victim (text);
-      ss->set_elt_property (script_priority_scm_sym,
-                           gh_int2scm (200));
-
-      ss->dir_ = r->dir_;
+      Side_position_interface stafy (text);
 
-      text->text_str_ = r->text_str_;
-      
-      if (r->style_str_.empty_b ())
+      SCM axisprop = get_property ("scriptHorizontal",0);
+      if (to_boolean (axisprop))
        {
-         Scalar p (get_property ("textStyle", 0));
-         if (p.length_i ())
-           text->style_str_ = p;
+         stafy.set_axis (X_AXIS);
+         //      text->set_parent (ss, Y_AXIS);
        }
       else
-       text->style_str_ = r->style_str_;
+       stafy.set_axis (Y_AXIS);
       
-      Scalar padding = get_property ("textScriptPadding", 0);
-      if (padding.length_i() && padding.isnum_b ())
-       {
-         ss->set_elt_property (padding_scm_sym, gh_double2scm(Real(padding)));
-       }
+      text->set_elt_property ("script-priority",
+                           gh_int2scm (200));
 
-      Scalar empty = get_property ("textEmptyDimension", 0);
-      if (empty.to_bool ())
+      if (r->get_direction ())
+       stafy.set_direction (r->get_direction ());
+      
+      text->set_elt_property ("text",
+                             ly_str02scm ( r->text_str_.ch_C ()));
+      
+      if (r->style_str_.length_i ())
+       text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
+      
+      SCM empty = get_property ("textEmptyDimension", 0);
+      if (to_boolean (empty))
        {
-         text->dim_cache_[X_AXIS]->set_empty (true);
+         text->set_empty (X_AXIS);
        }
-      
-      announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
 
+      announce_element (Score_element_info (text, r));
       texts_.push (text);
-      positionings_.push (ss);
     }
 }
 
@@ -121,10 +120,8 @@ Text_engraver::do_pre_move_processing ()
   for (int i=0; i < texts_.size (); i++)
     {
       typeset_element (texts_[i]);
-      typeset_element (positionings_[i]);
     }
   texts_.clear ();
-  positionings_.clear ();
 }
 
 void
@@ -133,4 +130,3 @@ Text_engraver::do_post_move_processing ()
   reqs_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Text_engraver);