source file of the GNU LilyPond music typesetter
- (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "align-interface.hh"
-#include "grob.hh"
-#include "group-interface.hh"
+
#include "axis-group-interface.hh"
#include "hara-kiri-group-spanner.hh"
#include "output-def.hh"
Align_interface::alignment_callback (SCM element_smob, SCM axis)
{
Grob * me = unsmob_grob (element_smob);
- Axis ax = (Axis)ly_scm2int (axis);
+ Axis ax = (Axis)scm_to_int (axis);
Grob * par = me->get_parent (ax);
if (par && !to_boolean (par->get_property ("positioning-done")))
{
Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
{
Grob * me = unsmob_grob (element_smob);
- Axis ax = (Axis)ly_scm2int (axis);
+ Axis ax = (Axis)scm_to_int (axis);
Grob * par = me->get_parent (ax);
if (par && !to_boolean (par->get_property ("positioning-done")))
{
SCM d = me->get_property ("stacking-dir");
- Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
+ Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
Link_array<Grob> elems
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- Real where_f=0;
+ Real where_f = 0;
Interval v;
v.set_empty ();
Array<Real> translates;
- for (int j= elems.size (); j--; )
+ for (int j = elems.size (); j--; )
{
/*
This is not very elegant, in that we need special support for
&& Hara_kiri_group_spanner::has_interface (elems[j]))
Hara_kiri_group_spanner::consider_suicide (elems[j]);
- if (!elems[j]->live ())
+ if (!elems[j]->is_live ())
elems.del (j);
}
- for (int j =0; j < elems.size (); j++)
+ for (int j = 0; j < elems.size (); j++)
{
where_f += stacking_dir * dy;
translates.push (where_f);
SCM d = me->get_property ("stacking-dir");
- Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
+ Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
- Interval threshold = robust_scm2interval ( me->get_property ("threshold"), Interval (0, Interval::infinity ()));
+ Interval threshold = robust_scm2interval (me->get_property ("threshold"),
+ Interval (0, Interval::infinity ()));
Array<Interval> dims;
Link_array<Grob> elems;
Link_array<Grob> all_grobs
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
- for (int i=0; i < all_grobs.size (); i++)
+ for (int i = 0; i < all_grobs.size (); i++)
{
Interval y = all_grobs[i]->extent (me, a);
if (!y.is_empty ())
{
- Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
+ Grob *e = dynamic_cast<Grob*> (all_grobs[i]);
elems.push (e);
dims.push (y);
Array<Real> translates ;
Interval total;
- Real where_f=0;
+ Real where_f = 0;
- for (int j=0 ; j < elems.size (); j++)
+ for (int j = 0 ; j < elems.size (); j++)
{
Real dy = - dims[j][-stacking_dir];
if (j)
Array<Real> all_translates;
if (translates.size ())
{
- int i =0;
- int j =0;
+ int i = 0;
+ int j = 0;
Real w = translates[0];
while (j < all_grobs.size ())
{
FIXME: uncommenting freaks out the Y-alignment of
line-of-score.
*/
- if (ly_c_number_p (align))
- center_offset = total.linear_combination (ly_scm2double (align));
+ if (scm_is_number (align))
+ center_offset = total.linear_combination (scm_to_double (align));
for (int j = 0 ; j < all_grobs.size (); j++)
all_grobs[j]->translate_axis (all_translates[j] - center_offset, a);
Axis
Align_interface::axis (Grob*me)
{
- return Axis (ly_scm2int (ly_car (me->get_property ("axes"))));
+ return Axis (scm_to_int (scm_car (me->get_property ("axes"))));
}
void
{
while (g)
{
- if (ly_c_number_p (g->get_property ("forced-distance")))
+ if (scm_is_number (g->get_property ("forced-distance")))
return g;
g = g->get_parent (Y_AXIS);