release: 1.3.93

[lilypond.git] / lily / line-group-group-engraver.cc

diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc
index aa4b6e8c20c21a98bebe3efd754791d674af498d..a705daddb653517cc972919e01003f5f86b420df 100644 (file)
--- a/lily/line-group-group-engraver.cc
+++ b/lily/line-group-group-engraver.cc
@@ -1,18 +1,18 @@
 /*
-  staff-gravs.cc -- implement Line_group_engraver
+  line-group-engraver-group.cc -- implement Line_group_engraver
 
   source file of the GNU LilyPond music typesetter
 
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "staff-symbol.hh"
 #include "command-request.hh"
 #include "bar.hh"
 #include "debug.hh"
 #include "line-group-group-engraver.hh"
 #include "paper-column.hh"
 #include "axis-group-interface.hh"
+#include "spanner.hh"
 
 
 Line_group_engraver_group::Line_group_engraver_group()
@@ -25,7 +25,7 @@ void
 Line_group_engraver_group::typeset_element (Score_element *elem)
 {
   if (!elem->parent_l (Y_AXIS))      
-    Axis_group_interface (staffline_p_).add_element (elem);
+    Axis_group_interface::add_element (staffline_p_, elem);
   Engraver_group_engraver::typeset_element (elem);
 }
 
@@ -34,8 +34,10 @@ void
 Line_group_engraver_group::do_removal_processing()
 {
   Engraver_group_engraver::do_removal_processing ();
+  Score_element *  it
+    = unsmob_element (get_property (ly_symbol2scm ("currentCommandColumn")));
 
-  staffline_p_->set_bound(RIGHT,get_staff_info().command_pcol_l ());
+  staffline_p_->set_bound(RIGHT,it);
   Engraver_group_engraver::typeset_element (staffline_p_);
   staffline_p_ = 0;
 }
@@ -44,17 +46,19 @@ void
 Line_group_engraver_group::do_creation_processing()
 {
   create_line_spanner ();
-  staffline_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
+  Score_element *  it
+    = unsmob_element (get_property (ly_symbol2scm ("currentCommandColumn"))); 
+  staffline_p_->set_bound(LEFT,it);
   
-  Engraver::announce_element (Score_element_info (staffline_p_,0));
+  Engraver::announce_element (staffline_p_,0);
 }
 
 void
 Line_group_engraver_group::create_line_spanner ()
 {
   staffline_p_ = new Spanner (SCM_EOL);
-  Axis_group_interface (staffline_p_).set_interface ();
-  Axis_group_interface (staffline_p_).set_axes (Y_AXIS,Y_AXIS);
+  Axis_group_interface::set_interface (staffline_p_);
+  Axis_group_interface::set_axes (staffline_p_, Y_AXIS,Y_AXIS);
 }