source file of the GNU LilyPond music typesetter
- (c) 1997--1998, 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
-
/*
[TODO]
- * centre beam symbol
* less hairy code
- * redo grouping
- */
+ * move paper vars to scm
+
-#include <math.h>
+ remove *-hs variables.
+
+*/
-#include "p-col.hh"
-#include "array.hh"
-#include "proto.hh"
+
+#include <math.h> // tanh.
+#include "directional-element-interface.hh"
+#include "beaming.hh"
#include "dimensions.hh"
#include "beam.hh"
-#include "abbreviation-beam.hh"
#include "misc.hh"
#include "debug.hh"
-#include "atom.hh"
-#include "molecule.hh"
-#include "leastsquares.hh"
+#include "least-squares.hh"
#include "stem.hh"
#include "paper-def.hh"
#include "lookup.hh"
-#include "rhythmic-grouping.hh"
+#include "group-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "cross-staff.hh"
Beam::Beam ()
{
- slope_f_ = 0;
- left_y_ = 0;
- damping_i_ = 1;
- quantisation_ = NORMAL;
- multiple_i_ = 0;
- vertical_align_drul_[MIN] = 0;
- vertical_align_drul_[MAX] = -1;
+ Group_interface g (this, "stems");
+ g.set_interface ();
+
+ set_elt_property ("height", gh_int2scm (0)); // ugh.
+ set_elt_property ("y-position" ,gh_int2scm (0));
}
void
Beam::add_stem (Stem*s)
{
- stems_.push (s);
+ Group_interface gi (this, "stems");
+ gi.add_element (s);
+
s->add_dependency (this);
- s->beam_l_ = this;
- if (!spanned_drul_[LEFT])
- set_bounds (LEFT,s);
+ assert (!s->beam_l ());
+ s->set_elt_property ("beam", self_scm_);
+
+ if (!get_bound (LEFT))
+ set_bound (LEFT,s);
else
- set_bounds (RIGHT,s);
+ set_bound (RIGHT,s);
}
-Molecule*
-Beam::do_brew_molecule_p () const
+int
+Beam::get_multiplicity () const
{
- Molecule *mol_p = new Molecule;
- Real internote_f = paper ()->internote_f ();
-
- Real x0 = stems_[0]->hpos_f ();
- for (int j=0; j <stems_.size (); j++)
+ int m = 0;
+ for (SCM s = get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s))
{
- Stem *i = stems_[j];
- Stem * prev = (j > 0)? stems_[j-1] : 0;
- Stem * next = (j < stems_.size ()-1) ? stems_[j+1] :0;
+ Score_element * sc = unsmob_element (gh_car (s));
- Molecule sb = stem_beams (i, next, prev);
- Real x = i->hpos_f ()-x0;
- sb.translate (Offset (x, (x * slope_f_ + left_y_) * internote_f));
- mol_p->add_molecule (sb);
+ if (Stem * st = dynamic_cast<Stem*> (sc))
+ m = m >? st->beam_count (LEFT) >? st->beam_count (RIGHT);
}
- mol_p->translate_axis (x0
- - spanned_drul_[LEFT]->absolute_coordinate (X_AXIS), X_AXIS);
-
- // correct if last note (and therefore reference point of beam)
- // is on different staff
- mol_p->translate_axis (- sinfo_.top ().interstaff_f_ * internote_f, Y_AXIS);
-
- return mol_p;
-}
-
-Offset
-Beam::center () const
-{
- Real w= (paper ()->note_width () + extent (X_AXIS).length ())/2.0;
- return Offset (w, (left_y_ + w* slope_f_)*paper ()->internote_f ());
-}
-
-void
-Beam::do_pre_processing ()
-{
- if (!dir_)
- set_default_dir ();
-}
-
-void
-Beam::do_print () const
-{
-#ifndef NPRINT
- DOUT << "slope_f_ " << slope_f_ << "left ypos " << left_y_;
- Spanner::do_print ();
-#endif
+ return m;
}
+/*
+ After pre-processing all directions should be set.
+ Several post-processing routines (stem, slur, script) need stem/beam
+ direction.
+ Currenly, this means that beam has set all stem's directions.
+ [Alternatively, stems could set its own directions, according to
+ their beam, during 'final-pre-processing'.]
+ */
void
-Beam::do_post_processing ()
+Beam::before_line_breaking ()
{
- if (stems_.size () < 2)
+ // Why?
+ if (visible_stem_count () < 2)
{
- warning (_ ("beam with less than two stems"));
- transparent_b_ = true;
- return ;
+ warning (_ ("beam has less than two stems"));
+ // set_elt_property ("transparent", SCM_BOOL_T);
}
- calculate_slope ();
- set_stemlens ();
-}
-void
-Beam::do_substitute_dependent (Score_element*o,Score_element*n)
-{
- if (Stem * os = dynamic_cast<Stem*> (o))
- stems_.substitute (os,
- dynamic_cast<Stem *> (n));
-}
+ if (!directional_element (this).get ())
+ directional_element (this).set (get_default_dir ());
-Interval
-Beam::do_width () const
-{
- return Interval (stems_[0]->hpos_f (),
- stems_.top ()->hpos_f ());
+ auto_knees ();
+ set_stem_directions ();
+ set_stem_shorten ();
}
-void
-Beam::set_default_dir ()
+/*
+ FIXME
+ */
+Direction
+Beam::get_default_dir () const
{
Drul_array<int> total;
total[UP] = total[DOWN] = 0;
Drul_array<int> count;
count[UP] = count[DOWN] = 0;
Direction d = DOWN;
-
- for (int i=0; i <stems_.size (); i++)
- do {
- Stem *s = stems_[i];
- int current = s->dir_
- ? (1 + d * s->dir_)/2
+
+ for (int i=0; i <stem_count (); i++)
+ do { // HUH -- waar slaat dit op?
+ Stem *s = stem (i);
+ Direction sd = directional_element (s).get ();
+ int current = sd ? (1 + d * sd)/2
: s->get_center_distance ((Direction)-d);
if (current)
} while (flip(&d) != DOWN);
- /*
- [Ross] states that the majority of the notes dictates the
- direction (and not the mean of "center distance")
-
- But is that because it really looks better, or because he
- wants to provide some real simple hands-on rules.
-
- We have our doubts, so we simply provide all sensible alternatives.
+
+ SCM s = scm_eval (gh_list (ly_symbol2scm ("beam-dir-algorithm"),
+ ly_quote_scm (gh_cons (gh_int2scm (count[UP]),
+ gh_int2scm (count[DOWN]))),
+ ly_quote_scm (gh_cons (gh_int2scm (total[UP]),
+ gh_int2scm (total[DOWN]))),
+ SCM_UNDEFINED));
+ if (gh_number_p (s) && gh_scm2int (s))
+ return to_dir (s);
+
+ /*
+ If dir is not determined: get from paper
*/
+ return (Direction)(int)
+ paper_l ()->get_var ("stem_default_neutral_direction");
+}
- Dir_algorithm a = (Dir_algorithm)rint(paper ()->get_var ("beam_dir_algorithm"));
- switch (a)
+
+/*
+ Set all stems with non-forced direction to beam direction.
+ Urg: non-forced should become `without/with unforced' direction,
+ once stem gets cleaned-up.
+ */
+void
+Beam::set_stem_directions ()
+{
+ Direction d = directional_element (this).get ();
+ for (int i=0; i <stem_count (); i++)
{
- case MAJORITY:
- dir_ = (count[UP] > count[DOWN]) ? UP : DOWN;
- break;
- case MEAN:
- // mean centre distance
- dir_ = (total[UP] > total[DOWN]) ? UP : DOWN;
- break;
- default:
- case MEDIAN:
- // median centre distance
- if (!count[UP])
- dir_ = DOWN;
- else if (!count[DOWN])
- dir_ = UP;
- else
- dir_ = (total[UP] / count[UP] > total[DOWN] / count[DOWN]) ? UP : DOWN;
- break;
+ Stem *s = stem (i);
+ SCM force = s->remove_elt_property ("dir-forced");
+ if (!gh_boolean_p (force) || !gh_scm2bool (force))
+ directional_element (s).set (d);
}
+}
+
+void
+Beam::auto_knees ()
+{
+ if (!auto_knee ("auto-interstaff-knee-gap", true))
+ auto_knee ("auto-knee-gap", false);
+}
+
+/*
+ Simplistic auto-knees; only consider vertical gap between two
+ adjacent chords.
- 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 autoKneeGap/autoInterstaffKneeGap.
+ */
+bool
+Beam::auto_knee (String gap_str, bool interstaff_b)
+{
+ bool knee_b = false;
+ int knee_y = 0;
+ SCM gap = get_elt_property (gap_str);
+ Direction d = directional_element (this).get ();
+
+ if (gh_number_p (gap))
{
- Stem *s = stems_[i];
- s->beam_dir_ = dir_;
- if (!s->dir_forced_b_)
- s->dir_ = dir_;
+ int auto_gap_i = gh_scm2int (gap);
+ for (int i=1; i < stem_count (); i++)
+ {
+ bool is_b = (bool)(calc_interstaff_dist (stem (i), this)
+ - calc_interstaff_dist (stem (i-1), this));
+ int l_y = (int)(stem (i-1)->head_positions()[d])
+ + (int)calc_interstaff_dist (stem (i-1), this);
+ int r_y = (int)(stem (i)->head_positions()[d])
+ + (int)calc_interstaff_dist (stem (i), this);
+ int gap_i = r_y - l_y;
+
+ if ((abs (gap_i) >= auto_gap_i) && (!interstaff_b || is_b))
+ {
+ knee_y = (r_y + l_y) / 2;
+ knee_b = true;
+ break;
+ }
+ }
}
+ if (knee_b)
+ {
+ for (int i=0; i < stem_count (); i++)
+ {
+ int y = (int)(stem (i)->head_positions()[d])
+ + (int)calc_interstaff_dist (stem (i), this);
+ directional_element (stem (i)).set (y < knee_y ? UP : DOWN);
+ stem (i)->set_elt_property ("dir-forced", SCM_BOOL_T);
+ }
+ }
+ return knee_b;
}
/*
- See Documentation/tex/fonts.doc
+ Set stem's shorten property if unset.
+ TODO:
+ take some y-position (chord/beam/nearest?) into account
+ scmify forced-fraction
*/
-
void
-Beam::solve_slope ()
+Beam::set_stem_shorten ()
{
- /*
- should use minimum energy formulation (cf linespacing)
- */
- assert (sinfo_.size () > 1);
- DOUT << "Beam::solve_slope: \n";
+ if (!visible_stem_count ())
+ return;
- Least_squares l;
- for (int i=0; i < sinfo_.size (); i++)
+ Real forced_fraction = forced_stem_count () / visible_stem_count ();
+ if (forced_fraction < 0.5)
+ return;
+
+ int multiplicity = get_multiplicity ();
+
+ // grace stems?
+ SCM shorten = scm_eval (ly_symbol2scm ("beamed-stem-shorten"));
+
+ if (shorten == SCM_EOL)
+ return;
+
+ int sz = scm_ilength (shorten);
+
+ Staff_symbol_referencer_interface st (this);
+ Real staff_space = st.staff_space ();
+ SCM shorten_elt = scm_list_ref (shorten, gh_int2scm (multiplicity <? (sz - 1)));
+ Real shorten_f = gh_scm2double (shorten_elt) * staff_space;
+
+ /* cute, but who invented this -- how to customise ? */
+ if (forced_fraction < 1)
+ shorten_f /= 2;
+
+ for (int i=0; i < stem_count (); i++)
{
- l.input.push (Offset (sinfo_[i].x_, sinfo_[i].idealy_f_));
+ Stem* s = stem (i);
+ if (s->invisible_b ())
+ continue;
+ if (gh_number_p (s->get_elt_property ("shorten")))
+ s->set_elt_property ("shorten", gh_double2scm (shorten_f));
}
- l.minimise (slope_f_, left_y_);
}
-Real
-Beam::check_stemlengths_f (bool set_b)
+/*
+ Set elt properties height and y-position if not set.
+ Adjust stem lengths to reach beam.
+ */
+void
+Beam::after_line_breaking ()
{
- Real interbeam_f = paper ()->interbeam_f (multiple_i_);
- Real internote_f = paper ()->internote_f ();
- Real beam_f = paper ()->beam_thickness_f ();
- Real staffline_f = paper ()->rule_thickness ();
- Real epsilon_f = staffline_f / 8;
- Real dy_f = 0.0;
- for (int i=0; i < sinfo_.size (); i++)
+ /* first, calculate y, dy */
+ Real y, dy;
+ calc_default_position_and_height (&y, &dy);
+ if (visible_stem_count ())
{
- Real y = sinfo_[i].x_ * slope_f_ + left_y_;
+ if (suspect_slope_b (y, dy))
+ dy = 0;
- // correct for knee
- if (dir_ != sinfo_[i].dir_)
- {
- y -= dir_ * (beam_f / 2
- + (sinfo_[i].mult_i_ - 1) * interbeam_f) / internote_f;
- if (!i && sinfo_[i].stem_l_->staff_sym_l_ !=
- sinfo_.top ().stem_l_->staff_sym_l_)
- y += dir_ * (multiple_i_ - (sinfo_[i].stem_l_->flag_i_ - 2) >? 0)
- * interbeam_f / internote_f;
- }
+ Real damped_dy = calc_slope_damping_f (dy);
+ Real quantised_dy = quantise_dy_f (damped_dy);
- if (set_b)
- sinfo_[i].stem_l_->set_stemend (y - sinfo_[i].interstaff_f_);
-
- y *= dir_;
- if (y > sinfo_[i].maxy_f_)
- dy_f = dy_f <? sinfo_[i].maxy_f_ - y;
- if (y < sinfo_[i].miny_f_)
- {
- // when all too short, normal stems win..
- if (dy_f < -epsilon_f)
- warning (_ ("weird beam shift, check your knees"));
- dy_f = dy_f >? sinfo_[i].miny_f_ - y;
- }
+ y += (dy - quantised_dy) / 2;
+ dy = quantised_dy;
}
- return dy_f;
-}
+ /*
+ until here, we used only stem_info, which acts as if dir=up
+ */
+ y *= directional_element (this).get ();
+ dy *= directional_element (this).get ();
-void
-Beam::set_steminfo ()
-{
- assert (multiple_i_);
- int total_count_i = 0;
- int forced_count_i = 0;
- for (int i=0; i < stems_.size (); i++)
+ Staff_symbol_referencer_interface st (this);
+ Real half_space = st.staff_space () / 2;
+
+ /* check for user-override of dy */
+ SCM s = remove_elt_property ("height-hs");
+ if (gh_number_p (s))
{
- Stem *s = stems_[i];
- s->mult_i_ = multiple_i_;
- s->set_default_extents ();
- if (s->invisible_b ())
- continue;
- if (((int)s->chord_start_f ()) && (s->dir_ != s->get_default_dir ()))
- forced_count_i++;
- total_count_i++;
+ dy = gh_scm2double (s) * half_space;
}
+ set_elt_property ("height", gh_double2scm (dy));
- Real internote_f = paper ()->internote_f ();
- int stem_max = (int)rint(paper ()->get_var ("stem_max"));
- Real shorten_f = paper ()->get_var (String ("forced_stem_shorten"
- + to_str (multiple_i_ <? stem_max)))
- / internote_f;
-
- Real leftx = 0;
- for (int i=0; i < stems_.size (); i++)
+ /* check for user-override of y */
+ s = remove_elt_property ("y-position-hs");
+ if (gh_number_p (s))
{
- Stem *s = stems_[i];
- if (s->invisible_b ())
- continue;
-
- Stem_info info (s);
- if (leftx == 0)
- leftx = info.x_;
- info.x_ -= leftx;
- if (info.dir_ == dir_)
- {
- if (forced_count_i == total_count_i)
- info.idealy_f_ -= shorten_f;
- else if (forced_count_i > total_count_i / 2)
- info.idealy_f_ -= shorten_f / 2;
+ y = gh_scm2double (s) * half_space;
+ }
+ else
+ {
+ /* we can modify y, so we should quantise y */
+ Real y_shift = check_stem_length_f (y, dy);
+ y += y_shift;
+ y = quantise_y_f (y, dy, 0);
+ set_stem_length (y, dy);
+ y_shift = check_stem_length_f (y, dy);
+
+ if (y_shift > half_space / 4)
+ {
+ y += y_shift;
+
+ /*
+ for significantly lengthened or shortened stems,
+ request quanting the other way.
+ */
+ int quant_dir = 0;
+ if (abs (y_shift) > half_space / 2)
+ quant_dir = sign (y_shift) * directional_element (this).get ();
+ y = quantise_y_f (y, dy, quant_dir);
}
- sinfo_.push (info);
}
+ // UGH. Y is not in staff position unit?
+ // Ik dacht datwe daar juist van weg wilden?
+ set_stem_length (y, dy);
+ set_elt_property ("y-position", gh_double2scm (y));
}
+/*
+ See Documentation/tex/fonts.doc
+ */
void
-Beam::calculate_slope ()
+Beam::calc_default_position_and_height (Real* y, Real* dy) const
{
- set_steminfo ();
- if (!sinfo_.size ())
- slope_f_ = left_y_ = 0;
- else if (sinfo_[0].idealy_f_ == sinfo_.top ().idealy_f_)
+ *y = 0;
+ *dy = 0;
+ if (visible_stem_count () <= 1)
+ return;
+
+ Real first_ideal = first_visible_stem ()->calc_stem_info ().idealy_f_;
+ if (first_ideal == last_visible_stem ()->calc_stem_info ().idealy_f_)
{
- slope_f_ = 0;
- left_y_ = sinfo_[0].idealy_f_;
- left_y_ *= dir_;
+ *dy = 0;
+ *y = first_ideal;
+ return;
}
- else
+
+ Array<Offset> ideals;
+ Real x0 = first_visible_stem ()->relative_coordinate (0, X_AXIS);
+ for (int i=0; i < stem_count (); i++)
{
- solve_slope ();
- Real solved_slope_f = slope_f_;
+ Stem* s = stem (i);
+ if (s->invisible_b ())
+ continue;
+ ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0,
+ s->calc_stem_info ().idealy_f_));
+ }
+ Real dydx;
+ minimise_least_squares (&dydx, y, ideals); // duh, takes references
- /*
- steep slope running against lengthened stem is suspect
- */
- Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
-
- // urg, these y internote-y-dimensions
- Real internote_f = paper ()->internote_f ();
- Real lengthened = paper ()->get_var ("beam_lengthened") / internote_f;
- Real steep = paper ()->get_var ("beam_steep_slope") / internote_f;
- if (((left_y_ - sinfo_[0].idealy_f_ > lengthened)
- && (slope_f_ > steep))
- || ((left_y_ + slope_f_ * dx_f - sinfo_.top ().idealy_f_ > lengthened)
- && (slope_f_ < -steep)))
- {
- slope_f_ = 0;
- }
+ Real dx = last_visible_stem ()->relative_coordinate (0, X_AXIS) - x0;
+ *dy = dydx * dx;
+}
- /*
- This neat trick is by Werner Lemberg,
- damped = tanh (slope_f_)
- corresponds with some tables in [Wanske]
- */
- if (damping_i_)
- slope_f_ = 0.6 * tanh (slope_f_) / damping_i_;
-
- quantise_dy ();
+bool
+Beam::suspect_slope_b (Real y, Real dy) const
+{
+ /* first, calculate y, dy */
+ /*
+ steep slope running against lengthened stem is suspect
+ */
+ Real first_ideal = first_visible_stem ()->calc_stem_info ().idealy_f_;
+ Real last_ideal = last_visible_stem ()->calc_stem_info ().idealy_f_;
+ Real lengthened = paper_l ()->get_var ("beam_lengthened");
+ Real steep = paper_l ()->get_var ("beam_steep_slope");
- Real damped_slope_dy_f = (solved_slope_f - slope_f_) * dx_f / 2;
- left_y_ += damped_slope_dy_f;
+ Real dx = last_visible_stem ()->relative_coordinate (0, X_AXIS) - first_visible_stem ()->relative_coordinate (0, X_AXIS);
+ Real dydx = dy && dx ? dy/dx : 0;
- left_y_ *= dir_;
- slope_f_ *= dir_;
+ if (((y - first_ideal > lengthened) && (dydx > steep))
+ || ((y + dy - last_ideal > lengthened) && (dydx < -steep)))
+ {
+ return true;
}
+ return false;
}
-void
-Beam::quantise_dy ()
+/*
+ This neat trick is by Werner Lemberg,
+ damped = tanh (slope)
+ corresponds with some tables in [Wanske]
+*/
+Real
+Beam::calc_slope_damping_f (Real dy) const
{
- /*
- [Ross] (simplification of)
- Try to set slope_f_ complying with y-span of:
- - zero
- - beam_f / 2 + staffline_f / 2
- - beam_f + staffline_f
- + n * interline
- */
-
- if (quantisation_ <= NONE)
- return;
+ SCM damp = get_elt_property ("damping"); // remove?
+ int damping = 1; // ugh.
+ if (gh_number_p (damp))
+ damping = gh_scm2int (damp);
- Real interline_f = paper ()->interline_f ();
- Real internote_f = interline_f / 2;
- Real staffline_f = paper ()->rule_thickness ();
- Real beam_f = paper ()->beam_thickness_f ();
+ if (damping)
+ {
+ Real dx = last_visible_stem ()->relative_coordinate (0, X_AXIS)
+ - first_visible_stem ()->relative_coordinate (0, X_AXIS);
+ Real dydx = dy && dx ? dy/dx : 0;
+ dydx = 0.6 * tanh (dydx) / damping;
+ return dydx * dx;
+ }
+ return dy;
+}
- Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
+Real
+Beam::calc_stem_y_f (Stem* s, Real y, Real dy) const
+{
+ Real thick = gh_scm2double (get_elt_property ("beam-thickness"));
+ int beam_multiplicity = get_multiplicity ();
+ int stem_multiplicity = (s->flag_i () - 2) >? 0;
+
+ Real interbeam_f = paper_l ()->interbeam_f (beam_multiplicity);
+ Real x0 = first_visible_stem ()->relative_coordinate (0, X_AXIS);
+ Real dx = last_visible_stem ()->relative_coordinate (0, X_AXIS) - x0;
+ Real stem_y = (dy && dx ? (s->relative_coordinate (0, X_AXIS) - x0) / dx * dy : 0) + y;
+
+ /* knee */
+ Direction dir = directional_element(this).get ();
+ Direction sdir = directional_element (s).get ();
+
+ /* knee */
+ if (dir!= sdir)
+ {
+ stem_y -= dir
+ * (thick / 2 + (beam_multiplicity - 1) * interbeam_f);
- // dim(y) = internote; so slope = (y/internote)/x
- Real dy_f = dx_f * abs (slope_f_ * internote_f);
-
- Real quanty_f = 0.0;
+ Staff_symbol_referencer_interface me (s);
+ Staff_symbol_referencer_interface last (last_visible_stem ());
+
+ // huh, why not for first visible?
+ if (//(s != first_visible_stem ()) &&
+ me.staff_symbol_l () != last.staff_symbol_l ())
+ stem_y += directional_element (this).get ()
+ * (beam_multiplicity - stem_multiplicity) * interbeam_f;
+ }
+ return stem_y;
+}
- /* UGR. ICE in 2.8.1; bugreport filed. */
- Array<Real> allowed_fraction (3);
- allowed_fraction[0] = 0;
- allowed_fraction[1] = (beam_f / 2 + staffline_f / 2);
- allowed_fraction[2] = (beam_f + staffline_f);
+Real
+Beam::check_stem_length_f (Real y, Real dy) const
+{
+ Real shorten = 0;
+ Real lengthen = 0;
+ Direction dir = directional_element (this).get ();
+
+ for (int i=0; i < stem_count (); i++)
+ {
+ Stem* s = stem (i);
+ if (s->invisible_b ())
+ continue;
+ Real stem_y = calc_stem_y_f (s, y, dy);
+
+ stem_y *= dir;
+ Stem_info info = s->calc_stem_info ();
- Interval iv = quantise_iv (allowed_fraction, interline_f, dy_f);
- quanty_f = (dy_f - iv.min () <= iv.max () - dy_f)
- ? iv.min ()
- : iv.max ();
+ // if (0 > info.maxy_f_ - stem_y)
+ shorten = shorten <? info.maxy_f_ - stem_y;
+ // if (0 < info.miny_f_ - stem_y)
+ lengthen = lengthen >? info.miny_f_ - stem_y;
+ }
+ if (lengthen && shorten)
+ warning (_ ("weird beam vertical offset"));
- slope_f_ = (quanty_f / dx_f) / internote_f * sign (slope_f_);
+ /* when all stems are too short, normal stems win */
+ return dir * ((shorten) ? shorten : lengthen);
}
-static int test_pos = 0;
-
-
/*
-
- Prevent interference from stafflines and beams. See Documentation/tex/fonts.doc
-
- */
+ Hmm. At this time, beam position and slope are determined. Maybe,
+ stem directions and length should set to relative to the chord's
+ position of the beam. */
void
-Beam::quantise_left_y (bool extend_b)
+Beam::set_stem_length (Real y, Real dy)
{
- /*
- we only need to quantise the start of the beam as dy is quantised too
- if extend_b then stems must *not* get shorter
- */
+ Staff_symbol_referencer_interface st (this);
+ Real half_space = st.staff_space ()/2;
+ for (int i=0; i < stem_count (); i++)
+ {
+ Stem* s = stem (i);
+ if (s->invisible_b ())
+ continue;
- if (quantisation_ <= NONE)
- return;
+ Real stem_y = calc_stem_y_f (s, y, dy);
- /*
- ----------------------------------------------------------
- ########
- ########
- ########
- --------------########------------------------------------
- ########
-
- hang straddle sit inter hang
- */
-
- Real interline_f = paper ()->interline_f ();
- Real internote_f = paper ()->internote_f ();
- Real staffline_f = paper ()->rule_thickness ();
- Real beam_f = paper ()->beam_thickness_f ();
+ /* caution: stem measures in staff-positions */
+ s->set_stemend ((stem_y + calc_interstaff_dist (s, this)) / half_space);
+ }
+}
- /*
- [TODO]
- it would be nice to have all allowed positions in a runtime matrix:
- (multiplicity, minimum_beam_dy, maximum_beam_dy)
- */
+/*
+ [Ross] (simplification of)
+ Set dy complying with:
+ - zero
+ - thick / 2 + staffline_f / 2
+ - thick + staffline_f
+ + n * staff_space
+*/
+Real
+Beam::quantise_dy_f (Real dy) const
+{
+ Array<Real> a;
+ for (SCM s = scm_eval (ly_symbol2scm ("beam-height-quants")); s !=SCM_EOL; s = gh_cdr (s))
+ a.push (gh_scm2double (gh_car (s)));
+
+ if (a.size () <= 1)
+ return dy;
- Real straddle = 0;
- Real sit = beam_f / 2 - staffline_f / 2;
- Real inter = interline_f / 2;
- Real hang = interline_f - beam_f / 2 + staffline_f / 2;
+ Staff_symbol_referencer_interface st (this);
+ Real staff_space = st.staff_space ();
+
+ Interval iv = quantise_iv (a, abs (dy)/staff_space) * staff_space;
+ Real q = (abs (dy) - iv[SMALLER] <= iv[BIGGER] - abs (dy))
+ ? iv[SMALLER]
+ : iv[BIGGER];
+
+ return q * sign (dy);
+}
- /*
- Put all allowed positions into an array.
- Whether a position is allowed or not depends on
- strictness of quantisation, multiplicity and direction.
+/*
+ Prevent interference from stafflines and beams.
+ See Documentation/tex/fonts.doc
- For simplicity, we'll assume dir = UP and correct if
- dir = DOWN afterwards.
- */
+ We only need to quantise the (left) y-position of the beam,
+ since dy is quantised too.
+ if extend_b then stems must *not* get shorter
+ */
+Real
+Beam::quantise_y_f (Real y, Real dy, int quant_dir)
+{
+ int multiplicity = get_multiplicity ();
+ Staff_symbol_referencer_interface st (this);
+ Real staff_space = st.staff_space ();
+ SCM quants = scm_eval (gh_list (ly_symbol2scm ("beam-vertical-position-quants"),
+ gh_int2scm (multiplicity),
+ gh_double2scm (dy/staff_space),
+ SCM_UNDEFINED));
- // dim(left_y_) = internote
- Real dy_f = dir_ * left_y_ * internote_f;
+ Array<Real> a;
- Real beamdx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f ();
- Real beamdy_f = beamdx_f * slope_f_ * internote_f;
+ for (; quants != SCM_EOL; quants = gh_cdr (quants))
+ a.push (gh_scm2double (gh_car (quants)));
- Array<Real> allowed_position;
- if (quantisation_ != TEST)
- {
- if (quantisation_ <= NORMAL)
- {
- if ((multiple_i_ <= 2) || (abs (beamdy_f) >= staffline_f / 2))
- allowed_position.push (straddle);
- if ((multiple_i_ <= 1) || (abs (beamdy_f) >= staffline_f / 2))
- allowed_position.push (sit);
- allowed_position.push (hang);
- }
- else
- // TODO: check and fix TRADITIONAL
- {
- if ((multiple_i_ <= 2) || (abs (beamdy_f) >= staffline_f / 2))
- allowed_position.push (straddle);
- if ((multiple_i_ <= 1) && (beamdy_f <= staffline_f / 2))
- allowed_position.push (sit);
- if (beamdy_f >= -staffline_f / 2)
- allowed_position.push (hang);
- }
- }
- else
- {
- if (test_pos == 0)
- {
- allowed_position.push (hang);
- cout << "hang" << hang << "\n";
- }
- else if (test_pos==1)
- {
- allowed_position.push (straddle);
- cout << "straddle" << straddle << endl;
- }
- else if (test_pos==2)
- {
- allowed_position.push (sit);
- cout << "sit" << sit << endl;
- }
- else if (test_pos==3)
- {
- allowed_position.push (inter);
- cout << "inter" << inter << endl;
- }
- }
+ if (a.size () <= 1)
+ return y;
- Interval iv = quantise_iv (allowed_position, interline_f, dy_f);
+ Real up_y = directional_element (this).get () * y;
+ Interval iv = quantise_iv (a, up_y/staff_space) * staff_space;
- Real quanty_f = dy_f - iv.min () <= iv.max () - dy_f ? iv.min () : iv.max ();
- if (extend_b)
- quanty_f = iv.max ();
+ Real q = up_y - iv[SMALLER] <= iv[BIGGER] - up_y
+ ? iv[SMALLER] : iv[BIGGER];
+ if (quant_dir)
+ q = iv[(Direction)quant_dir];
- // dim(left_y_) = internote
- left_y_ = dir_ * quanty_f / internote_f;
+ return q * directional_element (this).get ();
}
void
-Beam::set_stemlens ()
+Beam::set_beaming (Beaming_info_list *beaming)
{
- Real staffline_f = paper ()->rule_thickness ();
- // enge floots
- Real epsilon_f = staffline_f / 8;
-
- DOUT << "Beam::set_stemlens: \n";
- Real dy_f = check_stemlengths_f (false);
- for (int i = 0; i < 2; i++)
- {
- left_y_ += dy_f * dir_;
- quantise_left_y (dy_f);
- dy_f = check_stemlengths_f (true);
- if (abs (dy_f) <= epsilon_f)
- {
- DOUT << "Beam::set_stemlens: " << i << " iterations\n";
- break;
+ Direction d = LEFT;
+ for (int i=0; i < stem_count (); i++)
+ {
+ do
+ {
+ if (stem (i)->beam_count (d) == 0)
+ stem (i)->set_beaming ( beaming->infos_.elem (i).beams_i_drul_[d],d);
}
+ while (flip (&d) != LEFT);
}
-
- test_pos++;
- test_pos %= 4;
}
-/*
- FIXME
- ugh. this is broken and should be rewritten.
- - [c8. c32 c32]
- */
-void
-Beam::set_grouping (Rhythmic_grouping def, Rhythmic_grouping cur)
-{
- def.OK ();
- cur.OK ();
- assert (cur.children.size () == stems_.size ());
- cur.split (def);
-
- Array<int> b;
- {
- Array<int> flags;
- for (int j=0; j <stems_.size (); j++)
- {
- Stem *s = stems_[j];
-
- int f = s->flag_i_ - 2;
- assert (f>0);
- flags.push (f);
- }
- int fi =0;
- b= cur.generate_beams (flags, fi);
- b.insert (0,0);
- b.push (0);
- assert (stems_.size () == b.size ()/2);
- }
-
- for (int j=0, i=0; i < b.size () && j <stems_.size (); j++)
- {
- Stem *s = stems_[j];
- Direction d = LEFT;
- do {
- if (s->beams_i_drul_[d] < 0)
- s->beams_i_drul_[d] = b[i];
-
- multiple_i_ = multiple_i_ >? s->beams_i_drul_[d];
- i++;
- } while ((flip (&d)) != LEFT);
- }
-}
/*
beams to go with one stem.
+
+ BURP
+ clean me up.
*/
Molecule
Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const
{
- assert (!next || next->hpos_f () > here->hpos_f ());
- assert (!prev || prev->hpos_f () < here->hpos_f ());
+ 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 staffline_f = paper ()->rule_thickness ();
- Real interbeam_f = paper ()->interbeam_f (multiple_i_);
- Real internote_f = paper ()->internote_f ();
- Real beam_f = paper ()->beam_thickness_f ();
+ Real staffline_f = paper_l ()->get_var ("stafflinethickness");
+ int multiplicity = get_multiplicity ();
- Real dy = interbeam_f;
+
+ Real interbeam_f = paper_l ()->interbeam_f (multiplicity);
+ Real thick = gh_scm2double (get_elt_property ("beam-thickness"));
+
+ Real bdy = interbeam_f;
Real stemdx = staffline_f;
- Real sl = slope_f_* internote_f;
- lookup_l ()->beam (sl, 20 PT, 1 PT);
+
+ Real dx = visible_stem_count () ?
+ last_visible_stem ()->relative_coordinate (0, X_AXIS) - first_visible_stem ()->relative_coordinate (0, X_AXIS)
+ : 0.0;
+ Real dy = gh_scm2double (get_elt_property ("height"));
+ Real dydx = dy && dx ? dy/dx : 0;
Molecule leftbeams;
Molecule rightbeams;
// UGH
- Real nw_f = paper ()->note_width () * 0.8;
+ Real nw_f;
+ if (!here->first_head ())
+ nw_f = 0;
+ else if (here->type_i ()== 1)
+ nw_f = paper_l ()->get_var ("wholewidth");
+ else if (here->type_i () == 2)
+ nw_f = paper_l ()->get_var ("notewidth") * 0.8;
+ else
+ nw_f = paper_l ()->get_var ("quartwidth");
+
+ Direction dir = directional_element (this).get ();
+
/* half beams extending to the left. */
if (prev)
{
- int lhalfs= lhalfs = here->beams_i_drul_[LEFT] - prev->beams_i_drul_[RIGHT] ;
- int lwholebeams= here->beams_i_drul_[LEFT] <? prev->beams_i_drul_[RIGHT] ;
+ int lhalfs= lhalfs = here->beam_count (LEFT) - prev->beam_count (RIGHT);
+ int lwholebeams= here->beam_count (LEFT) <? prev->beam_count (RIGHT) ;
/*
Half beam should be one note-width,
but let's make sure two half-beams never touch
*/
- Real w = here->hpos_f () - prev->hpos_f ();
+ Real w = here->relative_coordinate (0, X_AXIS) - prev->relative_coordinate (0, X_AXIS);
w = w/2 <? nw_f;
- Atom a;
+ Molecule a;
if (lhalfs) // generates warnings if not
- a = lookup_l ()->beam (sl, w, beam_f);
- a.translate (Offset (-w, -w * sl));
+ a = lookup_l ()->beam (dydx, w, thick);
+ a.translate (Offset (-w, -w * dydx));
for (int j = 0; j < lhalfs; j++)
{
- Atom b (a);
- b.translate_axis (-dir_ * dy * (lwholebeams+j), Y_AXIS);
- leftbeams.add_atom (b);
+ Molecule b (a);
+ b.translate_axis (-dir * bdy * (lwholebeams+j), Y_AXIS);
+ leftbeams.add_molecule (b);
}
}
if (next)
{
- int rhalfs = here->beams_i_drul_[RIGHT] - next->beams_i_drul_[LEFT];
- int rwholebeams = here->beams_i_drul_[RIGHT] <? next->beams_i_drul_[LEFT];
+ int rhalfs = here->beam_count (RIGHT) - next->beam_count (LEFT);
+ int rwholebeams= here->beam_count (RIGHT) <? next->beam_count (LEFT) ;
- Real w = next->hpos_f () - here->hpos_f ();
- Atom a = lookup_l ()->beam (sl, w + stemdx, beam_f);
+ Real w = next->relative_coordinate (0, X_AXIS) - here->relative_coordinate (0, X_AXIS);
+ Molecule a = lookup_l ()->beam (dydx, w + stemdx, thick);
a.translate_axis( - stemdx/2, X_AXIS);
int j = 0;
Real gap_f = 0;
- if (here->beam_gap_i_)
+
+ SCM gap = get_elt_property ("beam-gap");
+ if (gh_number_p (gap))
{
- int nogap = rwholebeams - here->beam_gap_i_;
+ int gap_i = gh_scm2int ( (gap));
+ int nogap = rwholebeams - gap_i;
+
for (; j < nogap; j++)
{
- Atom b (a);
- b.translate_axis (-dir_ * dy * j, Y_AXIS);
- rightbeams.add_atom (b);
+ Molecule b (a);
+ b.translate_axis (-dir * bdy * j, Y_AXIS);
+ rightbeams.add_molecule (b);
}
// TODO: notehead widths differ for different types
gap_f = nw_f / 2;
w -= 2 * gap_f;
- a = lookup_l ()->beam (sl, w + stemdx, beam_f);
+ a = lookup_l ()->beam (dydx, w + stemdx, thick);
}
for (; j < rwholebeams; j++)
{
- Atom b (a);
- b.translate (Offset (gap_f, -dir_ * dy * j));
- rightbeams.add_atom (b);
+ Molecule b (a);
+ b.translate (Offset (here->invisible_b () ? 0 : gap_f, -dir * bdy * j));
+ rightbeams.add_molecule (b);
}
w = w/2 <? nw_f;
if (rhalfs)
- a = lookup_l ()->beam (sl, w, beam_f);
+ a = lookup_l ()->beam (dydx, w, thick);
for (; j < rwholebeams + rhalfs; j++)
{
- Atom b (a);
- b.translate_axis (-dir_ * dy * j, Y_AXIS);
- rightbeams.add_atom (b);
+ Molecule b (a);
+ b.translate_axis (- dir * bdy * j, Y_AXIS);
+ rightbeams.add_molecule (b);
}
}
return leftbeams;
}
+
+Molecule
+Beam::do_brew_molecule () const
+{
+ Molecule mol;
+ if (!stem_count ())
+ return mol;
+ Real x0,dx;
+ if (visible_stem_count ())
+ {
+ x0 = first_visible_stem ()->relative_coordinate (0, X_AXIS);
+ dx = last_visible_stem ()->relative_coordinate (0, X_AXIS) - x0;
+ }
+ else
+ {
+ x0 = stem (0)->relative_coordinate (0, X_AXIS);
+ dx = stem_top ()->relative_coordinate (0, X_AXIS) - x0;
+ }
+
+
+ Real dy = gh_scm2double (get_elt_property ("height"));
+ Real dydx = dy && dx ? dy/dx : 0;
+ Real y = gh_scm2double (get_elt_property ("y-position"));
+ for (int j=0; j <stem_count (); j++)
+ {
+ Stem *i = stem (j);
+ Stem * prev = (j > 0)? stem (j-1) : 0;
+ Stem * next = (j < stem_count ()-1) ? stem (j+1) :0;
+
+ Molecule sb = stem_beams (i, next, prev);
+ Real x = i->relative_coordinate (0, X_AXIS)-x0;
+ sb.translate (Offset (x, x * dydx + y));
+ mol.add_molecule (sb);
+ }
+ mol.translate_axis (x0
+ - get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS);
+
+ return mol;
+}
+
+int
+Beam::forced_stem_count () const
+{
+ int f = 0;
+ for (int i=0; i < stem_count (); i++)
+ {
+ Stem *s = stem (i);
+
+ if (s->invisible_b ())
+ continue;
+
+ if (((int)s->chord_start_f ())
+ && (s->get_direction () != s->get_default_dir ()))
+ f++;
+ }
+ return f;
+}
+
+/*
+ TODO: Fix this class. This is wildly inefficient.
+ And it sux. Yet another array/list 'interface'.
+ */
+Stem *
+Beam::stem (int i) const
+{
+ return Group_interface__extract_elements ((Beam*) this, (Stem*) 0, "stems")[i];
+}
+
+int
+Beam::stem_count () const
+{
+ Group_interface gi (this, "stems");
+ return gi.count ();
+}
+
+Stem*
+Beam::stem_top () const
+{
+ SCM s = get_elt_property ("stems");
+
+ return gh_pair_p (s) ? dynamic_cast<Stem*> (unsmob_element (gh_car (s))) : 0;
+}
+
+/* burp */
+int
+Beam::visible_stem_count () const
+{
+ int c = 0;
+ for (int i = 0; i < stem_count (); i++)
+ {
+ if (!stem (i)->invisible_b ())
+ c++;
+ }
+ return c;
+}
+
+Stem*
+Beam::first_visible_stem () const
+{
+ for (int i = 0; i < stem_count (); i++)
+ {
+ Stem* s = stem (i);
+ if (!s->invisible_b ())
+ return s;
+ }
+ return 0;
+}
+
+Stem*
+Beam::last_visible_stem () const
+{
+ for (int i = stem_count (); i > 0; i--)
+ {
+ Stem* s = stem (i - 1);
+ if (!s->invisible_b ())
+ return s;
+ }
+ return 0;
+}
projects / lilypond.git / blobdiff