* 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 "group-interface.hh"
#include "staff-symbol-referencer.hh"
#include "cross-staff.hh"
-#include "lily-guile.icc"
Beam::Beam ()
{
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 (!directional_element (this).get ())
auto_knees ();
set_stem_directions ();
-
set_stem_shorten ();
}
return;
int multiplicity = get_multiplicity ();
+
// grace stems?
- SCM shorten = ly_eval_str ("beamed-stem-shorten");
+ SCM shorten = scm_eval (ly_symbol2scm ("beamed-stem-shorten"));
- Array<Real> a;
- scm_to_array (shorten, &a);
- if (!a.size ())
+ if (shorten == SCM_EOL)
return;
+ int sz = scm_ilength (shorten);
+
Staff_symbol_referencer_interface st (this);
Real staff_space = st.staff_space ();
- Real shorten_f = a[multiplicity <? (a.size () - 1)] * 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)
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
*/
dy *= directional_element (this).get ();
Staff_symbol_referencer_interface st (this);
- Real staff_space = st.staff_space ();
+ Real half_space = st.staff_space () / 2;
/* check for user-override of dy */
- SCM s = remove_elt_property ("Height");
+ SCM s = remove_elt_property ("height-hs");
if (gh_number_p (s))
{
- dy = gh_scm2double (s) * staff_space;
+ dy = gh_scm2double (s) * half_space;
}
set_elt_property ("height", gh_double2scm (dy));
/* check for user-override of y */
- s = remove_elt_property ("verticalPosition");
+ s = remove_elt_property ("y-position-hs");
if (gh_number_p (s))
{
- y = gh_scm2double (s) * staff_space;
- 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 half_space = st.staff_space () / 2;
if (y_shift > half_space / 4)
{
y += y_shift;
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);
}
}
// 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;
}
Array<Offset> ideals;
- Real x0 = first_visible_stem ()->hpos_f ();
+ 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;
- ideals.push (Offset (s->hpos_f () - x0,
+ 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
- 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 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))
if (damping)
{
- Real dx = last_visible_stem ()->hpos_f ()
- - first_visible_stem ()->hpos_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;
dydx = 0.6 * tanh (dydx) / damping;
return dydx * dx;
int stem_multiplicity = (s->flag_i () - 2) >? 0;
Real interbeam_f = paper_l ()->interbeam_f (beam_multiplicity);
- Real x0 = first_visible_stem ()->hpos_f ();
- Real dx = last_visible_stem ()->hpos_f () - x0;
- Real stem_y = (dy && dx ? (s->hpos_f () - x0) / dx * dy : 0) + y;
+ 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 ();
Real
Beam::quantise_dy_f (Real dy) const
{
- SCM quants = ly_eval_str ("beam-height-quants");
-
Array<Real> a;
- scm_to_array (quants, &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;
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"),
+ 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;
- scm_to_array (quants, &a);
+
+ for (; quants != SCM_EOL; quants = gh_cdr (quants))
+ a.push (gh_scm2double (gh_car (quants)));
+
if (a.size () <= 1)
return y;
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 thick = gh_scm2double (get_elt_property ("beam-thickness"));;
+ Real thick = gh_scm2double (get_elt_property ("beam-thickness"));
Real bdy = interbeam_f;
Real stemdx = staffline_f;
- Real dx = last_visible_stem ()->hpos_f () - first_visible_stem ()->hpos_f ();
- Real dy = get_real ("height");
+ 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;
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
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 ();
+ 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;
}
-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 dy = get_real ("height");
+ Real dy = gh_scm2double (get_elt_property ("height"));
Real dydx = dy && dx ? dy/dx : 0;
- Real y = get_real ("y-position");
+ 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