X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpointer-group-interface.cc;h=79888348f9ce48a7fe7e69445924434941f8a2e8;hb=0c9726a0d0093db2e31ec9ba80a7f9df150a5827;hp=1ab1d02c6e8f73d8d36924d1dcf8d3cb2091c21b;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/pointer-group-interface.cc b/lily/pointer-group-interface.cc
index 1ab1d02c6e..79888348f9 100644
--- a/lily/pointer-group-interface.cc
+++ b/lily/pointer-group-interface.cc
@@ -1,15 +1,24 @@
 /*
-  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--2012 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"
 
@@ -42,16 +51,36 @@ Pointer_group_interface::get_grob_array (Grob *me, SCM sym)
     {
       scm_arr = Grob_array::make_array ();
       arr = unsmob_grob_array (scm_arr);
-      me->internal_set_object (sym, 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;
+}
+
+// If the grob array is unordered, we assume that duplicates should
+// be removed. This makes sense for things like side-position-elements,
+// which may be added recursively numerous times and thus will eat up
+// computation time when skylines are calculated.
+// If the array is ordered, then we don't remove duplicates.
+
 void
 Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
 {
   Grob_array *arr = get_grob_array (me, sym);
   arr->add (p);
+  if (!arr->ordered ())
+    arr->remove_duplicates ();
 }
 
 void
@@ -60,28 +89,31 @@ 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);
+  arr->remove_duplicates ();
 }
 
-static vector<Grob*> empty_array;
+static vector<Grob *> empty_array;
 
-vector<Grob*> const &
+vector<Grob *> const &
 ly_scm2link_array (SCM x)
 {
   Grob_array *arr = unsmob_grob_array (x);
   return arr ? arr->array () : empty_array;
 }
 
-vector<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;
 }
 
-vector<Item*>
+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;
+  vector<Item *> items;
   for (vsize i = 0; arr && i < arr->size (); i++)
     items.push_back (arr->item (i));