source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
+#include "note-head.hh"
#include "side-position-interface.hh"
#include "warn.hh"
#include "warn.hh"
Direction
Side_position_interface::get_direction (Grob*me)
{
- SCM d = me->get_grob_property ("direction");
+ SCM d = me->get_property ("direction");
if (is_direction (d) && to_dir (d))
return to_dir (d);
Direction relative_dir = Direction (1);
- SCM reldir = me->get_grob_property ("side-relative-direction"); // should use a lambda.
+ SCM reldir = me->get_property ("side-relative-direction"); // should use a lambda.
if (is_direction (reldir))
{
relative_dir = to_dir (reldir);
}
- SCM other_elt = me->get_grob_property ("direction-source");
+ SCM other_elt = me->get_property ("direction-source");
Grob * e = unsmob_grob (other_elt);
if (e)
{
Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) ly_scm2int (axis);
return general_side_position (me, a, true);
}
Side_position_interface::general_side_position (Grob * me, Axis a, bool use_extents)
{
Real ss = Staff_symbol_referencer::staff_space (me);
- SCM support = me->get_grob_property ("side-support-elements");
+ SCM support = me->get_property ("side-support-elements");
Grob *common = common_refpoint_of_list (support, me->get_parent (a), a);
-
+ Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
+ bool include_staff = (st
+ && a == Y_AXIS
+ && is_number (me->get_property ("staff-padding")));
+
Interval dim;
+ if (include_staff)
+ {
+ common = st->common_refpoint (common, Y_AXIS);
+ dim = st->extent (common, Y_AXIS);
+ }
+
for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
{
Grob * e = unsmob_grob (ly_car (s));
Direction dir = Side_position_interface::get_direction (me);
Real off = me->get_parent (a)->relative_coordinate (common, a);
- Real minimum_space = ss * robust_scm2double (me->get_grob_property ("minimum-space"), -1);
+ Real minimum_space = ss * robust_scm2double (me->get_property ("minimum-space"), -1);
Real total_off = dim.linear_combination (dir) - off;
- total_off += dir * ss * robust_scm2double (me->get_grob_property ("padding"), 0);
+ total_off += dir * ss * robust_scm2double (me->get_property ("padding"), 0);
if (minimum_space >= 0
&& dir
- return gh_double2scm (total_off);
+ return scm_make_real (total_off);
}
/*
Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis)
{
Grob *me = unsmob_grob (smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) ly_scm2int (axis);
return general_side_position (me, a, false);
}
Real rad = Staff_symbol_referencer::staff_radius (me) *2 ;
int ip = int (rp);
- if (abs (ip) <= rad && Staff_symbol_referencer::on_staffline (me,ip))
+ Grob *head = me->get_parent (X_AXIS);
+
+ if (Staff_symbol_referencer::on_staffline (me,ip)
+ && ((abs (ip) <= rad)
+ || (Note_head::has_interface (head)
+ && sign (Staff_symbol_referencer::get_position (head))
+ == -d)
+ ))
{
ip += d;
rp += d;
}
-
- return gh_double2scm ((rp - p) * Staff_symbol_referencer::staff_space (me) / 2.0);
+
+ return scm_make_real ((rp - p) * Staff_symbol_referencer::staff_space (me) / 2.0);
}
- return gh_double2scm (0.0);
+ return scm_make_real (0.0);
}
/*
Side_position_interface::aligned_side (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) ly_scm2int (axis);
Direction d = Side_position_interface::get_direction (me);
- Real o = gh_scm2double (aligned_on_support_extents (element_smob,axis));
+ Real o = ly_scm2double (aligned_on_support_extents (element_smob,axis));
Interval iv = me->extent (me, a);
*/
Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
if (st && a == Y_AXIS
- && gh_number_p (me->get_grob_property ("staff-padding")))
+ && is_number (me->get_property ("staff-padding")))
{
Real padding=
Staff_symbol_referencer::staff_space (me)
- * gh_scm2double (me->get_grob_property ("staff-padding"));
+ * ly_scm2double (me->get_property ("staff-padding"));
Grob *common = me->common_refpoint (st, Y_AXIS);
o += (d* (diff >? 0));
}
- return gh_double2scm (o);
+ return scm_make_real (o);
}
-void
-Side_position_interface::add_staff_support (Grob*me)
-{
- Grob* st = Staff_symbol_referencer::get_staff_symbol (me);
- if (st && get_axis (me) == Y_AXIS)
- {
- add_support (me,st);
- }
-}
void
Side_position_interface::set_axis (Grob*me, Axis a)
-// ugh. doesn't cactch all variants.
+// ugh. doesn't catch all variants.
Axis
Side_position_interface::get_axis (Grob*me)
{
- if (me->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS)
- || me->has_offset_callback_b (Side_position_interface::aligned_side_proc , X_AXIS))
+ if (me->has_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS)
+ || me->has_offset_callback (Side_position_interface::aligned_side_proc , X_AXIS))
return X_AXIS;
return Y_AXIS;
}
-void
-Side_position_interface::set_direction (Grob*me, Direction d)
-{
- me->set_grob_property ("direction", gh_int2scm (d));
-}
-
-void
-Side_position_interface::set_minimum_space (Grob*me, Real m)
-{
- me->set_grob_property ("minimum-space", gh_double2scm (m));
-}
-
-void
-Side_position_interface::set_padding (Grob*me, Real p)
-{
- me->set_grob_property ("padding", gh_double2scm (p));
-}
-
-
-bool
-Side_position_interface::supported_b (Grob*me)
-{
- SCM s = me->get_grob_property ("side-support-elements");
- return gh_pair_p (s);
-}
-
ADD_INTERFACE (Side_position_interface,"side-position-interface",
"Position a victim object (this one) next to other objects (the "
- "support). In this case, the property @code{direction} signifies where to put the "
+ "support). The property @code{direction} signifies where to put the "
"victim object relative to the support (left or right, up or down?)\n\n "
- "The routine puts objects at a distance of the staff if the property "
- "@code{staff-padding} is defined. If undefined, the staff symbol is ignored."
+ "The routine also takes the size the staff into account if "
+ "@code{staff-padding} is set. If undefined, the staff symbol is ignored."
,
"staff-padding side-support-elements direction-source "
"direction side-relative-direction minimum-space padding");
projects / lilypond.git / blobdiff