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 108e76c5c7ac51cebff1ca378b1628a2446daf3a..a705daddb653517cc972919e01003f5f86b420df 100644 (file)
--- a/lily/line-group-group-engraver.cc
+++ b/lily/line-group-group-engraver.cc
@@ -1,18 +1,19 @@
 /*
-  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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "staff-sym.hh"
-#include "vertical-group-spanner.hh"
 #include "command-request.hh"
 #include "bar.hh"
 #include "debug.hh"
 #include "line-group-group-engraver.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
+#include "axis-group-interface.hh"
+#include "spanner.hh"
+
 
 Line_group_engraver_group::Line_group_engraver_group()
 {
@@ -23,8 +24,8 @@ Line_group_engraver_group::Line_group_engraver_group()
 void
 Line_group_engraver_group::typeset_element (Score_element *elem)
 {
-  if (!elem->axis_group_l_a_[Y_AXIS])
-    staffline_p_->add_element (elem);
+  if (!elem->parent_l (Y_AXIS))      
+    Axis_group_interface::add_element (staffline_p_, elem);
   Engraver_group_engraver::typeset_element (elem);
 }
 
@@ -33,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_bounds(RIGHT,get_staff_info().command_pcol_l ());
+  staffline_p_->set_bound(RIGHT,it);
   Engraver_group_engraver::typeset_element (staffline_p_);
   staffline_p_ = 0;
 }
@@ -43,24 +46,23 @@ void
 Line_group_engraver_group::do_creation_processing()
 {
   create_line_spanner ();
-  staffline_p_->set_bounds(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 Vertical_group_spanner ;
+  staffline_p_ = new Spanner (SCM_EOL);
+  Axis_group_interface::set_interface (staffline_p_);
+  Axis_group_interface::set_axes (staffline_p_, Y_AXIS,Y_AXIS);
 }
 
-void
-Line_group_engraver_group::do_announces ()
-{
-  Engraver_group_engraver::do_announces ();
-}
 
 
-IMPLEMENT_IS_TYPE_B1(Line_group_engraver_group,Engraver_group_engraver);
+
 ADD_THIS_TRANSLATOR(Line_group_engraver_group);