X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=217ea78aa917cd2bd3baa98efa97892ff1537543;hb=a1209c204e0d48d1f8cacecc9e928796102ab99a;hp=ee1d3e78a2009dbaf620cb793562791427a72a07;hpb=586d833b4fb7a336524eb0929d693095a802fa26;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index ee1d3e78a2..217ea78aa9 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -1,9 +1,20 @@
 /*
-  grob-array.cc -- implement Grob_array
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 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 "grob-array.hh"
@@ -26,16 +37,16 @@ Grob_array::spanner (vsize 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 +93,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 +109,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 +128,17 @@ grob_list_to_grob_array (SCM lst)
     ga->add (unsmob_grob (scm_car (s)));
   return arr_scm;
 }
+
+SCM
+grob_array_to_list (Grob_array *array)
+{
+  SCM list = SCM_EOL;
+  SCM *tail = &list;
+
+  for (vsize i = 0; i < array->size (); i++)
+    {
+      *tail = scm_cons (array->grob (i)->self_scm (), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
+    }
+  return list;
+}