(process_acknowledged_grobs):

backport.

diff --git a/ChangeLog b/ChangeLog
index 02c7425baa68c86e392e03f96eaeecf6a3d110e1..dfa06f68c33b548b9d35fd370b768780036f96e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/axis-group-engraver.cc (process_acknowledged_grobs):
+       backport.
+
 2004-07-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ChangeLog: Remove pre-2.1 changes.

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 8e404c150ef4d0b50927098d187915b819193c03..cca5ffb7a072973ebd4f458211c94470933e8ee7 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -110,17 +110,30 @@ Axis_group_engraver::process_acknowledged_grobs ()
       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 ();
 }