patch::: 1.3.136.jcn3

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 69b605640625dac62b8e086a67b771fadd1a9c84..f0321e353273aef022c78c96eefd36814b2a086f 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "dimensions.hh"
@@ -76,7 +76,7 @@ Text_spanner_engraver::try_music (Music *m)
        }
       else if (t == "text")
        {
-         req_drul_[s->get_span_dir()] = s;
+         req_drul_[s->get_span_dir ()] = s;
          return true;
        }
     }
@@ -86,13 +86,12 @@ Text_spanner_engraver::try_music (Music *m)
 void
 Text_spanner_engraver::create_grobs ()
 {
-  /////
   if (req_drul_[STOP])
     {
       if (!span_)
        {
          req_drul_[STOP]->origin ()->warning
-           (_ ("can't find start of text spanner"));
+ (_ ("can't find start of text spanner"));
        }
       else
        {
@@ -103,6 +102,7 @@ Text_spanner_engraver::create_grobs ()
          finished_ = span_;
          span_ = 0;
          current_req_ = 0;
+         req_drul_[STOP] = 0;
        }
     }
 
@@ -111,7 +111,7 @@ Text_spanner_engraver::create_grobs ()
       if (current_req_)
        {
          req_drul_[START]->origin ()->warning
-           (_ ("already have a text spanner"));
+ (_ ("already have a text spanner"));
        }
       else
        {
@@ -123,10 +123,12 @@ Text_spanner_engraver::create_grobs ()
          span_->set_grob_property ("if-text-padding", gh_double2scm (0));
          span_->set_grob_property ("width-correct", gh_double2scm (0));
                    
-         Side_position::set_axis (span_, Y_AXIS);
+         Side_position_interface::set_axis (span_, Y_AXIS);
          Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
          span_->set_bound (LEFT, e);
+         
          announce_grob (span_, req_drul_[START]);
+         req_drul_[START] = 0;
        }
     }
 }
@@ -136,7 +138,7 @@ Text_spanner_engraver::acknowledge_grob (Grob_info info)
 {
   if (span_ && Note_column::has_interface (info.elem_l_))
     {
-      Side_position::add_support (span_, info.elem_l_);
+      Side_position_interface::add_support (span_, info.elem_l_);
       add_bound_item (span_, dynamic_cast<Item*> (info.elem_l_));
     }
 }
@@ -146,7 +148,7 @@ Text_spanner_engraver::typeset_all ()
 {  
   if (finished_)
     {
-      Side_position::add_staff_support (finished_);
+      Side_position_interface::add_staff_support (finished_);
       typeset_grob (finished_);
       finished_ = 0;
     }