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

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 1cebe0e458..593ce6a568 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
@@ -21,7 +21,6 @@
 #include "item.hh"
 #include "spanner.hh"
 
-#include "ly-smobs.icc"
 
 Item *
 Grob_array::item (vsize i)
@@ -40,13 +39,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_;
@@ -58,7 +57,7 @@ Grob_array::mark_smob (SCM s)
   (void) s;
 
 #if 0  /* see System::derived_mark () const */
-  Grob_array *ga = unsmob_grob_array (s);
+  Grob_array *ga = Grob_array::unsmob (s);
   for (vsize i = 0; i < ga->grobs_.size (); i++)
     scm_gc_mark (ga->grobs_[i]->self_scm ());
 #endif
@@ -66,7 +65,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 +96,8 @@ void
 Grob_array::remove_duplicates ()
 {
   assert (!ordered_);
-  
-  vector_sort (grobs_, less<Grob*> ());
-  ::uniq (grobs_);
+
+  uniquify (grobs_);
 }
 
 bool
@@ -109,23 +107,34 @@ Grob_array::empty () const
 }
 
 void
-Grob_array::set_array (vector<Grob*> const &src)
+Grob_array::set_array (vector<Grob *> const &src)
 {
   grobs_ = src;
 }
 
-IMPLEMENT_SIMPLE_SMOBS (Grob_array);
-IMPLEMENT_TYPE_P (Grob_array, "ly:grob-array?");
+const char Grob_array::type_p_name_[] = "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);
+  Grob_array *ga = Grob_array::unsmob (arr_scm);
   for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
-    ga->add (unsmob_grob (scm_car (s)));
+    ga->add (Grob::unsmob (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;
+}