/*
beam.cc -- implement Beam
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
-
+
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
+
*/
/*
[TODO]
- * different left/right quanting: slope, multiplicity
-
* Fix TODO
* Junk stem_info.
It may only set directions for stems.
* Rewrite stem_beams.
-
+
+ * Use Number_pair i.s.o Interval to represent (yl, yr).
+
*/
#include "font-interface.hh" // debug output.
+#define DEBUG_QUANTING 0
-Real
-shrink_extra_weight(Real x)
+
+static Real
+shrink_extra_weight (Real x)
{
- return fabs(x) * ((x < 0) ? 1.5 : 1.0);
+ return fabs (x) * ((x < 0) ? 1.5 : 1.0);
}
-
void
Beam::add_stem (Grob *me, Grob *s)
{
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 ("stafflinethickness");
+ 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;
+}
+
int
Beam::get_multiplicity (Grob *me)
{
}
/* Set stem's shorten property if unset.
- TODO:
+
+ TODO:
take some y-position (chord/beam/nearest?) into account
- scmify forced-fraction */
+ scmify forced-fraction
+
+ TODO:
+
+ why is shorten stored in beam, and not directly in stem?
+
+*/
void
Beam::set_stem_shorten (Grob *m)
{
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.
+ (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. */
};
-MAKE_SCHEME_CALLBACK (Beam, new_quanting, 1);
+/*
+ TODO:
+
+ - Make all demerits customisable
+
+ - One sensible check per demerit (what's this --hwn)
+
+ - Add demerits for quants per se, as to forbid a specific quant
+ entirely
+
+*/
+MAKE_SCHEME_CALLBACK (Beam, quanting, 1);
SCM
-Beam::new_quanting (SCM smob)
+Beam::quanting (SCM smob)
{
Grob *me = unsmob_grob (smob);
SCM s = me->get_grob_property ("positions");
- Real yl = gh_scm2double (gh_car(s));
- Real yr = gh_scm2double (gh_cdr(s));
+ Real yl = gh_scm2double (gh_car (s));
+ Real yr = gh_scm2double (gh_cdr (s));
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- // Staff_symbol_referencer::staff_space (me);
- Real sthick = me->paper_l()->get_var ("stafflinethickness");
- // * Staff_symbol_referencer::staff_space (me);
+ Real ss = Staff_symbol_referencer::staff_space (me);
+ Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss;
+ Real slt = me->paper_l ()->get_var ("stafflinethickness") / ss;
- Real quants [] = {0.0, thick/2 - sthick / 2, 0.5, 1.0 - thick/2 + sthick/2};
- int num_quants = int(sizeof(quants)/sizeof (Real));
+
+ SCM sdy = me->get_grob_property ("least-squares-dy");
+ Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0;
+
+ Real straddle = 0.0;
+ Real sit = (thickness - slt) / 2;
+ Real inter = 0.5;
+ Real hang = 1.0 - (thickness - slt) / 2;
+ Real quants [] = {straddle, sit, inter, hang };
+
+ int num_quants = int (sizeof (quants)/sizeof (Real));
Array<Real> quantsl;
Array<Real> quantsr;
+ /*
+ going to REGION_SIZE == 2, yields another 0.6 second with
+ wtk1-fugue2.
+
+
+ (result indexes between 70 and 575) ? --hwn.
+
+ */
+
const int REGION_SIZE = 3;
-
for (int i = -REGION_SIZE ; i < REGION_SIZE; i++)
for (int j = 0; j < num_quants; j++)
{
Array<Quant_score> qscores;
- for(int l =0; l < quantsl.size(); l++)
- for(int r =0; r < quantsr.size(); r++)
+ for (int l =0; l < quantsl.size (); l++)
+ for (int r =0; r < quantsr.size (); r++)
{
Quant_score qs;
qs.yl = quantsl[l];
}
- SCM score_funcs = me->get_grob_property("quant-score-functions");
- for (SCM s = score_funcs; gh_pair_p (s); s = gh_cdr (s))
+ /*
+ This is a longish function, but we don't separate this out into
+ neat modular separate subfunctions, as the subfunctions would be
+ called for many values of YL, YR. By precomputing various
+ parameters outside of the loop, we can save a lot of time.
+
+ */
+ for (int i = qscores.size (); i--;)
+ if (qscores[i].demerits < 100)
+ {
+ qscores[i].demerits
+ += score_slopes_dy (me, qscores[i].yl, qscores[i].yr,
+ dy_mus, yr- yl);
+ }
+
+ Real rad = Staff_symbol_referencer::staff_radius (me);
+ int multiplicity = get_multiplicity (me);
+ Real interbeam = multiplicity < 4
+ ? (2*ss + slt - thickness) / 2.0
+ : (3*ss + slt - thickness) / 3.0;
+
+ for (int i = qscores.size (); i--;)
+ if (qscores[i].demerits < 100)
+ {
+ qscores[i].demerits
+ += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr,
+ rad, slt, thickness, interbeam,
+ multiplicity);
+ }
+
+
+ /*
+ 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++)
{
- SCM f = gh_car (s);
- for (int i = qscores.size(); i--;)
- {
- if (qscores[i].demerits < 1000)
- {
- SCM score = gh_call3 (f,
- me->self_scm(),
- gh_double2scm (qscores[i].yl),
- gh_double2scm (qscores[i].yr));
-
- qscores[i].demerits += gh_scm2double (score);
- }
- }
+ 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,
+ me, qscores[i].yl, qscores[i].yr);
+ }
+
+
Real best = 1e6;
int best_idx = -1;
- for (int i = qscores.size(); i--;)
+ for (int i = qscores.size (); i--;)
{
if (qscores[i].demerits < best)
{
gh_cons (gh_double2scm (qscores[best_idx].yl),
gh_double2scm (qscores[best_idx].yr))
);
- me->set_grob_property ("quant-score",gh_double2scm (qscores[best_idx].demerits));
-
- return SCM_UNSPECIFIED;
-}
-
-MAKE_SCHEME_CALLBACK (Beam, score_slopes_dy, 3);
-SCM
-Beam::score_slopes_dy (SCM smob, SCM syl, SCM syr)
-{
- Grob*me = unsmob_grob(smob);
- Real yl = gh_scm2double (syl);
- Real yr = gh_scm2double (syr);
- Real dy = yr - yl;
-
- SCM sdy = me->get_grob_property("least-squares-dy");
- SCM posns = me->get_grob_property ("positions");
-
- Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0;
- Real dy_damp = - gh_scm2double (gh_car(posns)) + gh_scm2double (gh_cdr (posns));
- Real dem = 0.0;
- if (sign (dy_damp) != sign (dy))
- {
- dem += 800;
- }
-
- dem += 400* (0 >? (fabs(dy) - fabs(dy_mus)));
-
+ 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));
+ }
- dem += shrink_extra_weight (fabs (dy_damp) - fabs(dy))* 10;
- return gh_double2scm (dem);
+ return SCM_UNSPECIFIED;
}
-MAKE_SCHEME_CALLBACK (Beam, score_stem_lengths, 3);
-SCM
-Beam::score_stem_lengths (SCM smob, SCM syl, SCM syr)
+Real
+Beam::score_stem_lengths (Link_array<Grob>stems,
+ Array<Stem_info> stem_infos,
+ Array<Real> left_factor,
+ Array<Real> right_factor,
+ Array<int> directions,
+ Grob*me, Real yl, Real yr)
{
- Grob*me = unsmob_grob(smob);
- Real yl = gh_scm2double (syl);
- Real yr = gh_scm2double (syr);
-
- Link_array<Item> stems=
- Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
-
Real demerit_score = 0.0 ;
for (int i=0; i < stems.size (); i++)
{
- Item* s = stems[i];
+ Grob* s = stems[i];
if (Stem::invisible_b (s))
continue;
- Real current_y = calc_stem_y_f (me, s, Interval(yl,yr));
- Stem_info info = Stem::calc_stem_info (s);
- Direction d = Directional_element_interface::get (s);
+ Real current_y =
+ yl * left_factor[i] + right_factor[i]* yr;
+
+ Stem_info info = stem_infos[i];
+ Direction d = Direction (directions[i]);
- demerit_score += 500 * ( 0 >? (info.miny_f_ - d*current_y));
- demerit_score += 500 * ( 0 >? (d * current_y - info.maxy_f_));
+ demerit_score += 500 * ( 0 >? (info.min_y - d * current_y));
+ demerit_score += 500 * ( 0 >? (d * current_y - info.max_y));
- demerit_score += 5 * shrink_extra_weight (d * current_y - info.idealy_f_);
+ demerit_score += 5 * shrink_extra_weight (d * current_y - info.ideal_y);
}
- demerit_score *= 2.0 /stems.size();
+ demerit_score *= 2.0 /stems.size ();
- return gh_double2scm (demerit_score);
+ return demerit_score;
}
+
Real
-my_modf(Real x)
+Beam::score_slopes_dy (Grob *me, Real yl, Real yr,
+ Real dy_mus, Real dy_damp)
{
- return x - floor(x);
-}
+ Real dy = yr - yl;
+
+ Real dem = 0.0;
+ if (sign (dy_damp) != sign (dy))
+ {
+ dem += 800;
+ }
+
+ dem += 400* (0 >? (fabs (dy) - fabs (dy_mus)));
+
+ dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* 10;
+ return dem;
+}
+static Real
+my_modf (Real x)
+{
+ return x - floor (x);
+}
-MAKE_SCHEME_CALLBACK (Beam, score_forbidden_quants, 3);
-SCM
-Beam::score_forbidden_quants (SCM smob, SCM syl, SCM syr)
+Real
+Beam::score_forbidden_quants (Grob*me,
+ Real yl, Real yr,
+ Real rad,
+ Real slt,
+ Real thickness, Real interbeam,
+ int multiplicity)
{
- Grob*me = unsmob_grob(smob);
- Real yl = gh_scm2double (syl);
- Real yr = gh_scm2double (syr);
- Real rad = Staff_symbol_referencer::staff_radius (me);
+ Real dy = yr - yl;
+
Real dem = 0.0;
- if (fabs (yl) < 2*rad && fabs( my_modf(yl) - 0.5) < 1e-3)
+ if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3)
dem += 1000;
- if (fabs (yr) < 2*rad && fabs( my_modf(yr) - 0.5) < 1e-3)
+ if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3)
dem += 1000;
-
- int multiplicity = get_multiplicity (me);
// todo: use multiplicity of outer stems.
if (multiplicity >= 2)
{
- Real slt = me->paper_l()->get_var("stafflinethickness");
- Real ss = Staff_symbol_referencer::staff_space(me);
- Real thickness = gh_scm2double (me->get_grob_property ("thickness")) * ss;
+
+ Real straddle = 0.0;
+ Real sit = (thickness - slt) / 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
+ && fabs (my_modf (yl) - inter) < 1e-3)
+ dem += 15;
+ if (fabs (yr - dir * interbeam) < rad
+ && fabs (my_modf (yr) - inter) < 1e-3)
+ dem += 15;
- Real beam_space= (2*ss + slt - 3 *thickness) / 2.0;
- if (multiplicity >= 4)
+ Real eps = 1e-3;
+
+ /*
+ Can't we simply compute the distance between the nearest
+ staffline and the secondary beam? That would get rid of the
+ silly case analysis here (which is probably not when we have
+ different beam-thicknesses.)
+
+ --hwn
+ */
+
+ // hmm, without Interval/Drul_array, you get ~ 4x same code...
+ if (fabs (yl - dir * interbeam) < rad + inter)
{
- beam_space = (3*ss + slt - 4 * thickness) /3.0;
+ if (dir == UP && dy <= eps
+ && fabs (my_modf (yl) - sit) < eps)
+ dem += 15;
+
+ if (dir == DOWN && dy >= eps
+ && fabs (my_modf (yl) - hang) < eps)
+ dem += 15;
}
- Direction d = Directional_element_interface::get (me);
- yl += d * (beam_space + thickness);
- yr += d * (beam_space + thickness);
- if (fabs (yl) < rad && fabs( my_modf(yl) - 0.5) < 0.1)
- dem += 15;
- if (fabs (yr) < rad && fabs( my_modf(yr) - 0.5) < 0.1)
- dem += 15;
+ if (fabs (yr - dir * interbeam) < rad + inter)
+ {
+ if (dir == UP && dy >= eps
+ && fabs (my_modf (yr) - sit) < eps)
+ dem += 15;
+
+ if (dir == DOWN && dy <= eps
+ && fabs (my_modf (yr) - hang) < eps)
+ dem += 15;
+ }
+
+ if (multiplicity >= 3)
+ {
+ if (fabs (yl - 2 * dir * interbeam) < rad + inter)
+ {
+ if (dir == UP && dy <= eps
+ && fabs (my_modf (yl) - straddle) < eps)
+ dem += 15;
+
+ if (dir == DOWN && dy >= eps
+ && fabs (my_modf (yl) - straddle) < eps)
+ dem += 15;
+ }
+
+ if (fabs (yr - 2 * dir * interbeam) < rad + inter)
+ {
+ if (dir == UP && dy >= eps
+ && fabs (my_modf (yr) - straddle) < eps)
+ dem += 15;
+
+ if (dir == DOWN && dy <= eps
+ && fabs (my_modf (yr) - straddle) < eps)
+ dem += 15;
+ }
+ }
}
- return gh_double2scm ( dem);
+ return dem;
}
Direction dir = Directional_element_interface::get (me);
- Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).idealy_f_,
- Stem::calc_stem_info (last_visible_stem (me)).idealy_f_);
+ Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y,
+ Stem::calc_stem_info (last_visible_stem (me)).ideal_y);
if (!ideal.delta ())
{
/* Make simple beam on middle line have small tilt */
if (!ideal[LEFT] && chord.delta () && count == 2)
{
- Direction d = (Direction)(sign (chord.delta ()) * dir);
+ Direction d = (Direction) (sign (chord.delta ()) * dir);
pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2
* dir;
pos[-d] = - pos[d];
if (Stem::invisible_b (s))
continue;
ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0,
- Stem::calc_stem_info (s).idealy_f_));
+ Stem::calc_stem_info (s).ideal_y));
}
Real y;
Real dydx;
return SCM_UNSPECIFIED;
}
-/* Prevent interference from stafflines. */
-Interval
-Beam::quantise_interval (Grob *me, Interval pos, Direction quant_dir)
-{
- int multiplicity = get_multiplicity (me);
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real thick = me->paper_l ()->get_var ("stafflinethickness");
- Direction dir = Directional_element_interface::get (me);
- Real dy = pos.delta ();
-
- Drul_array<Interval> bounds;
- Direction d = LEFT;
- do
- {
- SCM proc = d == LEFT
- ? me->get_grob_property ("left-position-quant-function")
- : me->get_grob_property ("right-position-quant-function");
-
- SCM quants = scm_apply (proc,
- me->self_scm (),
- scm_list_n (gh_int2scm (multiplicity),
- gh_double2scm (dir),
- gh_double2scm (dy),
- gh_double2scm (thick / staff_space),
- /* HUH? */
- SCM_EOL,
- SCM_UNDEFINED));
-
- Array<Real> a;
- for (SCM i = quants; gh_pair_p (i); i = ly_cdr (i))
- a.push (gh_scm2double (ly_car (i)));
-
- if (a.size () <= 1)
- return pos;
-
- bounds[d] = quantise_iv (a, pos[d]*dir/staff_space) * staff_space;
- }
- while (flip (&d) != LEFT);
-
- Real ady = abs (dy);
-
- // quant direction hints disabled for now
- int q = 0;//(int)quant_dir;
-
- /* TODO: make smart choice, find best left/right quants pair.
-
- Slope should never be steeper than least_squares (before damping)
- (save that value?)
- Slope should never be reduced to zero.
- */
- SCM s = me->get_grob_property ("least-squares-dy");
- Real lsdy = gh_number_p (s) ? gh_scm2double (s) : 0;
-
- // Interval qpos (0, 1000 * sign (dy));
- Interval qpos;
- Real epsilon = staff_space / 10;
- Direction ldir = LEFT;
- do
- {
- Direction rdir = LEFT;
- do
- {
- Interval i (bounds[LEFT][ldir]*dir, bounds[RIGHT][rdir]*dir);
- if ((!lsdy
- || (abs (i.delta ()) <= abs (lsdy) + epsilon
- && sign (i.delta ()) == sign (lsdy)))
- && (abs (abs (i.delta ()) - ady)
- <= abs (abs (qpos.delta ()) - ady))
- && sign (i.delta ()) == sign (pos.delta ())
- && (!q
- || (i[LEFT]*q >= pos[LEFT]*q && i[RIGHT]*q
- >= pos[RIGHT]*q)))
- qpos = i;
- }
- while (flip (&rdir) != LEFT);
- }
- while (flip (&ldir) != LEFT);
-
- return qpos;
-}
-
-
-/* Quantise vertical position (left and right) of beam.
- Generalisation of [Ross]. */
-MAKE_SCHEME_CALLBACK (Beam, quantise_position, 1);
-SCM
-Beam::quantise_position (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
-
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real y_shift = check_stem_length_f (me, pos);
- pos += y_shift;
- Real staff_space = Staff_symbol_referencer::staff_space (me);
-
- Direction dir = Directional_element_interface::get (me);
- for (int i = 0; i < 10; i++)
- {
- Interval qpos = quantise_interval (me, pos, CENTER);
- // how to check for uninitised interval, (inf, -inf)?
- if (qpos[LEFT] < 1000)
- {
- y_shift = check_stem_length_f (me, qpos);
- if (y_shift * dir < staff_space / 2)
- {
- pos = qpos;
- break;
- }
- }
- pos += ((i + 1) * ((i % 2) * -2 + 1)) * dir * staff_space / 4;
- }
-
-
- me->set_grob_property ("positions", ly_interval2scm (pos));
- set_stem_lengths (me);
-
-#if 0
- pos = ly_scm2interval (me->get_grob_property ("positions"));
-
- y_shift = check_stem_length_f (me, pos);
-
- Real half_space = Staff_symbol_referencer::staff_space (me) / 2;
- /* HMMM */
- if (y_shift > half_space / 4)
- {
- pos += y_shift;
- int quant_dir = 0;
- /* for significantly lengthened or shortened stems,
- request quanting the other way.
- HMMM */
- if (abs (y_shift) > half_space / 2)
- quant_dir = sign (y_shift) * Directional_element_interface::get (me);
- pos = quantise_interval (me, pos, (Direction)quant_dir);
- }
-
- me->set_grob_property ("positions", ly_interval2scm (pos));
-#endif
-
- return SCM_UNSPECIFIED;
-}
-
MAKE_SCHEME_CALLBACK (Beam, end_after_line_breaking, 1);
SCM
Beam::end_after_line_breaking (SCM smob)
in POS, and for stem S.
*/
Real
-Beam::calc_stem_y_f (Grob *me, Item* s, Interval pos)
+Beam::calc_stem_y (Grob *me, Grob* s, Interval pos)
{
int beam_multiplicity = get_multiplicity (me);
int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0;
- SCM space_proc = me->get_grob_property ("space-function");
- SCM space = gh_call1 (space_proc, gh_int2scm (beam_multiplicity));
-
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real interbeam_f = gh_scm2double (space);
+ Real interbeam = get_interbeam (me);
// ugh -> use commonx
Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS);
/* knee */
if (dir!= sdir)
{
- stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam_f);
-
- // huh, why not for first visible?
- if (Staff_symbol_referencer::staff_symbol_l (s)
- != Staff_symbol_referencer::staff_symbol_l (last_visible_stem (me)))
- stem_y += Directional_element_interface::get (me)
- * (beam_multiplicity - stem_multiplicity) * interbeam_f;
- }
-
- return stem_y;
-}
-
-/* Make very sure that we don't have stems that are too short.
- Try our best not to have stems that are too long (think: knees).
-
- Optionally (testing): try to lengthen more, to reach more ideal
- stem lengths */
-Real
-Beam::check_stem_length_f (Grob *me, Interval pos)
-{
- Real shorten = 0;
- Real lengthen = 0;
- Direction dir = Directional_element_interface::get (me);
-
- Link_array<Item> stems=
- Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
-
- bool knee = false;
- int ideal_lengthen_count = 0;
- Real ideal_lengthen = 0;
- int ideal_shorten_count = 0;
- Real ideal_shorten = 0;
-
- for (int i=0; i < stems.size (); i++)
- {
- Item* s = stems[i];
- if (Stem::invisible_b (s))
- continue;
-
- knee |= dir != Directional_element_interface::get (s);
-
- Real stem_y = calc_stem_y_f (me, s, pos);
-
- stem_y *= dir;
- Stem_info info = Stem::calc_stem_info (s);
+ stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam);
- shorten = shorten <? info.maxy_f_ - stem_y;
- lengthen = lengthen >? info.miny_f_ - stem_y;
+ // huh, why not for first visible?
- if (info.idealy_f_ - stem_y > 0)
- {
-#if 0
- ideal_lengthen += info.idealy_f_ - stem_y;
- ideal_lengthen_count++;
-#else
- ideal_lengthen = ideal_lengthen >? info.idealy_f_ - stem_y;
- ideal_lengthen_count = 1;
-#endif
- }
- else if (info.idealy_f_ - stem_y < 0)
+ Grob *last_visible = last_visible_stem (me);
+ if (last_visible)
{
-#if 0
- ideal_shorten += info.idealy_f_ - stem_y;
- ideal_shorten_count++;
-#else
- ideal_shorten = ideal_shorten <? info.idealy_f_ - stem_y;
- ideal_shorten_count = 1;
-#endif
+ if ( Staff_symbol_referencer::staff_symbol_l (s)
+ != Staff_symbol_referencer::staff_symbol_l (last_visible))
+ stem_y += Directional_element_interface::get (me)
+ * (beam_multiplicity - stem_multiplicity) * interbeam;
}
+ else
+ programming_error ("No last visible stem");
}
-
- if (lengthen && shorten)
- me->warning (_ ("weird beam vertical offset"));
-
- if (ideal_lengthen_count)
- lengthen = (ideal_lengthen / ideal_lengthen_count) >? lengthen;
- if (knee && ideal_shorten_count)
- shorten = (ideal_shorten / ideal_shorten_count) <? shorten;
- if (lengthen && shorten)
- return dir * (lengthen + shorten);
-
- return dir * (shorten ? shorten : lengthen);
+ return stem_y;
}
/*
if (Stem::invisible_b (s))
continue;
- Real stem_y = calc_stem_y_f (me, s, pos);
+ Real stem_y = calc_stem_y (me, s, pos);
// doesn't play well with dvips
if (ps_testing)
{
// ugh -> use commonx
if ((next
- && !(next->relative_coordinate (0, X_AXIS)
+ && ! (next->relative_coordinate (0, X_AXIS)
> here->relative_coordinate (0, X_AXIS)))
|| (prev
- && !(prev->relative_coordinate (0, X_AXIS)
+ && ! (prev->relative_coordinate (0, X_AXIS)
< here->relative_coordinate (0, X_AXIS))))
programming_error ("Beams are not left-to-right");
- int multiplicity = get_multiplicity (me);
-
- SCM space_proc = me->get_grob_property ("space-function");
- SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity));
-
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real interbeam_f = gh_scm2double (space);
-
- Real bdy = interbeam_f;
+ Real bdy = get_interbeam (me);
Molecule leftbeams;
Molecule rightbeams;
->get_bound (LEFT)->relative_coordinate (0, X_AXIS),
X_AXIS);
- if (0)
+ if (DEBUG_QUANTING)
{
/*
This code prints the demerits for each beam. Perhaps this
should be switchable for those who want to twiddle with the
parameters.
*/
- SCM dem = me->get_grob_property ("quant-score");
- Real s = gh_scm2double (dem);
- String str = to_str (s);
+ String str;
+ if (1)
+ {
+ str += to_str (gh_scm2int (me->get_grob_property ("best-idx")));
+ str += ":";
+ }
+ str += to_str (gh_scm2double (me->get_grob_property ("quant-score")),
+ "%.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, gh_str02scm (str.ch_C ()), properties);
mol.add_at_edge (Y_AXIS, UP, tm, 5.0);
}
-/* TODO:
- use filter and standard list functions.
- */
int
Beam::visible_stem_count (Grob *me)
{
/*
[TODO]
+
handle rest under beam (do_post: beams are calculated now)
what about combination of collisions and rest under beam.
Direction d = Stem::get_direction (stem);
Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT];
- Real staff_space = Staff_symbol_referencer::staff_space (rest);
+ Real staff_space = Staff_symbol_referencer::staff_space (rest);
Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp??
return me->has_interface (ly_symbol2scm ("beam-interface"));
}
+
+ADD_INTERFACE (Beam, "beam-interface",
+ "A beam.
+
+#'thickness= weight of beams, in staffspace
+
+
+We take the least squares line through the ideal-length stems, and
+then damp that using
+
+ damped = tanh (slope)
+
+this gives an unquantized left and right position for the beam end.
+Then we take all combinations of quantings near these left and right
+positions, and give them a score (according to how close they are to
+the ideal slope, how close the result is to the ideal stems, etc.). We
+take the best scoring combination.
+
+",
+ "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");
+
projects / lilypond.git / blobdiff