X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-array.cc;h=62d071cee17a03d69a5639c05d3ea318276f6682;hb=2674355d2805e41d476265065a626ad80441e78f;hp=9cf6e39e5f133a63fd4df150a78fab62196f809a;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/grob-array.cc b/lily/grob-array.cc index 9cf6e39e5f..62d071cee1 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--2012 Han-Wen Nienhuys - (c) 2005--2009 Han-Wen Nienhuys + 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 . */ #include "grob-array.hh" @@ -29,13 +40,13 @@ Grob_array::Grob_array () ordered_ = true; } -vector & +vector & Grob_array::array_reference () { return grobs_; } -vector const & +vector const & Grob_array::array () const { return grobs_; @@ -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 ("# ()); + + vector_sort (grobs_, less ()); ::uniq (grobs_); } @@ -98,7 +109,7 @@ Grob_array::empty () const } void -Grob_array::set_array (vector const &src) +Grob_array::set_array (vector const &src) { grobs_ = src; } @@ -118,3 +129,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; +}