release: 1.3.55

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 05fc9a6a703d255a3404c04f6c2149777bc5be11..a3d72332f9f13b6ce1b623d8f9f6099d877cd14b 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,39 +3,37 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 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);
   virtual void do_pre_move_processing ();
   virtual void do_post_move_processing ();
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual void acknowledge_element (Score_element_info);
 };
 
-Text_engraver::Text_engraver ()
-{
-  
-}
 
 bool
 Text_engraver::do_try_music (Music *m)
@@ -54,64 +52,67 @@ 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);
-         if (positionings_[i]->axis_ == X_AXIS
-             && !positionings_[i]->parent_l (Y_AXIS))
-           positionings_[i]->set_parent (n, Y_AXIS);
+         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);
        }
     }
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::do_process_music ()
 {
   for (int i=0; i < reqs_.size (); i++)
     {
       Text_script_req * r = reqs_[i];
 
-      Text_item *text = new Text_item;
-      Staff_side_item *ss = new Staff_side_item;
-
-
+      Text_item *text = new Text_item (SCM_EOL);
+      Side_position_interface stafy (text);
 
-      SCM axisprop = get_property ("scriptHorizontal",0);
-      if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop))
+      SCM axisprop = get_property ("scriptHorizontal");
+      if (to_boolean (axisprop))
        {
-         ss->axis_ = X_AXIS;
-         text->set_parent (ss, Y_AXIS);
-                              
+         stafy.set_axis (X_AXIS);
+         //      text->set_parent (ss, Y_AXIS);
        }
-      ss->set_victim (text);
-      ss->set_elt_property ("script-priority",
-                           gh_int2scm (200));
+      else
+       stafy.set_axis (Y_AXIS);
 
-      ss->dir_ = r->dir_;
+      /*
+       make sure they're in order by adding i to the priority field.
+       */
+      text->set_elt_property ("script-priority",
+                           gh_int2scm (200 + i));
 
-      text->text_str_ = r->text_str_;
+      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_ch_C_to_scm (r->style_str_.ch_C()));
+       text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
       
-      SCM empty = get_property ("textEmptyDimension", 0);
-      if (gh_boolean_p (empty) && gh_scm2bool (empty))
+      SCM empty = get_property ("textNonEmpty");
+      if (!to_boolean (empty))
        {
-         text->set_empty (true, X_AXIS);
+         text->set_elt_property ("no-spacing-rods" , SCM_BOOL_T);
+         text->set_extent_callback (0, X_AXIS);
        }
-
       announce_element (Score_element_info (text, r));
-      announce_element (Score_element_info (ss, r));
-
       texts_.push (text);
-      positionings_.push (ss);
     }
 }
 
@@ -120,11 +121,11 @@ Text_engraver::do_pre_move_processing ()
 {
   for (int i=0; i < texts_.size (); i++)
     {
-      typeset_element (texts_[i]);
-      typeset_element (positionings_[i]);
+      Text_item *ti = texts_[i];
+      Side_position_interface (ti).add_staff_support ();
+      typeset_element (ti);
     }
   texts_.clear ();
-  positionings_.clear ();
 }
 
 void