X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fgrob-array.cc;h=dff5102a83c776406473e5ba60ed4ae6e54e8ee7;hb=7697100194a647d04667946bcd0ba35c0554aac0;hp=fa8d4cd65c797e7604d98715d2bb3aa555f8ac38;hpb=87bcea3a1d67afec13b49c2facd9fb28cc37277b;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index fa8d4cd65c..dff5102a83 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-array.hh"
@@ -14,47 +13,44 @@
 #include "ly-smobs.icc"
 
 Item *
-Grob_array::item (int i)
+Grob_array::item (vsize i)
 {
-  return dynamic_cast<Item*> (grobs_.elem (i));
+  return dynamic_cast<Item *> (grobs_.at (i));
 }
 
-Spanner*
-Grob_array::spanner (int 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_;
 }
 
-
 SCM
 Grob_array::mark_smob (SCM s)
 {
   (void) s;
-  
-#if 0
-  // see System::derived_mark()
-  Grob_array *ga = unsmob_grob_array (s); 
-  for (int i = 0; i < ga->grobs_.size(); i++)
+
+#if 0  /* see System::derived_mark () const */
+  Grob_array *ga = unsmob_grob_array (s);
+  for (vsize i = 0; i < ga->grobs_.size (); i++)
     scm_gc_mark (ga->grobs_[i]->self_scm ());
-#endif  
+#endif
   return SCM_UNDEFINED;
 }
 
@@ -63,16 +59,15 @@ Grob_array::print_smob (SCM arr, SCM port, scm_print_state*)
 {
   scm_puts ("#<Grob_array", port);
 
-  Grob_array * grob_arr = unsmob (arr);
-  for (int i = 0; i < grob_arr->size(); i++)
+  Grob_array *grob_arr = unsmob (arr);
+  for (vsize i = 0; i < grob_arr->size (); i++)
     {
       scm_display (grob_arr->grob (i)->self_scm (), port);
-      scm_puts (" " , port);
+      scm_puts (" ", port);
     }
   scm_puts (">", port);
   return 1;
 }
-  
 
 SCM
 Grob_array::make_array ()
@@ -87,16 +82,25 @@ Grob_array::clear ()
   grobs_.clear ();
 }
 
+void
+Grob_array::remove_duplicates ()
+{
+  assert (!ordered_);
+  
+  vector_sort (grobs_, default_compare);
+  ::uniq (grobs_);
+}
+
 bool
-Grob_array::is_empty () const
+Grob_array::empty () const
 {
-  return grobs_.is_empty ();
+  return grobs_.empty ();
 }
 
 void
-Grob_array::set_array (Link_array<Grob> const &src)
+Grob_array::set_array (vector<Grob*> const &src)
 {
-  grobs_ = src;  
+  grobs_ = src;
 }
 
 IMPLEMENT_SIMPLE_SMOBS (Grob_array);
@@ -104,15 +108,13 @@ IMPLEMENT_TYPE_P (Grob_array, "ly:grob-array?");
 
 IMPLEMENT_DEFAULT_EQUAL_P (Grob_array);
 
-
 SCM
 grob_list_to_grob_array (SCM lst)
 {
   SCM arr_scm = Grob_array::make_array ();
   Grob_array *ga = unsmob_grob_array (arr_scm);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    {
-      ga->add (unsmob_grob (scm_car (s)));
-    }
+    ga->add (unsmob_grob (scm_car (s)));
   return arr_scm;
 }
+