*/
/*
- [TODO]
-
- * Fix TODO
* Junk stem_info.
-
- * Remove #'direction from beam. A beam has no direction per se.
- It may only set directions for stems.
-
- * Rewrite stem_beams.
* Use Number_pair i.s.o Interval to represent (yl, yr).
-
- */
+Notes:
+
+ - Stems run to the Y-center of the beam.
+
+ - beam_space is the offset between Y centers of the beam.
+*/
#include <math.h> // tanh.
const int INTER_QUANT_PENALTY = 1000;
const int SECONDARY_BEAM_DEMERIT = 15;
const int STEM_LENGTH_DEMERIT_FACTOR = 5;
-const int STEM_LENGTH_LIMIT_PENALTY = 500;
+// 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
return fabs (x) * ((x < 0) ? 1.5 : 1.0);
}
+// move to somewhree?
+Slice
+int_list_to_slice (SCM l)
+{
+ Slice s;
+ s.set_empty ();
+ for (; gh_pair_p (l); l = gh_cdr (l))
+ {
+ if (gh_number_p (gh_car (l)))
+ s.add_point (gh_scm2int (gh_car (l)));
+ }
+
+ return s;
+}
+
+// move to stem?
+Slice
+stem_beam_multiplicity (Grob *stem)
+{
+ SCM beaming= stem->get_grob_property ("beaming");
+ Slice l = int_list_to_slice (gh_car (beaming));
+ Slice r = int_list_to_slice (gh_cdr (beaming));
+ l.unite (r);
+
+ return l;
+}
+
void
Beam::add_stem (Grob *me, Grob *s)
{
}
Real
-Beam::get_interbeam (Grob *me)
+Beam::get_beam_space (Grob *me)
{
SCM func = me->get_grob_property ("space-function");
- SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_multiplicity (me)));
+ SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_beam_count (me)));
return gh_scm2double (s);
}
+/*
+ Maximum beam_count.
+ */
int
-Beam::get_multiplicity (Grob *me)
+Beam::get_beam_count (Grob *me)
{
int m = 0;
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
Grob *sc = unsmob_grob (ly_car (s));
-
- if (Stem::has_interface (sc))
- m = m >? Stem::beam_count (sc, LEFT) >? Stem::beam_count (sc, RIGHT);
+
+ m = m >? (stem_beam_multiplicity (sc).length () + 1);
}
return m;
}
MAKE_SCHEME_CALLBACK (Beam, space_function, 2);
SCM
-Beam::space_function (SCM smob, SCM multiplicity)
+Beam::space_function (SCM smob, SCM beam_count)
{
Grob *me = unsmob_grob (smob);
Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
* staff_space;
- Real interbeam = gh_scm2int (multiplicity) < 4
+ Real beam_space = gh_scm2int (beam_count) < 4
? (2*staff_space + line - thickness) / 2.0
: (3*staff_space + line - thickness) / 3.0;
- return gh_double2scm (interbeam);
+ return gh_double2scm (beam_space);
}
}
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);
+
+ connect_beams (me);
+
set_stem_shorten (me);
}
+
return SCM_EOL;
}
+
+
+void
+Beam::connect_beams (Grob *me)
+{
+ Link_array<Grob> stems=
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+
+ Slice last_int;
+ last_int.set_empty();
+ for (int i = 0; i< stems.size(); i++)
+ {
+ Grob *this_stem = stems[i];
+ SCM this_beaming = this_stem->get_grob_property ("beaming");
+
+ Direction this_dir = Directional_element_interface::get(this_stem);
+ if (i > 0)
+ {
+ int start_point = last_int [this_dir];
+
+ Direction d = LEFT;
+ Slice new_slice ;
+ do
+ {
+ if (d == RIGHT && i == stems.size()-1)
+ continue;
+
+ new_slice.set_empty();
+ SCM s = index_get_cell (this_beaming, d);
+ for (; gh_pair_p (s); s = gh_cdr (s))
+ {
+ int new_beam_pos =
+ start_point - this_dir * gh_scm2int (gh_car (s));
+
+ new_slice.add_point (new_beam_pos);
+ gh_set_car_x (s, gh_int2scm (new_beam_pos));
+ }
+ }
+ while (flip (&d) != LEFT);
+
+ last_int = new_slice;
+ }
+ else
+ {
+ SCM s = gh_cdr (this_beaming);
+ for (; gh_pair_p (s); s = gh_cdr (s))
+ {
+ int np = - this_dir * gh_scm2int (gh_car(s));
+ gh_set_car_x (s, gh_int2scm (np));
+ last_int.add_point (np);
+ }
+ }
+ }
+}
+
+MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1);
+SCM
+Beam::brew_molecule (SCM grob)
+{
+ Grob *me = unsmob_grob (grob);
+ Link_array<Grob> stems=
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS);
+
+ Real x0, dx;
+ if (visible_stem_count (me))
+ {
+ // ugh -> use commonx
+ x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS);
+ dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0;
+ }
+ else
+ {
+ x0 = stems[0]->relative_coordinate (xcommon, X_AXIS);
+ dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0;
+ }
+
+ 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;
+
+ Real thick = gh_scm2double (me->get_grob_property ("thickness"));
+ Real bdy = get_beam_space (me);
+
+ SCM last_beaming = SCM_EOL;;
+ Real last_xposn = -1;
+ Real last_width = -1 ;
+
+
+ * Determine auto knees based on positions if it's set by the user.
+
+ Molecule the_beam;
+ Real lt = me->paper_l ()->get_var ("linethickness");
+ for (int i = 0; i< stems.size(); i++)
+ {
+ Grob * st =stems[i];
+
+ SCM this_beaming = st->get_grob_property ("beaming");
+ Real xposn = st->relative_coordinate (xcommon, X_AXIS);
+ Real stem_width = gh_scm2double (st->get_grob_property ("thickness")) *lt;
+
+ if (i > 0)
+ {
+ SCM left = gh_cdr (last_beaming);
+ SCM right = gh_car (this_beaming);
+
+ Array<int> fullbeams;
+ Array<int> lfliebertjes;
+ Array<int> rfliebertjes;
+
+ for (SCM s = left;
+ gh_pair_p (s); s =gh_cdr (s))
+ {
+ int b = gh_scm2int (gh_car (s));
+ if (scm_memq (gh_car(s), right) != SCM_BOOL_F)
+ {
+ fullbeams.push (b);
+ }
+ else
+ {
+ lfliebertjes.push (b);
+ }
+ }
+ for (SCM s = right;
+ gh_pair_p (s); s =gh_cdr (s))
+ {
+ int b = gh_scm2int (gh_car (s));
+ if (scm_memq (gh_car(s), left) == SCM_BOOL_F)
+ {
+ rfliebertjes.push (b);
+ }
+ }
+
+
+ Real w = xposn - last_xposn;
+ Real stem_offset = 0.0;
+ Real width_corr = 0.0;
+ if (i == 1)
+ {
+ stem_offset -= last_width/2;
+ width_corr += last_width/2;
+ }
+
+ if (i == stems.size() -1)
+ {
+ width_corr += stem_width/2;
+ }
+
+ Molecule whole = Lookup::beam (dydx, w + width_corr, thick);
+ for (int j = fullbeams.size(); j--;)
+ {
+ Molecule b (whole);
+ 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);
+ }
+
+ if (lfliebertjes.size() || rfliebertjes.size())
+ {
+
+ Real nw_f;
+ if (!Stem::first_head (st))
+ nw_f = 0;
+ else
+ {
+ int t = Stem::duration_log (st);
+
+ SCM proc = me->get_grob_property ("flag-width-function");
+ SCM result = gh_call1 (proc, gh_int2scm (t));
+ nw_f = gh_scm2double (result);
+ }
+
+ /* Half beam should be one note-width,
+ but let's make sure two half-beams never touch */
+
+ Real w = xposn - last_xposn;
+ w = w/2 <? nw_f;
+
+ Molecule half = Lookup::beam (dydx, w, thick);
+ for (int j = lfliebertjes.size(); j--;)
+ {
+ Molecule 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);
+ }
+ for (int j = rfliebertjes.size(); j--;)
+ {
+ Molecule 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);
+ }
+ }
+ }
+
+ last_xposn = xposn;
+ last_width = stem_width;
+ last_beaming = this_beaming;
+ }
+
+ the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), X_AXIS);
+ the_beam.translate_axis (pos[LEFT], Y_AXIS);
+
+#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.
+ */
+ 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, ly_str02scm (str.ch_C ()), properties);
+ the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0);
+ }
+#endif
+
+
+
+ return the_beam.smobbed_copy();
+}
+
+
+
+
Direction
Beam::get_default_dir (Grob *me)
{
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");
{
for (int i=0; i < stems.size (); i++)
{
- if (Stem::invisible_b (stems[i]))
- continue;
Item *s = stems[i];
+ if (Stem::invisible_b (s) ||
+ s->get_grob_property ("dir-forced") == SCM_BOOL_T)
+ continue;
Real y = Stem::extremal_heads (stems[i])[d]
->relative_coordinate (common, Y_AXIS);
Real forced_fraction = forced_stem_count (me) / visible_stem_count (me);
- int multiplicity = get_multiplicity (me);
+ int beam_count = get_beam_count (me);
SCM shorten = me->get_grob_property ("beamed-stem-shorten");
if (shorten == SCM_EOL)
Real staff_space = Staff_symbol_referencer::staff_space (me);
SCM shorten_elt = scm_list_ref (shorten,
- gh_int2scm (multiplicity <? (sz - 1)));
+ gh_int2scm (beam_count <? (sz - 1)));
Real shorten_f = gh_scm2double (shorten_elt) * staff_space;
/* 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)
SCM s = ly_deep_copy (me->get_grob_property ("positions"));
me->set_grob_property ("positions", s);
- if (ly_car (s) != SCM_BOOL_F)
- return SCM_UNSPECIFIED;
+ 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);
+ // 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 = 2;
- 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);
+
+ bool french = to_boolean (me->get_grob_property ("french-beaming"));
+ 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), french && i > 0&& (i < stems.size () -1));
+ lbase_lengths.push (b);
+
+ Real a = calc_stem_y (me, s, Interval (0,1), french && i > 0&& (i < stems.size () -1));
+ 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));
}
Real rad = Staff_symbol_referencer::staff_radius (me);
- int multiplicity = get_multiplicity (me);
- Real interbeam = multiplicity < 4
+ int beam_count = get_beam_count (me);
+ Real beam_space = beam_count < 4
? (2*ss + slt - thickness) / 2.0
: (3*ss + slt - thickness) / 3.0;
{
qscores[i].demerits
+= score_forbidden_quants (me, qscores[i].yl, qscores[i].yr,
- rad, slt, thickness, interbeam,
- multiplicity);
+ rad, slt, thickness, beam_space,
+ beam_count, 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;
-
- 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));
-
- 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);
-
- Direction d = Directional_element_interface::get( s);
- directions.push( d);
- dirs_found [d] = true;
- }
-
- bool knee_b = dirs_found[LEFT] && dirs_found[RIGHT];
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,
+ knee_b,
me, qscores[i].yl, qscores[i].yr);
}
Array<Stem_info> stem_infos,
Array<Real> left_factor,
Array<Real> right_factor,
- Array<int> directions,
bool knee,
- Grob*me, Real yl, Real yr)
+ 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]);
+ Direction d = info.dir_;
- Real pen = STEM_LENGTH_LIMIT_PENALTY;
- if (knee)
- pen = sqrt(pen);
+ demerit_score += pen
+ * ( 0 >? (info.dir_ * (info.shortest_y_ - current_y)));
- demerit_score += pen * ( 0 >? (info.min_y - d * current_y));
- demerit_score += pen * ( 0 >? (d * current_y - info.max_y));
-
- demerit_score += STEM_LENGTH_DEMERIT_FACTOR * shrink_extra_weight (d * current_y - info.ideal_y);
+ demerit_score += STEM_LENGTH_DEMERIT_FACTOR
+ * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_);
}
demerit_score *= 2.0 / stems.size ();
}
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;
}
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 yl, Real yr,
Real rad,
Real slt,
- Real thickness, Real interbeam,
- int multiplicity)
+ Real thickness, Real beam_space,
+ int beam_count,
+ Direction ldir, Direction rdir)
{
Real dy = yr - yl;
if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3)
dem += INTER_QUANT_PENALTY;
- // todo: use multiplicity of outer stems.
- if (multiplicity >= 2)
+ // todo: use beam_count of outer stems.
+ if (beam_count >= 2)
{
Real straddle = 0.0;
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 * beam_space) < rad
&& fabs (my_modf (yl) - inter) < 1e-3)
dem += SECONDARY_BEAM_DEMERIT;
- if (fabs (yr - dir * interbeam) < rad
+ if (fabs (yr - rdir * beam_space) < rad
&& fabs (my_modf (yr) - inter) < 1e-3)
dem += SECONDARY_BEAM_DEMERIT;
// hmm, without Interval/Drul_array, you get ~ 4x same code...
- if (fabs (yl - dir * interbeam) < rad + inter)
+ if (fabs (yl - ldir * beam_space) < rad + inter)
{
- if (dir == UP && dy <= eps
+ if (ldir == UP && dy <= eps
&& fabs (my_modf (yl) - sit) < eps)
dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy >= eps
+ if (ldir == DOWN && dy >= eps
&& fabs (my_modf (yl) - hang) < eps)
dem += SECONDARY_BEAM_DEMERIT;
}
- if (fabs (yr - dir * interbeam) < rad + inter)
+ if (fabs (yr - rdir * beam_space) < rad + inter)
{
- if (dir == UP && dy >= eps
+ if (rdir == UP && dy >= eps
&& fabs (my_modf (yr) - sit) < eps)
dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy <= eps
+ if (rdir == DOWN && dy <= eps
&& fabs (my_modf (yr) - hang) < eps)
dem += SECONDARY_BEAM_DEMERIT;
}
- if (multiplicity >= 3)
+ if (beam_count >= 3)
{
- if (fabs (yl - 2 * dir * interbeam) < rad + inter)
+ if (fabs (yl - 2 * ldir * beam_space) < rad + inter)
{
- if (dir == UP && dy <= eps
+ if (ldir == UP && dy <= eps
&& fabs (my_modf (yl) - straddle) < eps)
dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy >= eps
+ if (ldir == DOWN && dy >= eps
&& fabs (my_modf (yl) - straddle) < eps)
dem += SECONDARY_BEAM_DEMERIT;
}
- if (fabs (yr - 2 * dir * interbeam) < rad + inter)
+ if (fabs (yr - 2 * rdir * beam_space) < rad + inter)
{
- if (dir == UP && dy >= eps
+ if (rdir == UP && dy >= eps
&& fabs (my_modf (yr) - straddle) < eps)
dem += SECONDARY_BEAM_DEMERIT;
- if (dir == DOWN && dy <= eps
+ if (rdir == DOWN && dy <= eps
&& fabs (my_modf (yr) - straddle) < eps)
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;
+}
+
+
+/*
+ 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];
- pos = Interval (y*dir, (y+dy) * dir);
+ 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)
== Stem::get_direction(stems[0]))
{
Real r1 = gh_scm2double (gap);
- Real dy = Stem::chord_start_f (stems.top ())
- - Stem::chord_start_f (stems[0]);
+ 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;
SCM thresh = me->get_grob_property ("concaveness-threshold");
Real r2 = infinity_f;
- if (!concaveness1 && gh_number_p (thresh))
+ if (!concaveness1 && gh_number_p (thresh)
+ && Stem::get_direction(stems.top ())
+ == Stem::get_direction(stems[0]))
{
r2 = gh_scm2double (thresh);
-
- Direction dir = Directional_element_interface::get (me);
+ 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);
}
- /*
- Ugh. This will mess up with knees. Direction should be
- determined per stem.
- */
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);
}
return SCM_UNSPECIFIED;
}
+Slice
+where_are_the_whole_beams(SCM beaming)
+{
+ Slice l;
+
+ for( SCM s = gh_car (beaming); gh_pair_p (s) ; s = gh_cdr (s))
+ {
+ if (scm_memq (gh_car (s), gh_cdr (beaming)) != SCM_BOOL_F)
+
+ l.add_point (gh_scm2int (gh_car (s)));
+ }
+
+ return l;
+}
+
/*
Calculate the Y position of the stem-end, given the Y-left, Y-right
in POS, and for stem S.
+
+ If CORRECT, correct for beam_count 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 french)
{
- int beam_multiplicity = get_multiplicity (me);
- int stem_multiplicity = (Stem::duration_log (s) - 2) >? 0;
-
Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real interbeam = get_interbeam (me);
+ Real beam_space = get_beam_space (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
- * dy
- : 0) + pos[LEFT];
-
- /* knee */
- Direction dir = Directional_element_interface::get (me);
- Direction sdir = Directional_element_interface::get (s);
-
- /* knee */
- if (dir!= sdir)
- {
- stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam);
+ Real stem_y_beam0 = (dy && dx
+ ? r / dx
+ * dy
+ : 0) + pos[LEFT];
- // huh, why not for first visible?
- Grob *last_visible = last_visible_stem (me);
- if (last_visible)
- {
- 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");
+
+ Direction my_dir = Directional_element_interface::get (s);
+ SCM beaming = s->get_grob_property ("beaming");
+
+ Real stem_y = stem_y_beam0;
+ if (french)
+ {
+ stem_y += beam_space * where_are_the_whole_beams (beaming)[-my_dir];
+ }
+ else
+ {
+ stem_y += (stem_beam_multiplicity(s)[my_dir]) * beam_space;
}
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);
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- bool ps_testing = to_boolean (ly_symbol2scm ("ps-testing"));
+
+ bool french = to_boolean (me->get_grob_property ("french-beaming"));
+
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, french && i > 0&& (i < stems.size () -1));
- // doesn't play well with dvips
- if (ps_testing)
- if (Stem::get_direction (s) == dir)
- stem_y += Stem::get_direction (s) * thick / 2;
-
/* caution: stem measures in staff-positions */
Real id = me->relative_coordinate (common, Y_AXIS)
- stems[i]->relative_coordinate (common, Y_AXIS);
Direction d = LEFT;
for (int i=0; i < stems.size (); i++)
{
+ /*
+ Don't overwrite user settings.
+ */
+
do
{
- /* Don't overwrite user override (?) */
- if (Stem::beam_count (stems[i], d) == -1
- /* Don't set beaming for outside of outer stems */
- && ! (d == LEFT && i == 0)
- && ! (d == RIGHT && i == stems.size () -1))
+ /* Don't set beaming for outside of outer stems */
+ if ((d == LEFT && i == 0)
+ ||(d == RIGHT && i == stems.size () -1))
+ continue;
+
+
+ SCM beaming_prop = stems[i]->get_grob_property ("beaming");
+ if (beaming_prop == SCM_EOL ||
+ index_get_cell (beaming_prop, d) == SCM_EOL)
{
int b = beaming->infos_.elem (i).beams_i_drul_[d];
Stem::set_beaming (stems[i], b, d);
}
}
-
-
-/*
- beams to go with one stem.
-
- FIXME: clean me up.
- */
-Molecule
-Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx)
-{
- // ugh -> use commonx
- if ((next
- && ! (next->relative_coordinate (0, X_AXIS)
- > here->relative_coordinate (0, X_AXIS)))
- || (prev
- && ! (prev->relative_coordinate (0, X_AXIS)
- < here->relative_coordinate (0, X_AXIS))))
- programming_error ("Beams are not left-to-right");
-
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real bdy = get_interbeam (me);
-
- Molecule leftbeams;
- Molecule rightbeams;
-
- 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);
- }
-
-
- 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);
-
-
- /* half beams extending to the left. */
- if (prev)
- {
- int lhalfs= lhalfs = Stem::beam_count (here, LEFT)
- - Stem::beam_count (prev, RIGHT);
- int lwholebeams= Stem::beam_count (here, LEFT)
- <? Stem::beam_count (prev, RIGHT);
-
- /* Half beam should be one note-width,
- but let's make sure two half-beams never touch */
-
- // FIXME: TODO (check) stem width / sloped beams
- Real w = here->relative_coordinate (0, X_AXIS)
- - prev->relative_coordinate (0, X_AXIS);
- Real stem_w = gh_scm2double (prev->get_grob_property ("thickness"))
- // URG
- * me->paper_l ()->get_var ("linethickness");
-
- w = w/2 <? nw_f;
- Molecule a;
- if (lhalfs) // generates warnings if not
- a = Lookup::beam (dydx, w + stem_w, thick);
- a.translate (Offset (-w, -w * dydx));
- a.translate_axis (-stem_w/2, X_AXIS);
- for (int j = 0; j < lhalfs; j++)
- {
- Molecule b (a);
- b.translate_axis (-dir * bdy * (lwholebeams+j), Y_AXIS);
- leftbeams.add_molecule (b);
- }
- }
-
- if (next)
- {
- int rhalfs = Stem::beam_count (here, RIGHT)
- - Stem::beam_count (next, LEFT);
- int rwholebeams= Stem::beam_count (here, RIGHT)
- <? Stem::beam_count (next, LEFT);
-
- Real w = next->relative_coordinate (0, X_AXIS)
- - here->relative_coordinate (0, X_AXIS);
-
- Real stem_w = gh_scm2double (next->get_grob_property ("thickness"))
- // URG
- * me->paper_l ()->get_var ("linethickness");
-
- Molecule a = Lookup::beam (dydx, w + stem_w, thick);
- a.translate_axis (- stem_w/2, X_AXIS);
- int j = 0;
- Real gap_f = 0;
-
- SCM gap = me->get_grob_property ("gap");
- if (gh_number_p (gap))
- {
- int gap_i = gh_scm2int ((gap));
- int nogap = rwholebeams - gap_i;
-
- for (; j < nogap; j++)
- {
- Molecule b (a);
- b.translate_axis (-dir * bdy * j, Y_AXIS);
- rightbeams.add_molecule (b);
- }
- if (Stem::invisible_b (here))
- gap_f = nw_f;
- else
- gap_f = nw_f / 2;
- w -= 2 * gap_f;
- a = Lookup::beam (dydx, w + stem_w, thick);
- }
-
- for (; j < rwholebeams; j++)
- {
- Molecule b (a);
- Real tx = 0;
- if (Stem::invisible_b (here))
- // ugh, see chord-tremolo.ly
- tx = (-dir + 1) / 2 * nw_f * 1.5 + gap_f/4;
- else
- tx = gap_f;
- b.translate (Offset (tx, -dir * bdy * j));
- rightbeams.add_molecule (b);
- }
-
- w = w/2 <? nw_f;
- if (rhalfs)
- a = Lookup::beam (dydx, w, thick);
-
- for (; j < rwholebeams + rhalfs; j++)
- {
- Molecule b (a);
- b.translate_axis (- dir * bdy * j, Y_AXIS);
- rightbeams.add_molecule (b);
- }
-
- }
- leftbeams.add_molecule (rightbeams);
-
- /* Does beam quanting think of the asymetry of beams?
- Refpoint is on bottom of symbol. (FIXTHAT) --hwn. */
- return leftbeams;
-}
-
-
-MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1);
-SCM
-Beam::brew_molecule (SCM smob)
-{
- Grob *me =unsmob_grob (smob);
-
- Molecule mol;
- if (!gh_pair_p (me->get_grob_property ("stems")))
- return SCM_EOL;
- Real x0, dx;
- Link_array<Item>stems =
- Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems");
- if (visible_stem_count (me))
- {
- // ugh -> use commonx
- x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS);
- dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0;
- }
- else
- {
- x0 = stems[0]->relative_coordinate (0, X_AXIS);
- dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0;
- }
-
- 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);
- }
-
- mol.translate_axis (x0
- - dynamic_cast<Spanner*> (me)
- ->get_bound (LEFT)->relative_coordinate (0, X_AXIS),
- X_AXIS);
-
-#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.
- */
- 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, ly_str02scm (str.ch_C ()), properties);
- mol.add_at_edge (Y_AXIS, UP, tm, 5.0);
- }
-#endif
-
- return mol.smobbed_copy ();
-}
-
int
Beam::forced_stem_count (Grob *me)
{
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++;
}
take the best scoring combination.
",
- "position-callbacks 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 space-function thickness");
+ "french-beaming 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