source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
TODO:
- * Use Number_pair i.s.o Interval to represent (yl, yr).
-
- Determine auto knees based on positions if it's set by the user.
- - rounded corners.
+ - the code is littered with * and / staff_space calls for
+ #'positions. Consider moving to real-world coordinates?
+ Problematic issue is user tweaks (user tweaks are in staff-coordinates.)
+
Notes:
-
- Stems run to the Y-center of the beam.
- beam_translation is the offset between Y centers of the beam.
#include <math.h> // tanh.
-#include "molecule.hh"
+#include "stencil.hh"
#include "directional-element-interface.hh"
#include "beaming.hh"
#include "beam.hh"
#include "spanner.hh"
#include "warn.hh"
-
-
bool debug_beam_quanting_flag;
Beam::get_beam_translation (Grob *me)
{
SCM func = me->get_grob_property ("space-function");
- SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me)));
- return gh_scm2double (s);
+
+ if (gh_procedure_p (func))
+ {
+ SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me)));
+ return gh_scm2double (s);
+ }
+ else
+ {
+ return 0.81;
+ }
}
/* Maximum beam_count. */
Grob *me = unsmob_grob (smob);
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+ Real line = Staff_symbol_referencer::line_thickness (me);
Real thickness = get_thickness (me);
Real beam_translation = gh_scm2int (beam_count) < 4
}
}
-MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1);
+
+/*
+ TODO: should not make beams per stem, but per Y-level.
+ */
+MAKE_SCHEME_CALLBACK (Beam, print, 1);
SCM
-Beam::brew_molecule (SCM grob)
+Beam::print (SCM grob)
{
Grob *me = unsmob_grob (grob);
position_beam (me);
}
SCM posns = me->get_grob_property ("positions");
- Interval pos;
+ Drul_array<Real> pos;
if (!is_number_pair (posns))
{
programming_error ("No beam posns");
pos = Interval (0,0);
}
else
- pos= ly_scm2interval (posns);
+ pos= ly_scm2realdrul (posns);
- Real dy = pos.delta ();
+ scale_drul ( &pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Real dydx = (dy && dx) ? dy/dx : 0;
Real thick = get_thickness (me);
Real bdy = get_beam_translation (me);
- SCM last_beaming = SCM_EOL;;
+ SCM last_beaming = SCM_EOL;
Real last_xposn = -1;
Real last_stem_width = -1 ;
Real gap_length =robust_scm2double ( me->get_grob_property ("gap"), 0.0);
- Molecule the_beam;
+ Stencil the_beam;
Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
for (int i = 0; i<= stems.size(); i++)
Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
- Molecule whole = Lookup::beam (dydx, w, thick, blot);
- Molecule gapped;
+ Stencil whole = Lookup::beam (dydx, w, thick, blot);
+ Stencil gapped;
int gap_count = 0;
if (gh_number_p (me->get_grob_property ("gap-count")))
int k = 0;
for (int j = full_beams.size (); j--;)
{
- Molecule b (whole);
+ Stencil b (whole);
if (k++ < gap_count)
{
b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS);
b.translate_axis (dydx * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS);
- the_beam.add_molecule (b);
+ the_beam.add_stencil (b);
}
Real w = (i>0 && st) ? (xposn - last_xposn) : break_overshoot;
w = w/2 <? nw_f;
- Molecule half = Lookup::beam (dydx, w, thick, blot);
+ Stencil half = Lookup::beam (dydx, w, thick, blot);
for (int j = lfliebertjes.size(); j--;)
{
- Molecule b (half);
+ Stencil b (half);
b.translate_axis (last_xposn - x0, X_AXIS);
b.translate_axis (dydx * (last_xposn-x0) + bdy * lfliebertjes[j], Y_AXIS);
- the_beam.add_molecule (b);
+ the_beam.add_stencil (b);
}
for (int j = rfliebertjes.size(); j--;)
{
- Molecule b (half);
+ Stencil b (half);
b.translate_axis (xposn - x0 - w , X_AXIS);
b.translate_axis (dydx * (xposn-x0 -w) + bdy * rfliebertjes[j], Y_AXIS);
- the_beam.add_molecule (b);
+ the_beam.add_stencil (b);
}
}
String str;
SCM properties = Font_interface::font_alist_chain (me);
- Molecule tm = *unsmob_molecule (Text_item::interpret_markup
+ Stencil tm = *unsmob_stencil (Text_item::interpret_markup
(me->get_paper ()->self_scm (), properties, quant_score));
the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0, 0);
}
slope esp. of the first part of a broken beam should predict
where the second part goes.
*/
-
- y = pos[LEFT];
- dy = pos[RIGHT]- y;
- dydx = dy/dx;
-
-
-
+ me->set_grob_property ("least-squares-dy",
+ gh_double2scm (pos[RIGHT] - pos[LEFT]));
}
else
{
pos = Interval (y, (y+dy));
}
+ /*
+ "position" is relative to the staff.
+ */
+ scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me));
+
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0;
- Interval pos = ly_scm2interval ( me->get_grob_property ("positions"));
- Real dy = pos.delta();
+ Drul_array<Real> pos = ly_scm2interval ( me->get_grob_property ("positions"));
+
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Real y = pos[LEFT];
Real dydx =dy/dx;
else
y = feasible_left_point.center ();
}
- pos = Interval (y, (y+dy));
+
+ pos = Drul_array<Real> (y, (y+dy));
+ scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me));
+
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
}
/* TODO: some sort of damping iso -> plain horizontal */
if (concaveness1 || concaveness2 > r2)
{
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real r = pos.linear_combination (0);
- me->set_grob_property ("positions", ly_interval2scm (Interval (r, r)));
+ Drul_array<Real> pos = ly_scm2interval (me->get_grob_property ("positions"));
+ Real r = linear_combination (pos, 0);
+
+ r /= Staff_symbol_referencer::staff_space (me);
+ me->set_grob_property ("positions", ly_interval2scm (Drul_array<Real> (r, r)));
me->set_grob_property ("least-squares-dy", gh_double2scm (0));
}
if (damping)
{
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real dy = pos.delta ();
+ Drul_array<Real> pos = ly_scm2interval (me->get_grob_property ("positions"));
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Grob *fvs = first_visible_stem (me);
Grob *lvs = last_visible_stem (me);
Real damped_dy = dydx * dx;
pos[LEFT] += (dy - damped_dy) / 2;
pos[RIGHT] -= (dy - damped_dy) / 2;
+
+ scale_drul (&pos, 1/Staff_symbol_referencer::staff_space (me));
me->set_grob_property ("positions", ly_interval2scm (pos));
}
Real
Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common,
Real xl, Real xr,
- Interval pos, bool french)
+ Drul_array<Real> pos, bool french)
{
Real beam_translation = get_beam_translation (me);
Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl;
- Real dy = pos.delta ();
+ Real dy = pos[RIGHT] - pos[LEFT];
Real dx = xr - xl;
Real stem_y_beam0 = (dy && dx
? r / dx
for (int a = 2; a--;)
common[a] = common_refpoint_of_array (stems, me, Axis(a));
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
+ Drul_array<Real> pos = ly_scm2realdrul (me->get_grob_property ("positions"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
+ scale_drul (&pos, staff_space);
bool gap = false;
Real thick =0.0;
|| !Beam::visible_stem_count (beam))
return gh_double2scm (0.0);
- Interval pos (0, 0);
+ Drul_array<Real> pos (0, 0);
SCM s = beam->get_grob_property ("positions");
if (gh_pair_p (s) && gh_number_p (ly_car (s)))
pos = ly_scm2interval (s);
+ Real staff_space = Staff_symbol_referencer::staff_space (rest);
- Real dy = pos.delta ();
+ scale_drul (&pos, staff_space);
+
+
+ Real dy = pos[RIGHT] - pos[LEFT];
+
// ugh -> use commonx
Real x0 = first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
Real dx = last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - x0;
Real dydx = dy && dx ? dy/dx : 0;
Direction d = Stem::get_direction (stem);
- Real stem_y = (pos[LEFT]
- + (stem->relative_coordinate (0, X_AXIS) - x0) * dydx)
- * d;
+ Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * dydx;
Real beam_translation = get_beam_translation (beam);
- Real beam_thickness = gh_scm2double (beam->get_grob_property ("thickness"));
+ Real beam_thickness = Beam::get_thickness (beam);
+
int beam_count = get_direction_beam_count (beam, d);
- Real height_of_my_beams = beam_thickness
+ Real height_of_my_beams = beam_thickness / 2
+ (beam_count - 1) * beam_translation;
- Real beam_y = stem_y - height_of_my_beams + beam_thickness / 2.0;
-
- Real staff_space = Staff_symbol_referencer::staff_space (rest);
+ Real beam_y = stem_y - d * height_of_my_beams;
- /* Better calculate relative-distance directly, rather than using
- rest_dim? */
- Grob *common_x = rest->common_refpoint (beam, Y_AXIS);
- Real rest_dim = rest->extent (common_x, Y_AXIS)[d] / staff_space * d;
+ Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
+ Real rest_dim = rest->extent (common_y, Y_AXIS)[d];
Real minimum_distance =
- staff_space * robust_scm2double
- (rest->get_grob_property ("minimum-beam-collision-distance"), 1);
+ staff_space * robust_scm2double (rest->get_grob_property ("minimum-distance"), 0.0);
- Real distance = beam_y - rest_dim;
- Real shift = 0;
- if (distance < 0)
- shift = minimum_distance - distance;
- else if (minimum_distance > distance)
- shift = minimum_distance - distance;
+ Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d <? 0.0);
shift /= staff_space;
-
Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
/* Always move discretely by half spaces */
- shift = ceil (shift * 2.0) / 2.0;
+ shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift);
/* Inside staff, move by whole spaces*/
-
- if ((rest->extent (common_x, Y_AXIS)[d] + staff_space * shift) * d
+ if ((rest->extent (common_y, Y_AXIS)[d] + staff_space * shift) * d
< rad
- || (rest->extent (common_x, Y_AXIS)[-d] + staff_space * shift) * -d
+ || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d
< rad)
- shift = ceil (shift);
+ shift = ceil (fabs (shift)) *sign (shift);
- return gh_double2scm (-d * staff_space * shift);
+ return gh_double2scm (staff_space * shift);
}
bool