unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / grob-array.cc

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 281ae61e27cd71aa55342e6400fc8f3eb317ed09..78ee5eff006986abb095505837fe245e8c02800e 100644 (file)
--- 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2008 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"
@@ -29,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_;
@@ -47,7 +58,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
@@ -55,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);
 
@@ -86,9 +97,8 @@ void
 Grob_array::remove_duplicates ()
 {
   assert (!ordered_);
-  
-  vector_sort (grobs_, less<Grob*> ());
-  ::uniq (grobs_);
+
+  uniquify (grobs_);
 }
 
 bool
@@ -98,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;
 }
@@ -112,9 +122,22 @@ 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;
+}