X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=60d16767b0880afa354abf92aa387f181b28d274;hb=9b8bc059ef1f4b932b9cd6ec522945cdcd99e1cb;hp=e19947002f884fd012abcf807f7f897f2e4e5341;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index e19947002f..60d16767b0 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -1,26 +1,44 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.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"
 
-#include "spanner.hh"
 #include "axis-group-interface.hh"
-#include "warn.hh"
+#include "pointer-group-interface.hh"
 #include "context.hh"
+#include "international.hh"
+#include "spanner.hh"
+#include "warn.hh"
 
 #include "translator.icc"
 
 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 ()
 {
@@ -38,41 +56,22 @@ Axis_group_engraver::get_spanner ()
   return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
 
-/*
-  TODO: should we junk minimumVerticalExtent/extraVerticalExtent ?
-*/
-
 void
 Axis_group_engraver::finalize ()
 {
-  if (!staffline_)
-    return;
-
-  String type = context ()->context_name ();
-  SCM dims = get_property ("verticalExtent");
-
-  if (is_number_pair (dims))
-    staffline_->set_extent (dims, Y_AXIS);
-
-  dims = get_property ("minimumVerticalExtent");
-  if (is_number_pair (dims))
-    staffline_->set_property ("minimum-Y-extent", dims);
-
-  dims = get_property ("extraVerticalExtent");
-  if (is_number_pair (dims))
-    staffline_->set_property ("extra-Y-extent", dims);
-
-  Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
-
-  staffline_->set_bound (RIGHT, it);
+  if (staffline_)
+    {
+      Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+      staffline_->set_bound (RIGHT, it);
 
-  staffline_ = 0;
+      Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false);
+    }
 }
 
 void
 Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
-  elts_.push (i.grob ());
+  elts_.push_back (i.grob ());
 }
 
 /*
@@ -85,7 +84,7 @@ Axis_group_engraver::process_acknowledged ()
   if (!staffline_)
     return;
 
-  for (int i = 0; i < elts_.size (); i++)
+  for (vsize i = 0; i < elts_.size (); i++)
     {
       if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
 	{
@@ -99,17 +98,7 @@ Axis_group_engraver::process_acknowledged ()
 	      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]);
+	  add_element (elts_[i]);
 	}
     }
   elts_.clear ();
@@ -124,8 +113,16 @@ Axis_group_engraver::add_element (Grob *e)
 ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
 
 ADD_TRANSLATOR (Axis_group_engraver,
-		/* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
-		/* creats*/ "VerticalAxisGroup",
-		/* accepts */ "",
-		/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent",
-		/* write */ "");
+		/* doc */
+		"Group all objects created in this context in a"
+		" @code{VerticalAxisGroup} spanner.",
+
+		/* create */
+		"VerticalAxisGroup ",
+
+		/* read */
+		"currentCommandColumn ",
+
+		/* write */
+		""
+		);