/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 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
int
Pointer_group_interface::count (Grob *me, SCM sym)
{
- Grob_array *arr = unsmob_grob_array (me->internal_get_object (sym));
+ Grob_array *arr = unsmob<Grob_array> (me->internal_get_object (sym));
return arr ? arr->size () : 0;
}
void
Pointer_group_interface::add_grob (Grob *me, SCM sym, SCM p)
{
- add_grob (me, sym, unsmob_grob (p));
+ add_grob (me, sym, unsmob<Grob> (p));
}
void
Pointer_group_interface::get_grob_array (Grob *me, SCM sym)
{
SCM scm_arr = me->internal_get_object (sym);
- Grob_array *arr = unsmob_grob_array (scm_arr);
+ Grob_array *arr = unsmob<Grob_array> (scm_arr);
if (!arr)
{
scm_arr = Grob_array::make_array ();
- arr = unsmob_grob_array (scm_arr);
+ arr = unsmob<Grob_array> (scm_arr);
me->set_object (sym, scm_arr);
}
return arr;
return 0;
}
-// If the grob array is unordered, we assume that duplicates should
-// be removed. This makes sense for things like side-position-elements,
-// which may be added recursively numerous times and thus will eat up
-// computation time when skylines are calculated.
-// If the array is ordered, then we don't remove duplicates.
-
void
Pointer_group_interface::add_grob (Grob *me, SCM sym, Grob *p)
{
Grob_array *arr = get_grob_array (me, sym);
arr->add (p);
- if (!arr->ordered ())
- arr->remove_duplicates ();
}
void
Grob_array *arr = get_grob_array (me, sym);
arr->add (p);
arr->set_ordered (false);
- arr->remove_duplicates ();
}
static vector<Grob *> empty_array;
vector<Grob *> const &
ly_scm2link_array (SCM x)
{
- Grob_array *arr = unsmob_grob_array (x);
+ Grob_array *arr = unsmob<Grob_array> (x);
return arr ? arr->array () : empty_array;
}
vector<Item *>
internal_extract_item_array (Grob const *elt, SCM symbol)
{
- Grob_array *arr = unsmob_grob_array (elt->internal_get_object (symbol));
+ Grob_array *arr = unsmob<Grob_array> (elt->internal_get_object (symbol));
vector<Item *> items;
for (vsize i = 0; arr && i < arr->size (); i++)
items.push_back (arr->item (i));