X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=3823c3498484cbe9f1cc9e75a035ee1753284960;hb=39c65df5036506cfbf12d9835dccdbf3d717cc96;hp=9a2618a5ba1657c7f84a40354fee12e900d22e7c;hpb=19bb2e8bc9c42b2ffe8dc680bab084597ce6bf64;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 9a2618a5ba..3823c34984 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  axis-group-engraver.cc -- implement Axis_group_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "axis-group-engraver.hh"
@@ -19,10 +30,15 @@
 
 Axis_group_engraver::Axis_group_engraver ()
 {
-  must_be_last_ = true;
   staffline_ = 0;
 }
 
+bool
+Axis_group_engraver::must_be_last () const
+{
+  return true;
+}
+
 void
 Axis_group_engraver::process_music ()
 {
@@ -55,6 +71,16 @@ Axis_group_engraver::finalize ()
 void
 Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
+  if (!staffline_)
+    return;
+  if (i.grob ()->name () == "VerticalAxisGroup") {
+    i.grob ()->programming_error ("duplicate axis group");
+    if (staffline_->is_live ())
+      staffline_->suicide ();
+    staffline_ = 0;
+    elts_.clear ();
+    return;
+  }
   elts_.push_back (i.grob ());
 }
 
@@ -71,19 +97,19 @@ Axis_group_engraver::process_acknowledged ()
   for (vsize i = 0; i < elts_.size (); i++)
     {
       if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
-	{
-	  if (staffline_->get_parent (Y_AXIS)
-	      && staffline_->get_parent (Y_AXIS) == elts_[i])
-	    {
-	      staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent"));
-	      staffline_->warning (_ ("are there two Axis_group_engravers?"));
-	      staffline_->warning (_ ("removing this vertical group"));
-	      staffline_->suicide ();
-	      staffline_ = 0;
-	      break;
-	    }
-	  add_element (elts_[i]);
-	}
+        {
+          if (staffline_->get_parent (Y_AXIS)
+              && staffline_->get_parent (Y_AXIS) == elts_[i])
+            {
+              staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent"));
+              staffline_->warning (_ ("are there two Axis_group_engravers?"));
+              staffline_->warning (_ ("removing this vertical group"));
+              staffline_->suicide ();
+              staffline_ = 0;
+              break;
+            }
+          add_element (elts_[i]);
+        }
     }
   elts_.clear ();
 }
@@ -97,16 +123,16 @@ Axis_group_engraver::add_element (Grob *e)
 ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
 
 ADD_TRANSLATOR (Axis_group_engraver,
-		/* doc */
-		"Group all objects created in this context in a"
-		" @code{VerticalAxisGroup} spanner.",
+                /* doc */
+                "Group all objects created in this context in a"
+                " @code{VerticalAxisGroup} spanner.",
 
-		/* create */
-		"VerticalAxisGroup ",
+                /* create */
+                "VerticalAxisGroup ",
 
-		/* read */
-		"currentCommandColumn ",
+                /* read */
+                "currentCommandColumn ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );