Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index bfaf9f151ed685d4f9b6ecd6188f139bdad0eb27..fc4cc7b9a432fbadf9eb737ccee8822f5c8c1294 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--2006 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"
 
@@ -45,34 +47,19 @@ Axis_group_engraver::get_spanner ()
 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 +72,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 +86,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 ();
@@ -127,5 +104,9 @@ ADD_TRANSLATOR (Axis_group_engraver,
                /* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
                /* create */ "VerticalAxisGroup",
                /* accept */ "",
-               /* read */ "verticalExtent minimumVerticalExtent extraVerticalExtent",
+               /* read */
+               "verticalExtent "
+               "minimumVerticalExtent "
+               "extraVerticalExtent ",
+
                /* write */ "");