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.
+ - 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"
-
-#define DEBUG_QUANTING 0
+bool debug_beam_quanting_flag;
#if DEBUG_QUANTING
Real
Beam::get_thickness (Grob * me)
{
- SCM th = me->get_grob_property ("thickness");
- if (gh_number_p (th))
- return gh_scm2double (th)* Staff_symbol_referencer::staff_space (me);
- else
- return 0.0;
+ return robust_scm2double (me->get_grob_property ("thickness"), 0)
+ * Staff_symbol_referencer::staff_space (me);
}
/* Return the translation between 2 adjoining beams. */
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
Grob *this_stem = stems[i];
SCM this_beaming = this_stem->get_grob_property ("beaming");
- Direction this_dir = Directional_element_interface::get(this_stem);
+ Direction this_dir = get_grob_direction (this_stem);
if (gh_pair_p (last_beaming) && gh_pair_p (this_beaming))
{
int start_point = position_with_maximal_common_beams
}
while (flip (&d) != LEFT);
- if (!new_slice.empty_b())
+ if (!new_slice.is_empty ())
last_int = new_slice;
}
else
}
}
-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);
+
Link_array<Grob> stems=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS);
}
SCM posns = me->get_grob_property ("positions");
- Interval pos;
- if (!ly_number_pair_p (posns))
+ 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 ();
- Real dydx = dy && dx ? dy/dx : 0;
+ 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_width = -1 ;
-
+ Real last_stem_width = -1 ;
- SCM gap = me->get_grob_property ("gap");
- Molecule the_beam;
+ Real gap_length =robust_scm2double ( me->get_grob_property ("gap"), 0.0);
+
+ Stencil the_beam;
Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
for (int i = 0; i<= stems.size(); i++)
SCM this_beaming = st ? st->get_grob_property ("beaming") : SCM_EOL;
Real xposn = st ? st->relative_coordinate (xcommon, X_AXIS) : 0.0;
- Real stem_width = st ? gh_scm2double (st->get_grob_property ("thickness")) *lt : 0 ;
-
+ Real stem_width = st ? robust_scm2double (st->get_grob_property ("thickness"), 1.0) *lt : 0 ;
+ Direction stem_dir = st ? to_dir (st->get_grob_property ("direction")) : CENTER;
/*
We do the space left of ST, with lfliebertjes pointing to the
right from the left stem, and rfliebertjes pointing left from
SCM left = (i>0) ? gh_cdr (last_beaming) : SCM_EOL;
SCM right = st ? gh_car (this_beaming) : SCM_EOL;
- Array<int> fullbeams;
+ Array<int> full_beams;
Array<int> lfliebertjes;
Array<int> rfliebertjes;
int b = gh_scm2int (gh_car (s));
if (scm_memq (gh_car(s), right) != SCM_BOOL_F)
{
- fullbeams.push (b);
+ full_beams.push (b);
}
else
{
how much to stick out for beams across linebreaks
*/
Real break_overshoot = 3.0;
- Real w = (i>0 && st)? xposn - last_xposn : break_overshoot;
- Real stem_offset = 0.0;
- Real width_corr = 0.0;
- if (i == 1)
+ Real w = (i > 0 && st) ? xposn - last_xposn : break_overshoot;
+
+ Real stem_offset =0.0;
+ if (i > 0)
{
- stem_offset -= last_width/2;
- width_corr += last_width/2;
+ w += last_stem_width / 2;
+ stem_offset = -last_stem_width / 2;
}
-
- if (i == stems.size() -1)
+
+ if (st)
+ w += stem_width/ 2 ;
+
+
+ Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+ Stencil whole = Lookup::beam (dydx, w, thick, blot);
+ Stencil gapped;
+
+ int gap_count = 0;
+ if (gh_number_p (me->get_grob_property ("gap-count")))
{
- width_corr += stem_width/2;
+ gap_count = gh_scm2int (me->get_grob_property ("gap-count"));
+ gapped = Lookup::beam (dydx, w - 2 * gap_length, thick, blot);
+
+ full_beams.sort (default_compare);
+ if (stem_dir == UP)
+ full_beams.reverse ();
}
- if (gh_number_p (gap))
+ int k = 0;
+ for (int j = full_beams.size (); j--;)
{
- Real g = gh_scm2double (gap);
- stem_offset += g;
- width_corr -= 2*g;
- }
+ Stencil b (whole);
- Molecule whole = Lookup::beam (dydx, w + width_corr, thick);
- for (int j = fullbeams.size(); j--;)
- {
- Molecule b (whole);
+ if (k++ < gap_count)
+ {
+ b = gapped;
+ b.translate_axis (gap_length, X_AXIS);
+ }
b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS);
- b.translate_axis (dydx * (last_xposn - x0) + bdy * fullbeams[j], Y_AXIS);
- the_beam.add_molecule (b);
+ b.translate_axis (dydx * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS);
+
+ the_beam.add_stencil (b);
}
+
+
if (lfliebertjes.size() || rfliebertjes.size())
{
Real nw_f;
Real w = (i>0 && st) ? (xposn - last_xposn) : break_overshoot;
w = w/2 <? nw_f;
- Molecule half = Lookup::beam (dydx, w, thick);
+ 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);
}
}
last_xposn = xposn;
- last_width = stem_width;
+ last_stem_width = stem_width;
last_beaming = this_beaming;
}
the_beam.translate_axis (pos[LEFT], Y_AXIS);
#if (DEBUG_QUANTING)
+ SCM quant_score = me->get_grob_property ("quant-score");
+ if (debug_beam_quanting_flag
+ && gh_string_p (quant_score))
{
+
/*
This code prints the demerits for each beam. Perhaps this
should be switchable for those who want to twiddle with the
parameters.
*/
String str;
- if (1)
- {
- str += to_string (gh_scm2int (me->get_grob_property ("best-idx")));
- str += ":";
- }
- str += to_string (gh_scm2double (me->get_grob_property ("quant-score")),
- "%.2f");
-
SCM properties = Font_interface::font_alist_chain (me);
- Molecule tm = Text_item::interpret_new_markup
- (me->self_scm(), properties, scm_makfrom0str (str.to_str0 ()));
+ 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);
}
#endif
for (int i=0; i <stems.size (); i++)
do {
Grob *s = stems[i];
- Direction sd = Directional_element_interface::get (s);
+ Direction sd = get_grob_direction (s);
int center_distance = int(- d * Stem::head_positions (s) [-d]) >? 0;
int current = sd ? (1 + d * sd)/2 : center_distance;
SCM forcedir = s->get_grob_property ("direction");
if (!to_dir (forcedir))
- Directional_element_interface::set (s, d);
+ set_grob_direction (s, d);
}
}
s.intersect (allowed_regions_[i]);
- if (!s.empty_b ())
+ if (!s.is_empty ())
{
Interval before = allowed_regions_[i];
Interval after = allowed_regions_[i];
before[RIGHT] = s[LEFT];
after[LEFT] = s[RIGHT];
- if (!before.empty_b() && before.length () > 0.0)
+ if (!before.is_empty () && before.length () > 0.0)
{
allowed_regions_.insert (before, i);
i++;
}
allowed_regions_.del (i);
- if (!after.empty_b () && after.length () > 0.0)
+ if (!after.is_empty () && after.length () > 0.0)
{
allowed_regions_.insert (after, i);
i++;
continue;
Interval hps = Stem::head_positions (stem);
- if(!hps.empty_b())
+ if(!hps.is_empty ())
{
hps[LEFT] += -1;
hps[RIGHT] += 1;
stem->set_grob_property ("direction", scm_int2num (d));
hps.intersect (max_gap);
- assert (hps.empty_b () || hps.length () < 1e-6 );
+ assert (hps.is_empty () || hps.length () < 1e-6 );
}
}
}
Beam::after_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
+
+ position_beam (me);
+ return SCM_UNSPECIFIED;
+}
+
+void
+Beam::position_beam (Grob *me)
+{
+ if (to_boolean (me->get_grob_property ("positioning-done")))
+ return ;
+
+ me->set_grob_property ("positioning-done", SCM_BOOL_T);
+
/* Copy to mutable list. */
SCM s = ly_deep_copy (me->get_grob_property ("positions"));
me->set_grob_property ("positions", s);
if (ly_car (s) == SCM_BOOL_F)
{
-
// one wonders if such genericity is necessary --hwn.
SCM callbacks = me->get_grob_property ("position-callbacks");
for (SCM i = callbacks; gh_pair_p (i); i = ly_cdr (i))
- gh_call1 (ly_car (i), smob);
+ gh_call1 (ly_car (i), me->self_scm ());
}
set_stem_lengths (me);
- return SCM_UNSPECIFIED;
}
{
/* FIXME. -> UP */
Direction d = (Direction) (sign (chord.delta ()) * UP);
- pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2;
+ pos[d] = get_thickness (me) / 2;
pos[-d] = - pos[d];
}
else
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;
feasible_left_point.intersect (flp);
}
- if (feasible_left_point.empty_b())
+ if (feasible_left_point.is_empty ())
{
warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found)."));
}
- else if (!feasible_left_point.elem_b(y))
+ else if (!feasible_left_point.contains (y))
{
if (isinf (feasible_left_point[DOWN]))
y = feasible_left_point[UP] - REGION_SIZE;
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
* dy
: 0) + pos[LEFT];
- Direction my_dir = Directional_element_interface::get (s);
+ Direction my_dir = get_grob_direction (s);
SCM beaming = s->get_grob_property ("beaming");
Real stem_y = stem_y_beam0;
if (french)
{
Slice bm = where_are_the_whole_beams (beaming);
- if (!bm.empty_b())
+ if (!bm.is_empty ())
stem_y += beam_translation * bm[-my_dir];
}
else
{
Slice bm = Stem::beam_multiplicity(s);
- if (!bm.empty_b())
+ if (!bm.is_empty ())
stem_y +=bm[my_dir] * beam_translation;
}
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;
- if (gh_number_p (me->get_grob_property ("gap"))
- &&gh_scm2double (me->get_grob_property ("gap")))
+ if (gh_number_p (me->get_grob_property ("gap-count"))
+ &&gh_scm2int (me->get_grob_property ("gap-count")))
{
gap = true;
thick = get_thickness(me);
for normal beams, but for tremolo beams it looks silly otherwise.
*/
if (gap)
- stem_y += thick * 0.5 * Directional_element_interface::get(s);
+ stem_y += thick * 0.5 * get_grob_direction (s);
Stem::set_stemend (s, 2* stem_y / staff_space);
}
{
Grob *rest = unsmob_grob (element_smob);
Axis a = (Axis) gh_scm2int (axis);
+
+ if (gh_number_p (rest->get_grob_property ("staff-position")))
+ return gh_int2scm (0);
assert (a == Y_AXIS);
|| !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);
+
+ scale_drul (&pos, staff_space);
+
- Real dy = pos.delta ();
+ 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 beam_y = stem_y - d * height_of_my_beams;
- Real staff_space = Staff_symbol_referencer::staff_space (rest);
+ Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
- /* 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;
+ Real rest_dim = rest->extent (common_y, Y_AXIS)[d];
+ Real minimum_distance =
+ staff_space * robust_scm2double (rest->get_grob_property ("minimum-distance"), 0.0);
- Real minimum_distance = gh_scm2double
- (rest->get_grob_property ("minimum-beam-collision-distance"));
+ Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d <? 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;
-
- int stafflines = Staff_symbol_referencer::line_count (rest);
+ shift /= staff_space;
+ Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
/* Always move discretely by half spaces */
- Real discrete_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] + discrete_shift) * d
- < stafflines / 2.0
- ||(rest->extent (common_x, Y_AXIS)[-d] + discrete_shift) * -d
- < stafflines / 2.0)
- discrete_shift = ceil (discrete_shift);
+ if ((rest->extent (common_y, Y_AXIS)[d] + staff_space * shift) * d
+ < rad
+ || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d
+ < rad)
+ shift = ceil (fabs (shift)) *sign (shift);
- return gh_double2scm (-d * discrete_shift);
+ return gh_double2scm (staff_space * shift);
}
bool
int d = 0;
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
- Direction dir = Directional_element_interface::get
- (unsmob_grob (ly_car (s)));
+ Direction dir = get_grob_direction (unsmob_grob (ly_car (s)));
if (d && d != dir)
{
knee = true;
"the ideal slope, how close the result is to the ideal stems, etc.). We "
"take the best scoring combination. "
,
- "knee position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
+ "knee positioning-done position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap gap-count chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
projects / lilypond.git / blobdiff