X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=2720fcf91ae473ca9857b728f0d8dc53211f9686;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=dd40723e39767a5dc443c1233378e95bc19f9c1b;hpb=e4f07a592ebde9621dede5a47430a51b9c232eb3;p=lilypond.git

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index dd40723e39..2720fcf91a 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,58 +1,112 @@
-/*   
-  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"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-Pointer_group_interface::Pointer_group_interface (Score_element const* e)
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pointer-group-interface.hh"
+
+#include "grob-array.hh"
+#include "grob.hh"
+
+int
+Pointer_group_interface::count (Grob *me, SCM sym)
 {
-  elt_l_ = (Score_element*)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 const *e, String s)
+void
+Pointer_group_interface::set_ordered (Grob *me, SCM sym, bool ordered)
 {
-  elt_l_ =(Score_element*)e;
-  name_ = s;
-} 
-bool
-Pointer_group_interface::has_interface_b () 
+  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);
+  if (!arr)
+    {
+      scm_arr = Grob_array::make_array ();
+      arr = unsmob<Grob_array> (scm_arr);
+      me->set_object (sym, scm_arr);
+    }
+  return arr;
+}
+
+Grob *
+Pointer_group_interface::find_grob (Grob *me, SCM sym, bool (*pred) (Grob *))
 {
-  SCM el = elt_l_->get_elt_pointer (name_.ch_C());
+  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 el == SCM_EOL || gh_pair_p (el);
+  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)
 {
-  p->used_b_ =  true;
-  elt_l_->used_b_ = true;
+  Grob_array *arr = get_grob_array (me, sym);
+  arr->add (p);
+  arr->set_ordered (false);
+}
 
-  elt_l_->set_elt_pointer (name_.ch_C(),
-			   gh_cons (p->self_scm_,
-				    elt_l_->get_elt_pointer (name_.ch_C())));
+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;
 }
 
-int
-Pointer_group_interface::count ()
+vector<Grob *> const &
+internal_extract_grob_array (Grob const *elt, SCM symbol)
 {
-  return scm_ilength (elt_l_->get_elt_pointer (name_.ch_C()));
+  return elt
+         ? ly_scm2link_array (elt->internal_get_object (symbol))
+         : empty_array;
 }
 
-void
-Pointer_group_interface::set_interface ()
+vector<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));
+  vector<Item *> items;
+  for (vsize i = 0; arr && i < arr->size (); i++)
+    items.push_back (arr->item (i));
 
+  return items;
+}