source file of the GNU LilyPond music typesetter
- (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "group-interface.hh"
#include "axis-group-interface.hh"
#include "hara-kiri-group-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2);
SCM
Align_interface::alignment_callback (SCM element_smob, SCM axis)
{
Grob * me = unsmob_grob (element_smob);
- Axis ax = (Axis)gh_scm2int (axis);
+ Axis ax = (Axis)ly_scm2int (axis);
Grob * par = me->get_parent (ax);
- if (par && !to_boolean (par->get_grob_property ("alignment-done")))
+ if (par && !to_boolean (par->get_property ("positioning-done")))
{
Align_interface::align_elements_to_extents (par, ax);
}
- return gh_double2scm (0.0);
+ return scm_make_real (0.0);
}
MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2);
Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
{
Grob * me = unsmob_grob (element_smob);
- Axis ax = (Axis)gh_scm2int (axis);
+ Axis ax = (Axis)ly_scm2int (axis);
Grob * par = me->get_parent (ax);
- if (par && !to_boolean (par->get_grob_property ("alignment-done")))
+ if (par && !to_boolean (par->get_property ("positioning-done")))
{
Align_interface::align_to_fixed_distance (par, ax);
}
- return gh_double2scm (0.0);
+ return scm_make_real (0.0);
}
/*
void
Align_interface::align_to_fixed_distance (Grob *me , Axis a)
{
- me->set_grob_property ("alignment-done", SCM_BOOL_T);
+ me->set_property ("positioning-done", SCM_BOOL_T);
- SCM d = me->get_grob_property ("stacking-dir");
+ SCM d = me->get_property ("stacking-dir");
- Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
+ Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
- SCM force = me->get_grob_property ("forced-distance");
-
- Real dy = 0.0;
- if (gh_number_p (force))
- {
- dy = gh_scm2double (force);
- }
+ Real dy = robust_scm2double (me->get_property ("forced-distance"),0.0);
Link_array<Grob> elems
= Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
{
/*
This is not very elegant, in that we need special support for
- hara kiri. Unfortunately, the generic wiring of
+ hara-kiri. Unfortunately, the generic wiring of
force_hara_kiri_callback () (extent and offset callback) is
- such that we might get into a loop if we call extent() or
- offset() the elements.
+ such that we might get into a loop if we call extent () or
+ offset () the elements.
*/
&& Hara_kiri_group_spanner::has_interface (elems[j]))
Hara_kiri_group_spanner::consider_suicide (elems[j]);
- if (!elems[j]-> live())
- elems.del(j);
+ if (!elems[j]->is_live ())
+ elems.del (j);
}
for (int j =0; j < elems.size (); j++)
TODO: maybe we should rethink and throw out thresholding altogether.
The original function has been taken over by
- align_to_fixed_distance().
+ align_to_fixed_distance ().
*/
void
Align_interface::align_elements_to_extents (Grob * me, Axis a)
{
- me->set_grob_property ("alignment-done", SCM_BOOL_T);
+ me->set_property ("positioning-done", SCM_BOOL_T);
- SCM d = me->get_grob_property ("stacking-dir");
+ SCM d = me->get_property ("stacking-dir");
- Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
+ Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
if (!stacking_dir)
stacking_dir = DOWN;
- Interval threshold = Interval (0, Interval::infinity ());
- SCM thr = me->get_grob_property ("threshold");
- if (gh_pair_p (thr))
- {
- threshold[SMALLER] = gh_scm2double (ly_car (thr));
- threshold[BIGGER] = gh_scm2double (ly_cdr (thr));
- }
-
+ Interval threshold = robust_scm2interval (me->get_property ("threshold"), Interval (0, Interval::infinity ()));
Array<Interval> dims;
for (int i=0; i < all_grobs.size (); i++)
{
Interval y = all_grobs[i]->extent (me, a);
- if (!y.empty_b ())
+ if (!y.is_empty ())
{
Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
prop_syms[Y_AXIS] = ly_symbol2scm ("self-alignment-Y");
}
- SCM align (me->internal_get_grob_property (prop_syms[a]));
+ SCM align (me->internal_get_property (prop_syms[a]));
Array<Real> translates ;
Interval total;
}
- Grob * align_center = unsmob_grob (align);
Real center_offset = 0.0;
-
/*
also move the grobs that were empty, to maintain spatial order.
- */
+ */
Array<Real> all_translates;
if (translates.size ())
{
{
w = translates[i++];
}
- if (all_grobs[j] == align_center)
- center_offset = w;
- all_translates .push (w);
+ all_translates.push (w);
j++;
}
FIXME: uncommenting freaks out the Y-alignment of
line-of-score.
*/
- // Real align_param = ly_dir_p (align) ? gh_scm2double (align) : 0.0;
-
- if (gh_number_p (align))
- center_offset = total.linear_combination (gh_scm2double (align));
+ if (ly_c_number_p (align))
+ center_offset = total.linear_combination (ly_scm2double (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 (gh_scm2int (ly_car (me->get_grob_property ("axes"))));
+ return Axis (ly_scm2int (ly_car (me->get_property ("axes"))));
}
void
{
while (g)
{
- if (gh_number_p (g->get_grob_property ("forced-distance")))
+ if (ly_c_number_p (g->get_property ("forced-distance")))
return g;
g = g->get_parent (Y_AXIS);
ADD_INTERFACE (Align_interface, "align-interface",
- " Order grobs top to bottom/left to right/right to left etc.",
- "forced-distance stacking-dir align-dir threshold alignment-done center-element elements axes");
+ "Order grobs from top to bottom, left to right, right to left or bottom"
+ "to top."
+ ,
+ "forced-distance stacking-dir align-dir threshold positioning-done "
+ "center-element elements axes");
struct Foobar
projects / lilypond.git / blobdiff