patch::: 1.3.47.jcn3

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

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 3c18529ed74477ad328db1edfb42ebbd10b6bfd5..0f222daab1bd2f1d6022c20729ed0fe437647a96 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -3,7 +3,7 @@
   
   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>
   
  */
 
@@ -30,11 +30,10 @@ 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);
 };
 
-ADD_THIS_TRANSLATOR (Text_engraver);
 
 bool
 Text_engraver::do_try_music (Music *m)
@@ -73,7 +72,7 @@ Text_engraver::acknowledge_element (Score_element_info i)
 }
 
 void
-Text_engraver::do_process_requests ()
+Text_engraver::do_process_music ()
 {
   for (int i=0; i < reqs_.size (); i++)
     {
@@ -82,7 +81,7 @@ Text_engraver::do_process_requests ()
       Text_item *text = new Text_item;
       Side_position_interface stafy (text);
 
-      SCM axisprop = get_property ("scriptHorizontal",0);
+      SCM axisprop = get_property ("scriptHorizontal");
       if (to_boolean (axisprop))
        {
          stafy.set_axis (X_AXIS);
@@ -103,11 +102,9 @@ Text_engraver::do_process_requests ()
       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->set_empty (X_AXIS);
-       }
+      SCM empty = get_property ("textNonEmpty");
+      if (!to_boolean (empty))
+       text->set_extent_callback (0, X_AXIS);
 
       announce_element (Score_element_info (text, r));
       texts_.push (text);
@@ -119,6 +116,7 @@ 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]);
     }
   texts_.clear ();
@@ -130,3 +128,5 @@ Text_engraver::do_post_move_processing ()
   reqs_.clear ();
 }
 
+ADD_THIS_TRANSLATOR(Text_engraver);
+