X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=2720fcf91ae473ca9857b728f0d8dc53211f9686;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=51354ffb50cb95eea40e1fa4c093e8247800cf61;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 51354ffb50..2720fcf91a 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,65 +1,110 @@
 /*
-  pointer-group-interface.cc -- implement Pointer_group_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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 "lily-proto.hh"
-#include "item.hh"
 #include "grob-array.hh"
 #include "grob.hh"
 
 int
 Pointer_group_interface::count (Grob *me, SCM sym)
 {
-  Grob_array *arr = unsmob_grob_array (me->internal_get_object (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));
+  add_grob (me, sym, unsmob<Grob> (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);
+  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 = 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 *))
+{
+  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_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);
+  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));
+  return elt
+         ? ly_scm2link_array (elt->internal_get_object (symbol))
+         : empty_array;
 }
 
-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;
+  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));