X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=a8ebb09ffcaa53dd13e10fbf36cf3bc126a86ffb;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=66b327959a5dc19ae10a5d9340de9307efd6ae93;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 66b327959a..a8ebb09ffc 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,54 +1,101 @@
-/*   
-  group-interface.cc --  implement Pointer_group_interface
-  
+/*
+  pointer-group-interface.cc -- implement Pointer_group_interface
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "group-interface.hh"
-#include "score-element.hh"
 
-/*
-  UGH clean me . 
- */
-Pointer_group_interface::Pointer_group_interface (Score_element * e)
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "pointer-group-interface.hh"
+
+#include "grob-array.hh"
+#include "grob.hh"
+
+int
+Pointer_group_interface::count (Grob *me, SCM sym)
 {
-  elt_l_ = e;
-  name_ = "elements";
+  Grob_array *arr = unsmob_grob_array (me->internal_get_object (sym));
+  return arr ? arr->size () : 0;
 }
 
+void
+Pointer_group_interface::add_grob (Grob *me, SCM sym, SCM p)
+{
+  add_grob (me, sym, unsmob_grob (p));
+}
 
-Pointer_group_interface::Pointer_group_interface (Score_element  *e, String s)
+void
+Pointer_group_interface::set_ordered (Grob *me, SCM sym, bool ordered)
 {
-  elt_l_ =(Score_element*)e;
-  name_ = s;
-} 
+  Grob_array *arr = get_grob_array (me, sym);
+  arr->set_ordered (ordered);
+}
 
-/*
-  duh.
- */
-bool
-Pointer_group_interface::has_interface () 
+Grob_array *
+Pointer_group_interface::get_grob_array (Grob *me, SCM sym)
 {
-  SCM el = elt_l_->get_elt_property (name_.ch_C());
+  SCM scm_arr = me->internal_get_object (sym);
+  Grob_array *arr = unsmob_grob_array (scm_arr);
+  if (!arr)
+    {
+      scm_arr = Grob_array::make_array ();
+      arr = unsmob_grob_array (scm_arr);
+      me->set_object (sym, scm_arr);
+    }
+  return arr;
+}
 
-  return el == SCM_EOL || gh_pair_p (el);
+Grob *
+Pointer_group_interface::find_grob (Grob *me, SCM sym, bool (*pred) (Grob*))
+{
+  Grob_array *arr = get_grob_array (me, sym);
+
+  for (vsize i = 0; i < arr->size (); i++)
+    if (pred (arr->grob (i)))
+      return arr->grob (i);
+
+  return 0;
 }
 
+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_element (Score_element*p) 
+Pointer_group_interface::add_unordered_grob (Grob *me, SCM sym, Grob *p)
 {
-  elt_l_->set_elt_property (name_.ch_C(),
-			   gh_cons (p->self_scm (),
-				    elt_l_->get_elt_property (name_.ch_C())));
+  Grob_array *arr = get_grob_array (me, sym);
+  arr->add (p);
+  arr->set_ordered (false);
 }
 
-int
-Pointer_group_interface::count ()
+static vector<Grob*> empty_array;
+
+vector<Grob*> const &
+ly_scm2link_array (SCM x)
+{
+  Grob_array *arr = unsmob_grob_array (x);
+  return arr ? arr->array () : empty_array;
+}
+
+vector<Grob*> const &
+internal_extract_grob_array (Grob const *elt, SCM symbol)
 {
-  return scm_ilength (elt_l_->get_elt_property (name_.ch_C()));
+  return elt
+    ? ly_scm2link_array (elt->internal_get_object (symbol))
+    : empty_array;
 }
 
+vector<Item*>
+internal_extract_item_array (Grob const *elt, SCM symbol)
+{
+  Grob_array *arr = unsmob_grob_array (elt->internal_get_object (symbol));
+  vector<Item*> items;
+  for (vsize i = 0; arr && i < arr->size (); i++)
+    items.push_back (arr->item (i));
 
+  return items;
+}