(struct Simple_spacer): remove

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 8e404c150ef4d0b50927098d187915b819193c03..c28584909f16745e782a86819e1a623b6971ccdd 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -35,6 +35,7 @@ public:
 
 Axis_group_engraver::Axis_group_engraver ()
 {
+  must_be_last_ = true;
   staffline_ = 0;
 }
 
@@ -48,15 +49,13 @@ Axis_group_engraver::process_music ()
       Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
       staffline_->set_bound (LEFT,it);
-
-      announce_grob (staffline_, SCM_EOL);
     }
 } 
 
 Spanner*
 Axis_group_engraver::get_spanner () 
 {
-  return make_spanner ("VerticalAxisGroup");
+  return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
 
 /*
@@ -69,7 +68,7 @@ Axis_group_engraver::finalize ()
   if (!staffline_)
     return ;
   
-  String type = daddy_context_->context_name ();
+  String type = context ()->context_name ();
   SCM dims = get_property ("verticalExtent");
   
   if (is_number_pair (dims))
@@ -87,7 +86,6 @@ Axis_group_engraver::finalize ()
 
   staffline_->set_bound (RIGHT,it);
 
-  typeset_grob (staffline_);
   staffline_ = 0;
 }
 
@@ -104,23 +102,38 @@ Axis_group_engraver::acknowledge_grob (Grob_info i)
 void
 Axis_group_engraver::process_acknowledged_grobs ()
 {
-  /* UGH UGH UGH */
+  if (!staffline_) 
+    return ;
+  
   for (int i=0; i < elts_.size (); i++)
     {
       Grob *par = elts_[i]->get_parent (Y_AXIS);
 
       if (!par || !Axis_group_interface::has_interface (par))
-       if (elts_[i]->is_empty (Y_AXIS))
-         {
-           /*
-             We have to do _something_, otherwise staff objects will
-             end up with System as parent.  
+       {
+         if (staffline_->get_parent (Y_AXIS)
+             && staffline_->get_parent (Y_AXIS) == elts_[i])
+           {
+             String msg = _("Axis_group_engraver: vertical group already has a parent.\n"
+                            "Do you have two Axis_group_engravers?\n"
+                            "Killing this vertical group.");
+             staffline_->warning (msg);
+             staffline_->suicide ();
+             staffline_ = 0;
+             break ;
+           }
+         else if (elts_[i]->is_empty (Y_AXIS))
+           {
+             /*
+               We have to do _something_, otherwise staff objects will
+               end up with System as parent.  
              
-            */
-           elts_[i]->set_parent (staffline_, Y_AXIS);
-         }
-       else
-         add_element (elts_[i]);
+             */
+             elts_[i]->set_parent (staffline_, Y_AXIS);
+           }
+         else
+           add_element (elts_[i]);
+       }
     }
   elts_.clear ();
 }
@@ -163,7 +176,7 @@ Hara_kiri_engraver::add_element (Grob*e)
 Spanner*
 Hara_kiri_engraver::get_spanner () 
 {
-  Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup");
+  Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
   
   return sp;
 }
@@ -172,8 +185,9 @@ void
 Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
   Axis_group_engraver::acknowledge_grob (i);
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
-      || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface"))
+  if (staffline_
+      && (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
+         || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface")))
       )
     {
       Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_);