Run `make grand-replace'.

[lilypond.git] / lily / include / pointer-group-interface.hh

diff --git a/lily/include/pointer-group-interface.hh b/lily/include/pointer-group-interface.hh
index 217bc4aaf1aebdae78f13ed33a68a8d5c54371bf..02799135e13377a4b225a4900a532d03ef5c2e7b 100644 (file)
--- a/lily/include/pointer-group-interface.hh
+++ b/lily/include/pointer-group-interface.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef POINTER_GROUP_INTERFACE_HH
 #define POINTER_GROUP_INTERFACE_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
@@ -19,10 +19,14 @@ public:
   static int count (Grob *, SCM);
   static void add_grob (Grob *, SCM nm, Grob *e);
   static void add_grob (Grob *, SCM nm, SCM x);
+  static void add_unordered_grob (Grob *, SCM nm, Grob *);
+  static void set_ordered (Grob *, SCM, bool);
+  static Grob_array *get_grob_array (Grob*, SCM);
+  static Grob *find_grob (Grob*, SCM, bool (*pred) (Grob*));
 };
 
-Link_array<Grob> const &internal_extract_grob_array (Grob const *elt, SCM symbol);
-Link_array<Item> internal_extract_item_array (Grob const *elt, SCM symbol);
+vector<Grob*> const &internal_extract_grob_array (Grob const *elt, SCM symbol);
+vector<Item*> internal_extract_item_array (Grob const *elt, SCM symbol);
 
 #define extract_grob_array(x, prop) internal_extract_grob_array (x, ly_symbol2scm (prop))
 #define extract_item_array(x, prop) internal_extract_item_array (x, ly_symbol2scm (prop))
@@ -32,9 +36,9 @@ Link_array<Item> internal_extract_item_array (Grob const *elt, SCM symbol);
   representation of grob sets again.
 */
 #define extract_grob_set(grob, prop, set)                              \
-  Link_array<Grob> const &set (internal_extract_grob_array (grob, ly_symbol2scm (prop)))
+  vector<Grob*> const &set (internal_extract_grob_array (grob, ly_symbol2scm (prop)))
 #define extract_item_set(grob, prop, set)                              \
-  Link_array<Item> set (internal_extract_item_array (grob, ly_symbol2scm (prop)))
+  vector<Item*> set (internal_extract_item_array (grob, ly_symbol2scm (prop)))
 
 #endif /* POINTER_GROUP_INTERFACE_HH */