release: 1.3.74

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 967dcc188693e0561fddb4f04d501996ba4ec703..cfd5eae9a234c79b72bc0525074bda483c825112 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -123,9 +123,8 @@ Dynamic_engraver::do_process_music ()
          Side_position::set_axis (line_spanner_, Y_AXIS);
          Axis_group_interface::set_interface (line_spanner_);
          Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS);
-         announce_element (Score_element_info
-                           (line_spanner_,
-                            text_req_l_ ? text_req_l_ : accepted_spanreqs_drul_[START]));
+         announce_element (line_spanner_,
+                            text_req_l_ ? text_req_l_ : accepted_spanreqs_drul_[START]);
 
        }
     }
@@ -174,14 +173,14 @@ Dynamic_engraver::do_process_music ()
 
       text_p_->add_offset_callback (Side_position::aligned_on_self,
                                    Y_AXIS);
-      announce_element (Score_element_info (text_p_, text_req_l_));
+      announce_element (text_p_, text_req_l_);
     }
 
   if (accepted_spanreqs_drul_[STOP])
     {
       if (!cresc_p_)
        {
-         accepted_spanreqs_drul_[STOP]->warning
+         accepted_spanreqs_drul_[STOP]->origin ()->warning
            (_ ("can't find start of (de)crescendo"));
        }
       else
@@ -198,7 +197,7 @@ Dynamic_engraver::do_process_music ()
     {
       if (current_cresc_req_)
        {
-         accepted_spanreqs_drul_[START]->warning
+         accepted_spanreqs_drul_[START]->origin ()->warning
            (current_cresc_req_->span_dir_ == 1
             ?
             _ ("already have a crescendo")
@@ -257,17 +256,17 @@ Dynamic_engraver::do_process_music ()
          if (text_p_)
            {
              index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"),
-                             LEFT, text_p_->self_scm_);
+                             LEFT, text_p_->self_scm ());
              if (finished_cresc_p_)
                index_set_cell (finished_cresc_p_->get_elt_property ("dynamic-drul"),
-                               RIGHT, text_p_->self_scm_);
+                               RIGHT, text_p_->self_scm ());
            }
 
          Axis_group_interface::add_element (line_spanner_, cresc_p_);
          cresc_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
          cresc_p_->add_offset_callback
            (Side_position::aligned_on_self, Y_AXIS);
-         announce_element (Score_element_info (cresc_p_, accepted_spanreqs_drul_[START]));
+         announce_element (cresc_p_, accepted_spanreqs_drul_[START]);
        }
     }
 }
@@ -287,7 +286,7 @@ Dynamic_engraver::do_removal_processing ()
     {
       typeset_element (cresc_p_ );
       finished_cresc_p_ = cresc_p_;
-      current_cresc_req_->warning (_ ("unterminated (de)crescendo"));
+      current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
     }
   if (line_spanner_)
     {
@@ -333,12 +332,12 @@ Dynamic_engraver::typeset_all ()
 void
 Dynamic_engraver::acknowledge_element (Score_element_info i)
 {
-  if (Note_column* n = dynamic_cast<Note_column*> (i.elem_l_))
+  if (Note_column::has_interface (i.elem_l_))
     {
       if (line_spanner_)
        {
-         Side_position::add_support (line_spanner_,n);
-         add_bound_item (line_spanner_,n);
+         Side_position::add_support (line_spanner_,i.elem_l_);
+         add_bound_item (line_spanner_,dynamic_cast<Item*>(i.elem_l_));
        }
     }
 }