* Rewrite stem_beams.
* Use Number_pair i.s.o Interval to represent (yl, yr).
+
*/
#include "item.hh"
#include "spanner.hh"
#include "warn.hh"
+
+
+#define DEBUG_QUANTING 0
+
+
+#if DEBUG_QUANTING
#include "text-item.hh" // debug output.
#include "font-interface.hh" // debug output.
+#endif
-#define DEBUG_QUANTING 0
+const int INTER_QUANT_PENALTY = 1000;
+const int SECONDARY_BEAM_DEMERIT = 15;
+const int STEM_LENGTH_DEMERIT_FACTOR = 5;
+// possibly ridiculous, but too short stems just won't do
+const int STEM_LENGTH_LIMIT_PENALTY = 5000;
+const int DAMPING_DIRECTIION_PENALTY = 800;
+const int MUSICAL_DIRECTION_FACTOR = 400;
+const int IDEAL_SLOPE_FACTOR = 10;
+const int REGION_SIZE = 2;
static Real
add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (s));
}
-
-/*
- TODO: fix this for grace notes.
- */
Real
Beam::get_interbeam (Grob *me)
{
- Real slt = me->paper_l ()->get_var ("linethickness");
- Real ss = Staff_symbol_referencer::staff_space (me);
- Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
- * ss;
-
- int multiplicity = get_multiplicity (me);
- Real interbeam = multiplicity < 4
- ? (2*ss + slt - thickness) / 2.0
- : (3*ss + slt - thickness) / 3.0;
-
- return interbeam;
+ SCM func = me->get_grob_property ("space-function");
+ SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_multiplicity (me)));
+ return gh_scm2double (s);
}
+/*
+ Maximum multiplicity.
+ */
int
Beam::get_multiplicity (Grob *me)
{
return m;
}
+MAKE_SCHEME_CALLBACK (Beam, space_function, 2);
+SCM
+Beam::space_function (SCM smob, SCM multiplicity)
+{
+ Grob *me = unsmob_grob (smob);
+
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ Real line = me->paper_l ()->get_var ("linethickness");
+ Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
+ * staff_space;
+
+ Real interbeam = gh_scm2int (multiplicity) < 4
+ ? (2*staff_space + line - thickness) / 2.0
+ : (3*staff_space + line - thickness) / 3.0;
+
+ return gh_double2scm (interbeam);
+}
+
+
/* After pre-processing all directions should be set.
Several post-processing routines (stem, slur, script) need stem/beam
direction.
}
if (count >= 1)
{
- if (!Directional_element_interface::get (me))
- Directional_element_interface::set (me, get_default_dir (me));
-
- consider_auto_knees (me);
- set_stem_directions (me);
+ Direction d = get_default_dir (me);
+
+ consider_auto_knees (me, d);
+ set_stem_directions (me, d);
set_stem_shorten (me);
}
+
return SCM_EOL;
}
do {
Grob *s = stems[i];
Direction sd = Directional_element_interface::get (s);
- int current = sd ? (1 + d * sd)/2
- : Stem::get_center_distance (s, (Direction)-d);
+
+ int center_distance = int(- d * Stem::head_positions (s) [-d]) >? 0;
+ int current = sd ? (1 + d * sd)/2 : center_distance;
if (current)
{
Urg: non-forced should become `without/with unforced' direction,
once stem gets cleaned-up. */
void
-Beam::set_stem_directions (Grob *me)
+Beam::set_stem_directions (Grob *me, Direction d)
{
Link_array<Item> stems
=Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems");
- Direction d = Directional_element_interface::get (me);
for (int i=0; i <stems.size (); i++)
{
`Forced' stem directions are ignored. If you don't want auto-knees,
don't set, or unset auto-knee-gap. */
void
-Beam::consider_auto_knees (Grob *me)
+Beam::consider_auto_knees (Grob *me, Direction d)
{
SCM scm = me->get_grob_property ("auto-knee-gap");
Real staff_space = Staff_symbol_referencer::staff_space (me);
Real gap = gh_scm2double (scm) / staff_space;
- Direction d = Directional_element_interface::get (me);
+
Link_array<Item> stems=
Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
/* your similar cute comment here */
shorten_f *= forced_fraction;
-
- me->set_grob_property ("shorten", gh_double2scm (shorten_f));
+
+ if (shorten_f)
+ me->set_grob_property ("shorten", gh_double2scm (shorten_f));
}
/* Call list of y-dy-callbacks, that handle setting of
- grob-properties y, dy.
-
- User may set grob-properties: y-position-hs and height-hs
- (to be fixed) that override the calculated y and dy.
-
- Because y and dy cannot be calculated and quanted separately, we
- always calculate both, then check for user override. */
+ grob-properties
+
+*/
MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1);
SCM
Beam::after_line_breaking (SCM smob)
if (ly_car (s) != SCM_BOOL_F)
return SCM_UNSPECIFIED;
+ // 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);
+ set_stem_lengths (me);
return SCM_UNSPECIFIED;
}
*/
- const int REGION_SIZE = 3;
- for (int i = -REGION_SIZE ; i < REGION_SIZE; i++)
+
+
+ /*
+ Do stem computations. These depend on YL and YR linearly, so we can
+ precompute for every stem 2 factors.
+ */
+ Link_array<Grob> stems=
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ Array<Stem_info> stem_infos;
+ Array<Real> lbase_lengths;
+ Array<Real> rbase_lengths;
+
+ Drul_array<bool> dirs_found(0,0);
+ for (int i= 0; i < stems.size(); i++)
+ {
+ Grob*s = stems[i];
+ stem_infos.push (Stem::calc_stem_info (s));
+ dirs_found[stem_infos.top ().dir_] = true;
+
+ Real b = calc_stem_y (me, s, Interval (1,0), false);
+ lbase_lengths.push (b);
+
+ Real a = calc_stem_y (me, s, Interval (0,1), false);
+ rbase_lengths.push (a);
+ }
+
+ Direction ldir = Direction (stem_infos[0].dir_);
+ Direction rdir = Direction (stem_infos.top ().dir_);
+ bool knee_b = dirs_found[LEFT] && dirs_found[RIGHT];
+
+
+ int region_size = REGION_SIZE;
+ /*
+ Knees are harder, lets try some more possibilities for knees.
+ */
+ if (knee_b)
+ region_size += 2;
+
+ for (int i = -region_size ; i < region_size; i++)
for (int j = 0; j < num_quants; j++)
{
quantsl.push (i + quants[j] + int (yl));
qscores[i].demerits
+= score_forbidden_quants (me, qscores[i].yl, qscores[i].yr,
rad, slt, thickness, interbeam,
- multiplicity);
+ multiplicity, ldir, rdir);
}
- /*
- Do stem lengths. These depend on YL and YR linearly, so we can
- precompute for every stem 2 factors.
- */
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- Array<Stem_info> stem_infos;
- Array<Real> lbase_lengths;
- Array<Real> rbase_lengths;
-
- Array<int> directions;
- for (int i= 0; i < stems.size(); i++)
- {
- Grob*s = stems[i];
- stem_infos.push( Stem::calc_stem_info (s));
-
- Real b = calc_stem_y (me, s, Interval (1,0));
- lbase_lengths.push (b);
-
- b = calc_stem_y (me, s, Interval (0,1));
- rbase_lengths.push (b);
- directions.push( Directional_element_interface::get( s));
- }
-
for (int i = qscores.size (); i--;)
if (qscores[i].demerits < 100)
{
qscores[i].demerits
+= score_stem_lengths (stems, stem_infos,
lbase_lengths, rbase_lengths,
- directions,
+ knee_b,
me, qscores[i].yl, qscores[i].yr);
}
gh_double2scm (qscores[best_idx].yr))
);
- if (DEBUG_QUANTING)
- {
- // debug quanting
- me->set_grob_property ("quant-score",
- gh_double2scm (qscores[best_idx].demerits));
- me->set_grob_property ("best-idx", gh_int2scm (best_idx));
- }
+#if DEBUG_QUANTING
+
+ // debug quanting
+ me->set_grob_property ("quant-score",
+ gh_double2scm (qscores[best_idx].demerits));
+ me->set_grob_property ("best-idx", gh_int2scm (best_idx));
+#endif
return SCM_UNSPECIFIED;
}
Array<Stem_info> stem_infos,
Array<Real> left_factor,
Array<Real> right_factor,
- Array<int> directions,
- Grob*me, Real yl, Real yr)
+ bool knee,
+ Grob*me,
+ Real yl, Real yr)
{
Real demerit_score = 0.0 ;
+ Real pen = STEM_LENGTH_LIMIT_PENALTY;
for (int i=0; i < stems.size (); i++)
{
yl * left_factor[i] + right_factor[i]* yr;
Stem_info info = stem_infos[i];
- Direction d = Direction (directions[i]);
-
- demerit_score += 500 * ( 0 >? (info.min_y - d * current_y));
- demerit_score += 500 * ( 0 >? (d * current_y - info.max_y));
+ Direction d = info.dir_;
- demerit_score += 5 * shrink_extra_weight (d * current_y - info.ideal_y);
+ demerit_score += pen
+ * ( 0 >? (info.dir_ * (info.shortest_y_ - current_y)));
+
+ demerit_score += STEM_LENGTH_DEMERIT_FACTOR
+ * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_);
}
- demerit_score *= 2.0 /stems.size ();
+ demerit_score *= 2.0 / stems.size ();
return demerit_score;
}
Real
-Beam::score_slopes_dy (Grob *me, Real yl, Real yr,
+Beam::score_slopes_dy (Grob *me,
+ Real yl, Real yr,
Real dy_mus, Real dy_damp)
{
Real dy = yr - yl;
Real dem = 0.0;
if (sign (dy_damp) != sign (dy))
{
- dem += 800;
+ dem += DAMPING_DIRECTIION_PENALTY;
}
-
- dem += 400* (0 >? (fabs (dy) - fabs (dy_mus)));
-
- dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* 10;
+ dem += MUSICAL_DIRECTION_FACTOR * (0 >? (fabs (dy) - fabs (dy_mus)));
+ dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* IDEAL_SLOPE_FACTOR;
+
return dem;
}
Real rad,
Real slt,
Real thickness, Real interbeam,
- int multiplicity)
+ int multiplicity,
+ Direction ldir, Direction rdir)
{
Real dy = yr - yl;
Real dem = 0.0;
if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3)
- dem += 1000;
+ dem += INTER_QUANT_PENALTY;
if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3)
- dem += 1000;
+ dem += INTER_QUANT_PENALTY;
// todo: use multiplicity of outer stems.
if (multiplicity >= 2)
Real inter = 0.5;
Real hang = 1.0 - (thickness - slt) / 2;
- Direction dir = Directional_element_interface::get (me);
- if (fabs (yl - dir * interbeam) < rad
+
+ if (fabs (yl - ldir * interbeam) < rad
&& fabs (my_modf (yl) - inter) < 1e-3)
- dem += 15;
- if (fabs (yr - dir * interbeam) < rad
+ dem += SECONDARY_BEAM_DEMERIT;
+ if (fabs (yr - rdir * interbeam) < rad
&& fabs (my_modf (yr) - inter) < 1e-3)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
Real eps = 1e-3;
--hwn
*/
-
+
+
// hmm, without Interval/Drul_array, you get ~ 4x same code...
- if (fabs (yl - dir * interbeam) < rad + inter)
+ if (fabs (yl - ldir * interbeam) < rad + inter)
{
- if (dir == UP && dy <= eps
+ if (ldir == UP && dy <= eps
&& fabs (my_modf (yl) - sit) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy >= eps
+ if (ldir == DOWN && dy >= eps
&& fabs (my_modf (yl) - hang) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
}
- if (fabs (yr - dir * interbeam) < rad + inter)
+ if (fabs (yr - rdir * interbeam) < rad + inter)
{
- if (dir == UP && dy >= eps
+ if (rdir == UP && dy >= eps
&& fabs (my_modf (yr) - sit) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy <= eps
+ if (rdir == DOWN && dy <= eps
&& fabs (my_modf (yr) - hang) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
}
if (multiplicity >= 3)
{
- if (fabs (yl - 2 * dir * interbeam) < rad + inter)
+ if (fabs (yl - 2 * ldir * interbeam) < rad + inter)
{
- if (dir == UP && dy <= eps
+ if (ldir == UP && dy <= eps
&& fabs (my_modf (yl) - straddle) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy >= eps
+ if (ldir == DOWN && dy >= eps
&& fabs (my_modf (yl) - straddle) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
}
- if (fabs (yr - 2 * dir * interbeam) < rad + inter)
+ if (fabs (yr - 2 * rdir * interbeam) < rad + inter)
{
- if (dir == UP && dy >= eps
+ if (rdir == UP && dy >= eps
&& fabs (my_modf (yr) - straddle) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy <= eps
+ if (rdir == DOWN && dy <= eps
&& fabs (my_modf (yr) - straddle) < eps)
- dem += 15;
+ dem += SECONDARY_BEAM_DEMERIT;
}
}
}
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
}
-
- Direction dir = Directional_element_interface::get (me);
- Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y,
- Stem::calc_stem_info (last_visible_stem (me)).ideal_y);
+ Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y_,
+ Stem::calc_stem_info (last_visible_stem (me)).ideal_y_);
+
+
+
+ Array<Real> x_posns ;
+ Link_array<Item> stems=
+ Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
+ Grob *common = stems[0];
+ for (int i=1; i < stems.size (); i++)
+ common = stems[i]->common_refpoint (common, X_AXIS);
+
+ Real x0 = first_visible_stem (me)->relative_coordinate (common, X_AXIS);
+ for (int i=0; i < stems.size (); i++)
+ {
+ Item* s = stems[i];
+
+ Real x = s->relative_coordinate (common, X_AXIS) - x0;
+ x_posns.push (x);
+ }
+ Real dx = last_visible_stem (me)->relative_coordinate (common, X_AXIS) - x0;
+
+ Real y =0;
+ Real dydx = 0;
+ Real dy = 0;
if (!ideal.delta ())
{
- Interval chord (Stem::chord_start_f (first_visible_stem (me)),
- Stem::chord_start_f (last_visible_stem (me)));
+ Interval chord (Stem::chord_start_y (first_visible_stem (me)),
+ Stem::chord_start_y (last_visible_stem (me)));
/*
- TODO : use scoring for this.
+ TODO -- use scoring for this.
complicated, because we take stem-info.ideal for determining
beam slopes.
-
*/
/* Make simple beam on middle line have small tilt */
if (!ideal[LEFT] && chord.delta () && count == 2)
{
- Direction d = (Direction) (sign (chord.delta ()) * dir);
- pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2
- * dir;
+
+ /*
+ FIXME. -> UP
+ */
+ Direction d = (Direction) (sign (chord.delta ()) * UP);
+ pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2;
+ // * dir;
pos[-d] = - pos[d];
}
else
{
pos = ideal;
- pos[LEFT] *= dir ;
- pos[RIGHT] *= dir ;
}
+
+ y = pos[LEFT];
+ dy = pos[RIGHT]- y;
+ dydx = dy/dx;
}
else
{
Array<Offset> ideals;
-
- // ugh -> use commonx
- Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS);
- Link_array<Item> stems=
- Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
-
for (int i=0; i < stems.size (); i++)
{
Item* s = stems[i];
if (Stem::invisible_b (s))
continue;
- ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0,
- Stem::calc_stem_info (s).ideal_y));
+ ideals.push (Offset (x_posns[i],
+ Stem::calc_stem_info (s).ideal_y_));
}
- Real y;
- Real dydx;
minimise_least_squares (&dydx, &y, ideals);
- Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0;
- Real dy = dydx * dx;
- me->set_grob_property ("least-squares-dy", gh_double2scm (dy * dir));
+ dy = dydx * dx;
+ me->set_grob_property ("least-squares-dy", gh_double2scm (dy));
+ pos = Interval (y, (y+dy));
+ }
+
+ me->set_grob_property ("positions", ly_interval2scm (pos));
+
+ return SCM_UNSPECIFIED;
+}
+
- pos = Interval (y*dir, (y+dy) * dir);
+/*
+ We can't combine with previous function, since check concave and
+ slope damping comes first.
+ */
+MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1);
+SCM
+Beam::shift_region_to_valid (SCM grob)
+{
+ Grob *me = unsmob_grob (grob);
+ /*
+ Code dup.
+ */
+ Array<Real> x_posns ;
+ Link_array<Item> stems=
+ Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
+ Grob *common = stems[0];
+ for (int i=1; i < stems.size (); i++)
+ common = stems[i]->common_refpoint (common, X_AXIS);
+
+ Grob *fvs = first_visible_stem (me);
+
+ if (!fvs)
+ return SCM_UNSPECIFIED;
+
+ Real x0 =fvs->relative_coordinate (common, X_AXIS);
+ for (int i=0; i < stems.size (); i++)
+ {
+ Item* s = stems[i];
+
+ Real x = s->relative_coordinate (common, X_AXIS) - x0;
+ x_posns.push (x);
}
+ Grob *lvs = last_visible_stem (me);
+ if (!lvs)
+ return SCM_UNSPECIFIED;
+
+ Real dx = lvs->relative_coordinate (common, X_AXIS) - x0;
+
+ Interval pos = ly_scm2interval ( me->get_grob_property ("positions"));
+ Real dy = pos.delta();
+ Real y = pos[LEFT];
+ Real dydx =dy/dx;
+
+
+ /*
+ Shift the positions so that we have a chance of finding good
+ quants (i.e. no short stem failures.)
+ */
+ Interval feasible_left_point;
+ feasible_left_point.set_full ();
+ for (int i=0; i < stems.size (); i++)
+ {
+ Item* s = stems[i];
+ if (Stem::invisible_b (s))
+ continue;
+
+
+ Direction d = Stem::get_direction (s);
+
+
+ Real left_y = Stem::calc_stem_info (s).shortest_y_
+ - dydx * x_posns [i];
+
+ Interval flp ;
+ flp.set_full ();
+ flp[-d] = left_y;
+
+ feasible_left_point.intersect (flp);
+ }
+
+ if (feasible_left_point.empty_b())
+ {
+ warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found)."));
+ }
+ else if (!feasible_left_point.elem_b(y))
+ {
+ if (isinf (feasible_left_point[DOWN]))
+ y = feasible_left_point[UP] - REGION_SIZE;
+ else if (isinf (feasible_left_point[UP]))
+ y = feasible_left_point[DOWN]+ REGION_SIZE;
+ else
+ y = feasible_left_point.center ();
+ }
+ pos = Interval (y, (y+dy));
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
}
+
MAKE_SCHEME_CALLBACK (Beam, check_concave, 1);
SCM
Beam::check_concave (SCM smob)
if (stems.size () < 3)
return SCM_UNSPECIFIED;
- Direction dir = Directional_element_interface::get (me);
+
/* Concaveness #1: If distance of an inner notehead to line between
two outer noteheads is bigger than CONCAVENESS-GAP (2.0ss),
- beam is concave (Heinz Stolba). */
+ beam is concave (Heinz Stolba).
+
+ In the case of knees, the line connecting outer heads is often
+ not related to the beam slope (it may even go in the other
+ direction). Skip the check when the outer stems point in
+ different directions. --hwn
+
+ */
bool concaveness1 = false;
- Real r1 = gh_scm2double (me->get_grob_property ("concaveness-gap"));
- if (r1 > 0)
+ SCM gap = me->get_grob_property ("concaveness-gap");
+ if (gh_number_p (gap)
+ && Stem::get_direction(stems.top ())
+ == Stem::get_direction(stems[0]))
{
- Real dy = Stem::chord_start_f (stems.top ())
- - Stem::chord_start_f (stems[0]);
+ Real r1 = gh_scm2double (gap);
+ Real dy = Stem::chord_start_y (stems.top ())
+ - Stem::chord_start_y (stems[0]);
+
+
Real slope = dy / (stems.size () - 1);
- Real y0 = Stem::chord_start_f (stems[0]);
+ Real y0 = Stem::chord_start_y (stems[0]);
for (int i = 1; i < stems.size () - 1; i++)
{
- Real c = (Stem::chord_start_f (stems[i]) - y0) - i * slope;
+ Real c = (Stem::chord_start_y (stems[i]) - y0) - i * slope;
if (c > r1)
{
concaveness1 = true;
/* Concaveness #2: Sum distances of inner noteheads that fall
- outside the interval of the two outer noteheads */
+ outside the interval of the two outer noteheads.
+
+ We only do this for beams where first and last stem have the same
+ direction. --hwn.
+
+
+ Note that "convex" stems compensate for "concave" stems.
+ (is that intentional?) --hwn.
+ */
+
Real concaveness2 = 0;
- Real r2 = gh_scm2double (me->get_grob_property ("concaveness-threshold"));
- if (!concaveness1 && r2 > 0)
+ SCM thresh = me->get_grob_property ("concaveness-threshold");
+ Real r2 = infinity_f;
+ if (!concaveness1 && gh_number_p (thresh)
+ && Stem::get_direction(stems.top ())
+ == Stem::get_direction(stems[0]))
{
+ r2 = gh_scm2double (thresh);
+
+ Direction dir = Stem::get_direction(stems.top ());
Real concave = 0;
- Interval iv (Stem::chord_start_f (stems[0]),
- Stem::chord_start_f (stems.top ()));
+ Interval iv (Stem::chord_start_y (stems[0]),
+ Stem::chord_start_y (stems.top ()));
if (iv[MAX] < iv[MIN])
iv.swap ();
for (int i = 1; i < stems.size () - 1; i++)
{
- Real c = 0;
- Real f = Stem::chord_start_f (stems[i]);
- if ((c = f - iv[MAX]) > 0)
- concave += c;
- else if ((c = f - iv[MIN]) < 0)
- concave += c;
+ Real f = Stem::chord_start_y (stems[i]);
+ concave += ((f - iv[MAX] ) >? 0) +
+ ((f - iv[MIN] ) <? 0);
}
-
concave *= dir;
-
concaveness2 = concave / (stems.size () - 2);
- /* ugh: this is the a kludge to get input/regression/beam-concave.ly
- to behave as baerenreiter. */
+
+ /* ugh: this is the a kludge to get
+ input/regression/beam-concave.ly to behave as
+ baerenreiter. */
+
+ /*
+ huh? we're dividing twice (which is not scalable) meaning that
+ the longer the beam, the more unlikely it will be
+ concave. Maybe you would even expect the other way around??
+
+ --hwn.
+
+ */
concaveness2 /= (stems.size () - 2);
}
me->set_grob_property ("positions", ly_interval2scm (pos));
}
- return SCM_UNSPECIFIED;
-}
-
-MAKE_SCHEME_CALLBACK (Beam, end_after_line_breaking, 1);
-SCM
-Beam::end_after_line_breaking (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
- set_stem_lengths (me);
-
return SCM_UNSPECIFIED;
}
/*
Calculate the Y position of the stem-end, given the Y-left, Y-right
in POS, and for stem S.
+
+ If CORRECT, correct for multiplicity of beam in case of knees.
+
+
+ TODO: junk CORRECT from this.
*/
Real
-Beam::calc_stem_y (Grob *me, Grob* s, Interval pos)
+Beam::calc_stem_y (Grob *me, Grob* s, Interval pos, bool correct)
{
int beam_multiplicity = get_multiplicity (me);
- int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0;
+ int stem_multiplicity = (Stem::duration_log (s) - 2) >? 0;
+
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
Real interbeam = get_interbeam (me);
// ugh -> use commonx
- Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS);
- Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0;
+ Grob * fvs = first_visible_stem (me);
+ Grob *lvs = last_visible_stem (me);
+
+ Real x0 = fvs ? fvs->relative_coordinate (0, X_AXIS) : 0.0;
+ Real dx = fvs ? lvs->relative_coordinate (0, X_AXIS) - x0 : 0.0;
+ Real r = s->relative_coordinate (0, X_AXIS) - x0;
Real dy = pos.delta ();
Real stem_y = (dy && dx
- ? (s->relative_coordinate (0, X_AXIS) - x0) / dx
+ ? r / dx
* dy
: 0) + pos[LEFT];
- /* knee */
- Direction dir = Directional_element_interface::get (me);
- Direction sdir = Directional_element_interface::get (s);
-
- /* knee */
- if (dir!= sdir)
+ Direction my_dir = Directional_element_interface::get (s);
+ Direction first_dir = fvs? Directional_element_interface::get (fvs) : my_dir;
+
+ if (correct && my_dir != first_dir)
{
- stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam);
+ /*
+ WTF is happening here ?
+
+ It looks as if this is some kind of fixup for multiple kneed
+ beams to get a piece of stem at the #.
+
+
+ x
+ |
+ =======|
+ |======#
+ |
+ |
+ x
+
+ Rules for this kind of stuff are hairy. In any event, the
+ current stem should look at the multiplicity of its
+ predecessor.
+
+ --hwn.
+
+ */
+
+ // FIXME, hairy stuff
+ stem_y += my_dir * (thick / 2 + (beam_multiplicity - 1) * interbeam);
// huh, why not for first visible?
+ /*
+ What the heck is happening here??
+ */
Grob *last_visible = last_visible_stem (me);
if (last_visible)
{
else
programming_error ("No last visible stem");
}
-
return stem_y;
}
if (!Stem::invisible_b (stems[i]))
common = common->common_refpoint (stems[i], Y_AXIS);
- Direction dir = Directional_element_interface::get (me);
Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+ /*
+ DOCUMENT THIS.
+ */
+#if 0
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
+ Direction dir = Directional_element_interface::get (me);
bool ps_testing = to_boolean (ly_symbol2scm ("ps-testing"));
+#endif
+
for (int i=0; i < stems.size (); i++)
{
Item* s = stems[i];
if (Stem::invisible_b (s))
continue;
- Real stem_y = calc_stem_y (me, s, pos);
+ Real stem_y = calc_stem_y (me, s, pos, true);
+#if 0
// doesn't play well with dvips
if (ps_testing)
if (Stem::get_direction (s) == dir)
stem_y += Stem::get_direction (s) * thick / 2;
+#endif
/* caution: stem measures in staff-positions */
Real id = me->relative_coordinate (common, Y_AXIS)
/*
beams to go with one stem.
- FIXME: clean me up.
+ FIXME: clean me up:
+
+ The beam should be constructed by one function that knows where the
+ X and Y points are, and only inspects the stems to obtain
+ multiplicity and stem directions.
+
*/
Molecule
Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx)
Real nw_f;
if (!Stem::first_head (here))
nw_f = 0;
- else {
- int t = Stem::type_i (here);
-
- SCM proc = me->get_grob_property ("flag-width-function");
- SCM result = gh_call1 (proc, gh_int2scm (t));
- nw_f = gh_scm2double (result);
- }
+ else
+ {
+ int t = Stem::duration_log (here);
+ SCM proc = me->get_grob_property ("flag-width-function");
+ SCM result = gh_call1 (proc, gh_int2scm (t));
+ nw_f = gh_scm2double (result);
+ }
- Direction dir = Directional_element_interface::get (me);
/* [Tremolo] beams on whole notes may not have direction set? */
- if (dir == CENTER)
- dir = Directional_element_interface::get (here);
-
+ Direction dir = Directional_element_interface::get (here);
/* half beams extending to the left. */
if (prev)
}
leftbeams.add_molecule (rightbeams);
- /* Does beam quanting think of the asymetry of beams?
- Refpoint is on bottom of symbol. (FIXTHAT) --hwn. */
return leftbeams;
}
dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0;
}
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
+ SCM posns = me->get_grob_property ("positions");
+ Interval pos;
+ if (!ly_number_pair_p (posns))
+ {
+ programming_error ("No beam posns");
+ pos = Interval (0,0);
+ }
+ else
+ pos= ly_scm2interval (posns);
Real dy = pos.delta ();
Real dydx = dy && dx ? dy/dx : 0;
+
for (int i=0; i < stems.size (); i++)
{
Item *item = stems[i];
Item *prev = (i > 0)? stems[i-1] : 0;
Item *next = (i < stems.size ()-1) ? stems[i+1] :0;
+
+
Molecule sb = stem_beams (me, item, next, prev, dydx);
Real x = item->relative_coordinate (0, X_AXIS) - x0;
sb.translate (Offset (x, x * dydx + pos[LEFT]));
+
+
mol.add_molecule (sb);
}
->get_bound (LEFT)->relative_coordinate (0, X_AXIS),
X_AXIS);
- if (DEBUG_QUANTING)
+#if (DEBUG_QUANTING)
{
/*
This code prints the demerits for each beam. Perhaps this
"%.2f");
SCM properties = Font_interface::font_alist_chain (me);
-
- Molecule tm = Text_item::text2molecule (me, gh_str02scm (str.ch_C ()), properties);
+
+
+ Molecule tm = Text_item::text2molecule (me, ly_str02scm (str.ch_C ()), properties);
mol.add_at_edge (Y_AXIS, UP, tm, 5.0);
}
-
+#endif
+
return mol.smobbed_copy ();
}
if (Stem::invisible_b (s))
continue;
- if (((int)Stem::chord_start_f (s))
+ if (((int)Stem::chord_start_y (s))
&& (Stem::get_direction (s) != Stem::get_default_dir (s)))
f++;
}
}
-bool
-Beam::has_interface (Grob *me)
-{
- return me->has_interface (ly_symbol2scm ("beam-interface"));
-}
ADD_INTERFACE (Beam, "beam-interface",
take the best scoring combination.
",
- "concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy direction damping flag-width-function neutral-direction positions thickness");
+ "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");
+
projects / lilypond.git / blobdiff