source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
* less hairy code
* move paper vars to scm
+
+ remove *-hs variables.
+
*/
+
+#include <math.h> // tanh.
+#include "directional-element-interface.hh"
#include "beaming.hh"
#include "dimensions.hh"
#include "beam.hh"
#include "misc.hh"
#include "debug.hh"
-#include "leastsquares.hh"
+#include "least-squares.hh"
#include "stem.hh"
#include "paper-def.hh"
#include "lookup.hh"
{
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
assert (!s->beam_l ());
s->set_elt_property ("beam", self_scm_);
- if (!spanned_drul_[LEFT])
- set_bounds (LEFT,s);
+ if (!get_bound (LEFT))
+ set_bound (LEFT,s);
else
- set_bounds (RIGHT,s);
+ set_bound (RIGHT,s);
}
int
their beam, during 'final-pre-processing'.]
*/
void
-Beam::do_pre_processing ()
+Beam::before_line_breaking ()
{
// Why?
if (visible_stem_count () < 2)
{
warning (_ ("beam has less than two stems"));
- set_elt_property ("transparent", SCM_BOOL_T);
+ // set_elt_property ("transparent", SCM_BOOL_T);
}
- if (!get_direction ())
- set_direction (get_default_dir ());
+ if (!directional_element (this).get ())
+ directional_element (this).set (get_default_dir ());
auto_knees ();
set_stem_directions ();
-
set_stem_shorten ();
}
for (int i=0; i <stem_count (); i++)
do { // HUH -- waar slaat dit op?
Stem *s = stem (i);
- int current = s->get_direction ()
- ? (1 + d * s->get_direction ())/2
+ 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.
- If dir is not determined: up (see stem::get_default_dir ()) */
-
- Direction beam_dir = CENTER;
- Direction neutral_dir = (Direction)(int)paper_l ()->get_var ("stem_default_neutral_direction");
-
- SCM a = get_elt_property ("beam-dir-algorithm");
-
- if (a == ly_symbol2scm ("majority")) // should get default from paper.
- beam_dir = (count[UP] == count[DOWN]) ? neutral_dir
- : (count[UP] > count[DOWN]) ? UP : DOWN;
- else if (a == ly_symbol2scm ("mean"))
- // mean center distance
- beam_dir = (total[UP] == total[DOWN]) ? neutral_dir
- : (total[UP] > total[DOWN]) ? UP : DOWN;
- else if (a == ly_symbol2scm ("median"))
- {
- // median center distance
- if (count[DOWN] && count[UP])
- {
- beam_dir = (total[UP] / count[UP] == total[DOWN] / count[DOWN])
- ? neutral_dir
- : (total[UP] / count[UP] > total[DOWN] / count[DOWN]) ? UP : DOWN;
- }
- else
- {
- beam_dir = (count[UP] == count[DOWN]) ? neutral_dir
- : (count[UP] > count[DOWN]) ? UP : DOWN;
- }
- }
+ 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);
- return beam_dir;
+ /*
+ If dir is not determined: get from paper
+ */
+ return (Direction)(int)
+ paper_l ()->get_var ("stem_default_neutral_direction");
}
void
Beam::set_stem_directions ()
{
- Direction d = get_direction ();
+ Direction d = directional_element (this).get ();
for (int i=0; i <stem_count (); i++)
{
Stem *s = stem (i);
SCM force = s->remove_elt_property ("dir-forced");
if (!gh_boolean_p (force) || !gh_scm2bool (force))
- s->set_direction (d);
+ directional_element (s).set (d);
}
}
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))
{
int auto_gap_i = gh_scm2int (gap);
{
bool is_b = (bool)(calc_interstaff_dist (stem (i), this)
- calc_interstaff_dist (stem (i-1), this));
- int l_y = (int)(stem (i-1)->chord_start_f ())
+ int l_y = (int)(stem (i-1)->head_positions()[d])
+ (int)calc_interstaff_dist (stem (i-1), this);
- int r_y = (int)(stem (i)->chord_start_f ())
+ int r_y = (int)(stem (i)->head_positions()[d])
+ (int)calc_interstaff_dist (stem (i), this);
int gap_i = r_y - l_y;
{
for (int i=0; i < stem_count (); i++)
{
- int y = (int)(stem (i)->chord_start_f ())
+ int y = (int)(stem (i)->head_positions()[d])
+ (int)calc_interstaff_dist (stem (i), this);
- stem (i)->set_direction (y < knee_y ? UP : DOWN);
+ directional_element (stem (i)).set (y < knee_y ? UP : DOWN);
stem (i)->set_elt_property ("dir-forced", SCM_BOOL_T);
}
}
/*
Set stem's shorten property if unset.
- TODO: take some y-position (nearest?) into account
+ TODO:
+ take some y-position (chord/beam/nearest?) into account
+ scmify forced-fraction
*/
void
Beam::set_stem_shorten ()
return;
int multiplicity = get_multiplicity ();
- SCM shorten = scm_eval (scm_listify (
- ly_symbol2scm ("beamed-stem-shorten"),
- gh_int2scm (multiplicity),
- SCM_UNDEFINED));
- Real shorten_f = gh_scm2double (shorten)
- * Staff_symbol_referencer_interface (this).staff_space ();
+
+ // 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)
s->set_elt_property ("shorten", gh_double2scm (shorten_f));
}
}
+
/*
Set elt properties height and y-position if not set.
Adjust stem lengths to reach beam.
*/
void
-Beam::do_post_processing ()
+Beam::after_line_breaking ()
{
/* first, calculate y, dy */
Real y, dy;
- calc_position_and_height (&y, &dy);
- if (suspect_slope_b (y, dy))
- dy = 0;
+ calc_default_position_and_height (&y, &dy);
+ if (visible_stem_count ())
+ {
+ if (suspect_slope_b (y, dy))
+ dy = 0;
- Real damped_dy = calc_slope_damping_f (dy);
- Real quantised_dy = quantise_dy_f (damped_dy);
+ Real damped_dy = calc_slope_damping_f (dy);
+ Real quantised_dy = quantise_dy_f (damped_dy);
- y += (dy - quantised_dy) / 2;
- dy = quantised_dy;
-
+ y += (dy - quantised_dy) / 2;
+ dy = quantised_dy;
+ }
/*
until here, we used only stem_info, which acts as if dir=up
*/
- y *= get_direction ();
- dy *= get_direction ();
+ y *= directional_element (this).get ();
+ dy *= directional_element (this).get ();
- /* set or read dy as necessary */
- SCM s = get_elt_property ("height");
+ 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))
- dy = gh_scm2double (s);
- else
- set_elt_property ("height", gh_double2scm (dy));
+ {
+ dy = gh_scm2double (s) * half_space;
+ }
+ set_elt_property ("height", gh_double2scm (dy));
- /* set or read y as necessary */
- s = get_elt_property ("y-position");
+ /* check for user-override of y */
+ s = remove_elt_property ("y-position-hs");
if (gh_number_p (s))
{
- y = gh_scm2double (s);
- set_stem_length (y, dy);
+ y = gh_scm2double (s) * half_space;
}
else
{
set_stem_length (y, dy);
y_shift = check_stem_length_f (y, dy);
- Real internote_f = paper_l ()->get_var ("interline") / 2;
- if (y_shift > internote_f / 4)
+ if (y_shift > half_space / 4)
{
y += y_shift;
request quanting the other way.
*/
int quant_dir = 0;
- if (abs (y_shift) > internote_f / 2)
- quant_dir = sign (y_shift) * get_direction ();
+ if (abs (y_shift) > half_space / 2)
+ quant_dir = sign (y_shift) * directional_element (this).get ();
y = quantise_y_f (y, dy, quant_dir);
- set_stem_length (y, dy);
}
-
- set_elt_property ("y-position", gh_double2scm (y));
}
+ // 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::calc_position_and_height (Real* y, Real* dy) const
+Beam::calc_default_position_and_height (Real* y, Real* dy) const
{
- *y = *dy = 0;
+ *y = 0;
+ *dy = 0;
if (visible_stem_count () <= 1)
return;
return;
}
- Least_squares ls;
- Real x0 = first_visible_stem ()->hpos_f ();
+ Array<Offset> ideals;
+ Real x0 = first_visible_stem ()->relative_coordinate (0, X_AXIS);
for (int i=0; i < stem_count (); i++)
{
Stem* s = stem (i);
if (s->invisible_b ())
continue;
- ls.input.push (Offset (s->hpos_f () - x0,
- s->calc_stem_info ().idealy_f_));
+ ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0,
+ s->calc_stem_info ().idealy_f_));
}
Real dydx;
- ls.minimise (dydx, *y); // duh, takes references
+ minimise_least_squares (&dydx, y, ideals); // duh, takes references
- Real dx = last_visible_stem ()->hpos_f () - x0;
+ Real dx = last_visible_stem ()->relative_coordinate (0, X_AXIS) - x0;
*dy = dydx * dx;
}
bool
Beam::suspect_slope_b (Real y, Real dy) const
{
+ /* first, calculate y, dy */
/*
steep slope running against lengthened stem is suspect
*/
Real lengthened = paper_l ()->get_var ("beam_lengthened");
Real steep = paper_l ()->get_var ("beam_steep_slope");
- Real dx = last_visible_stem ()->hpos_f () - first_visible_stem ()->hpos_f ();
- Real dydx = dy/dx;
+ 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;
if (((y - first_ideal > lengthened) && (dydx > steep))
|| ((y + dy - last_ideal > lengthened) && (dydx < -steep)))
if (damping)
{
- Real dx = last_visible_stem ()->hpos_f ()
- - first_visible_stem ()->hpos_f ();
- Real dydx = dy/dx;
+ 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;
}
Real
Beam::calc_stem_y_f (Stem* s, Real y, Real dy) const
{
- Real beam_f = gh_scm2double (get_elt_property ("beam-thickness"));
- int multiplicity = get_multiplicity ();
-
+ 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 (multiplicity);
- Real x0 = first_visible_stem ()->hpos_f ();
- Real dx = last_visible_stem ()->hpos_f () - x0;
- Real stem_y = (s->hpos_f () - x0) / dx * dy + y;
+ 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 */
- if (get_direction () != s->get_direction ())
- {
- stem_y -= get_direction () * (beam_f / 2
- + (multiplicity - 1) * interbeam_f);
+ 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);
Staff_symbol_referencer_interface me (s);
Staff_symbol_referencer_interface last (last_visible_stem ());
- if ((s != first_visible_stem ())
- && me.staff_symbol_l () != last.staff_symbol_l ())
- stem_y += get_direction ()
- * (multiplicity - (s->flag_i () - 2) >? 0) * interbeam_f;
+ // 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;
}
{
Real shorten = 0;
Real lengthen = 0;
+ Direction dir = directional_element (this).get ();
+
for (int i=0; i < stem_count (); i++)
{
Stem* s = stem (i);
Real stem_y = calc_stem_y_f (s, y, dy);
- stem_y *= get_direction ();
+ stem_y *= dir;
Stem_info info = s->calc_stem_info ();
- if (stem_y > info.maxy_f_)
- shorten = shorten <? info.maxy_f_ - stem_y;
-
- if (stem_y < info.miny_f_)
- lengthen = lengthen >? info.miny_f_ - stem_y;
+ // 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"));
/* when all stems are too short, normal stems win */
- if (shorten)
- return shorten * get_direction ();
- else
- return lengthen * get_direction ();
+ return dir * ((shorten) ? shorten : lengthen);
}
+/*
+ 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::set_stem_length (Real y, Real dy)
{
- Real internote_f = paper_l ()->get_var ("interline") / 2;
+ 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);
Real stem_y = calc_stem_y_f (s, y, dy);
/* caution: stem measures in staff-positions */
- s->set_stemend ((stem_y - calc_interstaff_dist (s, this)) / internote_f);
+ s->set_stemend ((stem_y + calc_interstaff_dist (s, this)) / half_space);
}
}
/*
[Ross] (simplification of)
- Try to set dy complying with:
+ Set dy complying with:
- zero
- - beam_f / 2 + staffline_f / 2
- - beam_f + staffline_f
- + n * interline
-
- TODO: get allowed-positions as scm list (aarg: from paper block)
+ - thick / 2 + staffline_f / 2
+ - thick + staffline_f
+ + n * staff_space
*/
Real
Beam::quantise_dy_f (Real dy) const
{
- SCM s = get_elt_property ("slope-quantisation");
+ 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 (s == ly_symbol2scm ("none"))
+ if (a.size () <= 1)
return dy;
Staff_symbol_referencer_interface st (this);
- Real interline_f = st.staff_space ();
+ Real staff_space = st.staff_space ();
- Real staffline_f = paper_l ()->get_var ("stafflinethickness");
- Real beam_f = gh_scm2double (get_elt_property ("beam-thickness"));;
-
- 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);
-
- allowed_fraction.push (interline_f);
- Interval iv = quantise_iv (allowed_fraction, abs (dy));
+ 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);
}
Prevent interference from stafflines and beams.
See Documentation/tex/fonts.doc
- TODO: get allowed-positions as scm list (aarg: from paper block)
+ 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)
{
- /*
- 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
- */
- SCM s = get_elt_property ("slope-quantisation");
- if (s == ly_symbol2scm ("none"))
- return y;
-
- /*
- ----------------------------------------------------------
- ########
- ########
- ########
- --------------########------------------------------------
- ########
-
- hang straddle sit inter hang
- */
-
- Staff_symbol_referencer_interface sinf (this);
- Real space = sinf.staff_space ();
- Real staffline_f = paper_l ()->get_var ("stafflinethickness");
- Real beam_f = gh_scm2double (get_elt_property ("beam-thickness"));;
-
- Real straddle = 0;
- Real sit = beam_f / 2 - staffline_f / 2;
- Real hang = space - beam_f / 2 + staffline_f / 2;
-
- /*
- Put all allowed positions into an array.
- Whether a position is allowed or not depends on
- strictness of quantisation, multiplicity and direction.
-
- For simplicity, we'll assume dir = UP and correct if
- dir = DOWN afterwards.
- */
-
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));
+ Array<Real> a;
- Array<Real> allowed_position;
- if (s == ly_symbol2scm ("normal"))
- {
- if ((multiplicity <= 2) || (abs (dy) >= staffline_f / 2))
- allowed_position.push (straddle);
- if ((multiplicity <= 1) || (abs (dy) >= staffline_f / 2))
- allowed_position.push (sit);
- allowed_position.push (hang);
- }
- else if (s == ly_symbol2scm ("traditional"))
- {
- // TODO: check and fix TRADITIONAL
- if ((multiplicity <= 2) || (abs (dy) >= staffline_f / 2))
- allowed_position.push (straddle);
- if ((multiplicity <= 1) && (dy <= staffline_f / 2))
- allowed_position.push (sit);
- if (dy >= -staffline_f / 2)
- allowed_position.push (hang);
- }
+ for (; quants != SCM_EOL; quants = gh_cdr (quants))
+ a.push (gh_scm2double (gh_car (quants)));
- allowed_position.push (space);
- Real up_y = get_direction () * y;
- Interval iv = quantise_iv (allowed_position, up_y);
+ if (a.size () <= 1)
+ return y;
+
+ Real up_y = directional_element (this).get () * y;
+ Interval iv = quantise_iv (a, up_y/staff_space) * staff_space;
Real q = up_y - iv[SMALLER] <= iv[BIGGER] - up_y
? iv[SMALLER] : iv[BIGGER];
if (quant_dir)
q = iv[(Direction)quant_dir];
- return q * get_direction ();
+ return q * directional_element (this).get ();
}
void
Molecule
Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const
{
- if ((next && !(next->hpos_f () > here->hpos_f ())) ||
- (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_l ()->get_var ("stafflinethickness");
Real interbeam_f = paper_l ()->interbeam_f (multiplicity);
- Real beam_f = gh_scm2double (get_elt_property ("beam-thickness"));;
+ Real thick = gh_scm2double (get_elt_property ("beam-thickness"));
- Real dy = interbeam_f;
+ Real bdy = interbeam_f;
Real stemdx = staffline_f;
- Real dx = last_visible_stem ()->hpos_f () - first_visible_stem ()->hpos_f ();
- Real dydx = get_real ("height")/dx;
+ 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;
else
nw_f = paper_l ()->get_var ("quartwidth");
+
+ Direction dir = directional_element (this).get ();
+
/* half beams extending to the left. */
if (prev)
{
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;
Molecule a;
if (lhalfs) // generates warnings if not
- a = lookup_l ()->beam (dydx, w, beam_f);
+ a = lookup_l ()->beam (dydx, w, thick);
a.translate (Offset (-w, -w * dydx));
for (int j = 0; j < lhalfs; j++)
{
Molecule b (a);
- b.translate_axis (-get_direction () * dy * (lwholebeams+j), Y_AXIS);
+ b.translate_axis (-dir * bdy * (lwholebeams+j), Y_AXIS);
leftbeams.add_molecule (b);
}
}
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 ();
- Molecule a = lookup_l ()->beam (dydx, 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;
for (; j < nogap; j++)
{
Molecule b (a);
- b.translate_axis (-get_direction () * dy * j, Y_AXIS);
+ 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 (dydx, w + stemdx, beam_f);
+ a = lookup_l ()->beam (dydx, w + stemdx, thick);
}
for (; j < rwholebeams; j++)
{
Molecule b (a);
- if (!here->invisible_b ())
- b.translate (Offset (gap_f, -get_direction () * dy * j));
- else
- b.translate (Offset (0, -get_direction () * dy * j));
+ 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 (dydx, w, beam_f);
+ a = lookup_l ()->beam (dydx, w, thick);
for (; j < rwholebeams + rhalfs; j++)
{
Molecule b (a);
- b.translate_axis (-get_direction () * dy * j, Y_AXIS);
+ b.translate_axis (- dir * bdy * j, Y_AXIS);
rightbeams.add_molecule (b);
}
}
-Molecule*
-Beam::do_brew_molecule_p () const
+Molecule
+Beam::do_brew_molecule () const
{
- Molecule *mol_p = new Molecule;
+ Molecule mol;
if (!stem_count ())
- return mol_p;
+ 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 x0 = first_visible_stem ()->hpos_f ();
- Real dx = last_visible_stem ()->hpos_f () - x0;
- Real dydx = get_real ("height")/dx;
- Real y = get_real ("y-position");
+
+ 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 * next = (j < stem_count ()-1) ? stem (j+1) :0;
Molecule sb = stem_beams (i, next, prev);
- Real x = i->hpos_f ()-x0;
+ Real x = i->relative_coordinate (0, X_AXIS)-x0;
sb.translate (Offset (x, x * dydx + y));
- mol_p->add_molecule (sb);
+ mol.add_molecule (sb);
}
- mol_p->translate_axis (x0
- - spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS), X_AXIS);
+ mol.translate_axis (x0
+ - get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS);
- return mol_p;
+ return mol;
}
int
return f;
}
-
-
/*
TODO: Fix this class. This is wildly inefficient.
And it sux. Yet another array/list 'interface'.
SCM s = get_elt_property ("stems");
return gh_pair_p (s) ? dynamic_cast<Stem*> (unsmob_element (gh_car (s))) : 0;
-
- //Group_interface__extract_elements ((Beam*) this, (Stem*) 0, "stems")[stem_count () - 1];
}
/* burp */
if (!s->invisible_b ())
return s;
}
-
- assert (0);
-
return 0;
}
if (!s->invisible_b ())
return s;
}
-
- assert (0);
- // sigh
return 0;
}
projects / lilypond.git / blobdiff