source file of the GNU LilyPond music typesetter
- (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
#include "dimensions.hh"
#include "staff-symbol-referencer.hh"
#include "group-interface.hh"
+#include "directional-element-interface.hh"
void
Side_position_interface::add_support (Grob*me, Grob*e)
{
- Pointer_group_interface::add_element (me, "side-support-elements",e);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("side-support-elements"), e);
}
}
SCM other_elt = me->get_grob_property ("direction-source");
- Grob * e = unsmob_grob(other_elt);
+ Grob * e = unsmob_grob (other_elt);
if (e)
{
- return (Direction)(relative_dir * Side_position_interface::get_direction (e));
+ return (Direction) (relative_dir * Directional_element_interface::get (e));
}
return CENTER;
}
-MAKE_SCHEME_CALLBACK(Side_position_interface,aligned_on_support_extents, 2);
+MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_extents, 2);
SCM
Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis)
{
SCM
Side_position_interface::general_side_position (Grob * me, Axis a, bool use_extents)
{
- Grob *common = me->parent_l (a);
+ Grob *common = me->get_parent (a);
+
+ /*
+ As this is only used as a callback, this is called only once. We
+ could wipe SIDE-SUPPORT-ELEMENTS after we retrieve it to conserve
+ memory; however -- we should look more into benefits of such actions?
+
+ The benefit is small, it seems: total GC times taken don't
+ differ. Would this also hamper Generational GC ?
+
+ */
SCM support = me->get_grob_property ("side-support-elements");
- for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
+ // me->remove_grob_property ("side-support-elements");
+ for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
{
- Grob * e = unsmob_grob (gh_car (s));
+ Grob * e = unsmob_grob (ly_car (s));
if (e)
common = common->common_refpoint (e, a);
}
Interval dim;
- for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
+ for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
{
- Grob * e = unsmob_grob ( gh_car (s));
+ Grob * e = unsmob_grob (ly_car (s));
if (e)
if (use_extents)
dim.unite (e->extent (common, a));
if (dim.empty_b ())
{
- dim = Interval(0,0);
+ dim = Interval (0,0);
}
Direction dir = Side_position_interface::get_direction (me);
- Real off = me->parent_l (a)->relative_coordinate (common, a);
+ Real off = me->get_parent (a)->relative_coordinate (common, a);
SCM minimum = me->remove_grob_property ("minimum-space");
Real total_off = dim.linear_combination (dir) + off;
/*
Cut & paste (ugh.)
*/
-MAKE_SCHEME_CALLBACK(Side_position_interface,aligned_on_support_refpoints,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_support_refpoints,2);
SCM
Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis)
{
/**
callback that centers the element on itself
+
+ Requires that self-alignment-{X,Y} be set.
*/
-MAKE_SCHEME_CALLBACK(Side_position_interface,aligned_on_self,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_self,2);
SCM
Side_position_interface::aligned_on_self (SCM element_smob, SCM axis)
{
Axis a = (Axis) gh_scm2int (axis);
String s ("self-alignment-");
- s += (a == X_AXIS) ? "X" : "Y";
+ s += (a == X_AXIS) ? "X" : "Y";
- SCM align (me->get_grob_property (s.ch_C()));
+ SCM align (me->get_grob_property (s.ch_C ()));
if (gh_number_p (align))
{
- Interval ext(me->extent (me,a));
+ Interval ext (me->extent (me,a));
if (ext.empty_b ())
{
{
return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me, a));
}
- return gh_double2scm (0.0);
+ return gh_double2scm (0.0);
}
of the elements "direction" elt property.
Only rounds when we're inside the staff, as determined by
- Staff_symbol_referencer::staff_radius() */
-MAKE_SCHEME_CALLBACK(Side_position_interface,quantised_position,2);
+ Staff_symbol_referencer::staff_radius () */
+MAKE_SCHEME_CALLBACK (Side_position_interface,quantised_position,2);
SCM
-Side_position_interface::quantised_position (SCM element_smob, SCM )
+Side_position_interface::quantised_position (SCM element_smob, SCM)
{
Grob *me = unsmob_grob (element_smob);
Real p = Staff_symbol_referencer::position_f (me);
Real rp = directed_round (p, d);
Real rad = Staff_symbol_referencer::staff_radius (me) *2 ;
- int ip = int (rp);
+ int ip = int (rp);
if (abs (ip) <= rad && Staff_symbol_referencer::on_staffline (me,ip))
{
/*
Position next to support, taking into account my own dimensions and padding.
*/
-MAKE_SCHEME_CALLBACK(Side_position_interface,aligned_side,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_side,2);
SCM
Side_position_interface::aligned_side (SCM element_smob, SCM axis)
{
Axis a = (Axis) gh_scm2int (axis);
Direction d = Side_position_interface::get_direction (me);
+
Real o = gh_scm2double (aligned_on_support_extents (element_smob,axis));
Interval iv = me->extent (me, a);
if (!iv.empty_b ())
{
+ if (!d)
+ {
+ programming_error ("Direction unknown, but aligned-side wanted.");
+ d = DOWN;
+ }
o += - iv[-d];
SCM pad = me->get_grob_property ("padding");
/*
Position centered on parent.
*/
-MAKE_SCHEME_CALLBACK(Side_position_interface,centered_on_parent,2);
+MAKE_SCHEME_CALLBACK (Side_position_interface,centered_on_parent,2);
SCM
Side_position_interface::centered_on_parent (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
Axis a = (Axis) gh_scm2int (axis);
- Grob *him = me->parent_l (a);
+ Grob *him = me->get_parent (a);
return gh_double2scm (him->extent (him,a).center ());
}
Side_position_interface::add_staff_support (Grob*me)
{
Grob* st = Staff_symbol_referencer::staff_symbol_l (me);
- if (st)
+ if (st && get_axis (me) == Y_AXIS)
{
add_support (me,st);
}
bool
Side_position_interface::supported_b (Grob*me)
{
- SCM s = me->get_grob_property ("side-support-elements");
- return gh_pair_p(s);
+ SCM s = me->get_grob_property ("side-support-elements");
+ return gh_pair_p (s);
}
projects / lilypond.git / blobdiff