X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=a47d222e8123f6d706c6392a4900d07dd94e552a;hb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;hp=1cebe0e458357ca6245be157d7694c969cde032d;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 1cebe0e458..a47d222e81 100644
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 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
@@ -40,13 +40,13 @@ Grob_array::Grob_array ()
   ordered_ = true;
 }
 
-vector<Grob*> &
+vector<Grob *> &
 Grob_array::array_reference ()
 {
   return grobs_;
 }
 
-vector<Grob*> const &
+vector<Grob *> const &
 Grob_array::array () const
 {
   return grobs_;
@@ -66,7 +66,7 @@ Grob_array::mark_smob (SCM s)
 }
 
 int
-Grob_array::print_smob (SCM arr, SCM port, scm_print_state*)
+Grob_array::print_smob (SCM arr, SCM port, scm_print_state *)
 {
   scm_puts ("#<Grob_array", port);
 
@@ -97,9 +97,8 @@ void
 Grob_array::remove_duplicates ()
 {
   assert (!ordered_);
-  
-  vector_sort (grobs_, less<Grob*> ());
-  ::uniq (grobs_);
+
+  uniquify (grobs_);
 }
 
 bool
@@ -109,7 +108,7 @@ Grob_array::empty () const
 }
 
 void
-Grob_array::set_array (vector<Grob*> const &src)
+Grob_array::set_array (vector<Grob *> const &src)
 {
   grobs_ = src;
 }
@@ -129,3 +128,16 @@ grob_list_to_grob_array (SCM lst)
   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;
+}