Imported Upstream version 2.18.0

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

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index 5ee86a1d1a00fba4b1449f906f55858e24a4efa9..d0cf11106878b12c73a80d6222cfb7aed955100e 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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"
@@ -13,29 +24,29 @@
 #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)
+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_;
@@ -48,19 +59,19 @@ Grob_array::mark_smob (SCM s)
 
 #if 0  /* see System::derived_mark () const */
   Grob_array *ga = unsmob_grob_array (s);
-  for (int i = 0; i < ga->grobs_.size (); i++)
+  for (vsize i = 0; i < ga->grobs_.size (); i++)
     scm_gc_mark (ga->grobs_[i]->self_scm ());
 #endif
   return SCM_UNDEFINED;
 }
 
 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);
 
   Grob_array *grob_arr = unsmob (arr);
-  for (int i = 0; i < grob_arr->size (); i++)
+  for (vsize i = 0; i < grob_arr->size (); i++)
     {
       scm_display (grob_arr->grob (i)->self_scm (), port);
       scm_puts (" ", port);
@@ -82,14 +93,22 @@ Grob_array::clear ()
   grobs_.clear ();
 }
 
+void
+Grob_array::remove_duplicates ()
+{
+  assert (!ordered_);
+
+  uniquify (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;
 }
@@ -105,8 +124,20 @@ 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)));
+  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++)
     {
-      ga->add (unsmob_grob (scm_car (s)));
+      *tail = scm_cons (array->grob (i)->self_scm (), SCM_EOL);
+      tail = SCM_CDRLOC (*tail);
     }
-  return arr_scm;
+  return list;
 }