X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=281ae61e27cd71aa55342e6400fc8f3eb317ed09;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=fba025349d41dba02af11d97485bf9aa83c556cd;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index fba025349d..281ae61e27 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-array.hh"
@@ -15,27 +15,27 @@
 Item *
 Grob_array::item (vsize i)
 {
-  return dynamic_cast<Item *> (grobs_.elem (i));
+  return dynamic_cast<Item *> (grobs_.at (i));
 }
 
 Spanner *
 Grob_array::spanner (vsize i)
 {
-  return dynamic_cast<Spanner *> (grobs_.elem (i));
+  return dynamic_cast<Spanner *> (grobs_.at (i));
 }
 
 Grob_array::Grob_array ()
 {
-  ordered_ = false;
+  ordered_ = true;
 }
 
-Link_array<Grob> &
+vector<Grob*> &
 Grob_array::array_reference ()
 {
   return grobs_;
 }
 
-Link_array<Grob> const &
+vector<Grob*> const &
 Grob_array::array () const
 {
   return grobs_;
@@ -82,6 +82,15 @@ Grob_array::clear ()
   grobs_.clear ();
 }
 
+void
+Grob_array::remove_duplicates ()
+{
+  assert (!ordered_);
+  
+  vector_sort (grobs_, less<Grob*> ());
+  ::uniq (grobs_);
+}
+
 bool
 Grob_array::empty () const
 {
@@ -89,7 +98,7 @@ Grob_array::empty () const
 }
 
 void
-Grob_array::set_array (Link_array<Grob> const &src)
+Grob_array::set_array (vector<Grob*> const &src)
 {
   grobs_ = src;
 }
@@ -108,3 +117,4 @@ grob_list_to_grob_array (SCM lst)
     ga->add (unsmob_grob (scm_car (s)));
   return arr_scm;
 }
+