Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / pointer-group-interface.cc

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 74b4c2e0e2b90cdcfc2b83979fdcfd9546311665..1ab1d02c6e8f73d8d36924d1dcf8d3cb2091c21b 100644 (file)
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pointer-group-interface.hh"
@@ -27,7 +27,14 @@ Pointer_group_interface::add_grob (Grob *me, SCM sym, SCM p)
 }
 
 void
-Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
+Pointer_group_interface::set_ordered (Grob *me, SCM sym, bool ordered)
+{
+  Grob_array *arr = get_grob_array (me, sym);
+  arr->set_ordered (ordered);
+}
+
+Grob_array *
+Pointer_group_interface::get_grob_array (Grob *me, SCM sym)
 {
   SCM scm_arr = me->internal_get_object (sym);
   Grob_array *arr = unsmob_grob_array (scm_arr);
@@ -37,33 +44,46 @@ Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
       arr = unsmob_grob_array (scm_arr);
       me->internal_set_object (sym, scm_arr);
     }
+  return arr;
+}
+
+void
+Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
+{
+  Grob_array *arr = get_grob_array (me, sym);
+  arr->add (p);
+}
+
+void
+Pointer_group_interface::add_unordered_grob (Grob *me, SCM sym, Grob *p)
+{
+  Grob_array *arr = get_grob_array (me, sym);
   arr->add (p);
+  arr->set_ordered (false);
 }
 
-static Link_array<Grob> empty_array;
+static vector<Grob*> empty_array;
 
-Link_array<Grob> const &
+vector<Grob*> const &
 ly_scm2link_array (SCM x)
 {
   Grob_array *arr = unsmob_grob_array (x);
   return arr ? arr->array () : empty_array;
 }
 
-Link_array<Grob> const &
+vector<Grob*> const &
 internal_extract_grob_array (Grob const *elt, SCM symbol)
 {
   return ly_scm2link_array (elt->internal_get_object (symbol));
 }
 
-Link_array<Item>
+vector<Item*>
 internal_extract_item_array (Grob const *elt, SCM symbol)
 {
   Grob_array *arr = unsmob_grob_array (elt->internal_get_object (symbol));
-  Link_array<Item> items;
-  for (int i = 0; arr && i < arr->size (); i++)
-    {
-      items.push (arr->item (i));
-    }
+  vector<Item*> items;
+  for (vsize i = 0; arr && i < arr->size (); i++)
+    items.push_back (arr->item (i));
 
   return items;
 }