Run `make grand-replace'.

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index e19947002f884fd012abcf807f7f897f2e4e5341..82b5cfe37b2c3aea7378d1834a9b27bab17ecb20 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,15 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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"
 
@@ -38,41 +40,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 +68,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 +82,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 +97,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 */
+               ""
+               );