* flower/include/std-vector.hh[STD_VECTOR]: Do not include

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

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index dd40723e39767a5dc443c1233378e95bc19f9c1b..51354ffb50cb95eea40e1fa4c093e8247800cf61 100644 (file)
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,58 +1,67 @@
-/*   
-  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"
-
-Pointer_group_interface::Pointer_group_interface (Score_element const* e)
-{
-  elt_l_ = (Score_element*)e;
-  name_ = "elements";
-}
 
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Pointer_group_interface::Pointer_group_interface (Score_element const *e, String s)
-{
-  elt_l_ =(Score_element*)e;
-  name_ = s;
-} 
-bool
-Pointer_group_interface::has_interface_b () 
-{
-  SCM el = elt_l_->get_elt_pointer (name_.ch_C());
+#include "pointer-group-interface.hh"
+
+#include "lily-proto.hh"
+#include "item.hh"
+#include "grob-array.hh"
+#include "grob.hh"
 
-  return el == SCM_EOL || gh_pair_p (el);
+int
+Pointer_group_interface::count (Grob *me, SCM sym)
+{
+  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));
+}
 
 void
-Pointer_group_interface::add_element (Score_element*p) 
+Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
 {
-  p->used_b_ =  true;
-  elt_l_->used_b_ = true;
+  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->internal_set_object (sym, scm_arr);
+    }
+  arr->add (p);
+}
 
-  elt_l_->set_elt_pointer (name_.ch_C(),
-                          gh_cons (p->self_scm_,
-                                   elt_l_->get_elt_pointer (name_.ch_C())));
+static Link_array__Grob_ empty_array;
+
+Link_array__Grob_ const &
+ly_scm2link_array (SCM x)
+{
+  Grob_array *arr = unsmob_grob_array (x);
+  return arr ? arr->array () : empty_array;
 }
 
-int
-Pointer_group_interface::count ()
+Link_array__Grob_ const &
+internal_extract_grob_array (Grob const *elt, SCM symbol)
 {
-  return scm_ilength (elt_l_->get_elt_pointer (name_.ch_C()));
+  return ly_scm2link_array (elt->internal_get_object (symbol));
 }
 
-void
-Pointer_group_interface::set_interface ()
+Link_array__Item_
+internal_extract_item_array (Grob const *elt, SCM symbol)
 {
-  if (!has_interface_b ())
-    {
-      elt_l_->set_elt_pointer (name_.ch_C(), SCM_EOL);
-    }
-} 
+  Grob_array *arr = unsmob_grob_array (elt->internal_get_object (symbol));
+  Link_array__Item_ items;
+  for (vsize i = 0; arr && i < arr->size (); i++)
+    items.push_back (arr->item (i));
 
+  return items;
+}