source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
*/
+
#include <math.h> // m_pi
+#include "lookup.hh"
#include "directional-element-interface.hh"
#include "note-head.hh"
#include "stem.hh"
#include "debug.hh"
#include "paper-def.hh"
#include "rhythmic-head.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
#include "molecule.hh"
#include "paper-column.hh"
#include "misc.hh"
#include "beam.hh"
#include "rest.hh"
#include "group-interface.hh"
-#include "cross-staff.hh"
#include "staff-symbol-referencer.hh"
#include "spanner.hh"
-
+#include "side-position-interface.hh"
void
-Stem::set_beaming (Score_element*me ,int i, Direction d )
+Stem::set_beaming (Grob*me ,int i, Direction d)
{
- SCM pair = me->get_elt_property ("beaming");
+ SCM pair = me->get_grob_property ("beaming");
if (!gh_pair_p (pair))
{
pair = gh_cons (gh_int2scm (0),gh_int2scm (0));
- me-> set_elt_property ("beaming", pair);
+ me-> set_grob_property ("beaming", pair);
}
index_set_cell (pair, d, gh_int2scm (i));
}
int
-Stem::beam_count (Score_element*me,Direction d)
+Stem::beam_count (Grob*me,Direction d)
{
- SCM p=me->get_elt_property ("beaming");
+ SCM p=me->get_grob_property ("beaming");
if (gh_pair_p (p))
return gh_scm2int (index_cell (p,d));
else
}
Interval
-Stem::head_positions (Score_element*me)
+Stem::head_positions (Grob*me)
{
if (!heads_i (me))
{
return iv;
}
- Drul_array<Score_element*> e (extremal_heads (me));
+ Drul_array<Grob*> e (extremal_heads (me));
return Interval (Staff_symbol_referencer::position_f (e[DOWN]),
- Staff_symbol_referencer::position_f ( e[UP]));
+ Staff_symbol_referencer::position_f (e[UP]));
}
Real
-Stem::chord_start_f (Score_element*me)
+Stem::chord_start_f (Grob*me)
{
- return head_positions(me)[get_direction (me)]
+ return head_positions (me)[get_direction (me)]
* Staff_symbol_referencer::staff_space (me)/2.0;
}
Real
-Stem::stem_end_position (Score_element*me)
+Stem::stem_end_position (Grob*me)
{
- SCM p =me->get_elt_property ("stem-end-position");
+ SCM p =me->get_grob_property ("stem-end-position");
Real pos;
if (!gh_number_p (p))
{
-
pos = get_default_stem_end_position (me);
- me->set_elt_property ("stem-end-position", gh_double2scm (pos));
+ me->set_grob_property ("stem-end-position", gh_double2scm (pos));
}
else
pos = gh_scm2double (p);
}
Direction
-Stem::get_direction (Score_element*me)
+Stem::get_direction (Grob*me)
{
Direction d = Directional_element_interface::get (me);
void
-Stem::set_stemend (Score_element*me, Real se)
+Stem::set_stemend (Grob*me, Real se)
{
// todo: margins
Direction d= get_direction (me);
- if (d && d * head_positions(me)[get_direction (me)] >= se*d)
- warning (_ ("Weird stem size; check for narrow beams"));
+ if (d && d * head_positions (me)[get_direction (me)] >= se*d)
+ me->warning (_ ("Weird stem size; check for narrow beams"));
- me->set_elt_property ("stem-end-position", gh_double2scm (se));
+ me->set_grob_property ("stem-end-position", gh_double2scm (se));
}
int
-Stem::type_i (Score_element*me)
+Stem::type_i (Grob*me)
{
return first_head (me) ? Rhythmic_head::balltype_i (first_head (me)) : 2;
}
/*
Note head that determines hshift for upstems
*/
-Score_element*
-Stem::support_head (Score_element*me)
+Grob*
+Stem::support_head (Grob*me)
{
- SCM h = me->get_elt_property ("support-head");
- Score_element * nh = unsmob_element (h);
+ SCM h = me->get_grob_property ("support-head");
+ Grob * nh = unsmob_grob (h);
if (nh)
return nh;
else if (heads_i (me) == 1)
UGH.
*/
- return unsmob_element (gh_car (me->get_elt_property ("heads")));
+ return unsmob_grob (ly_car (me->get_grob_property ("heads")));
}
else
return first_head (me);
int
-Stem::heads_i (Score_element*me)
+Stem::heads_i (Grob*me)
{
return Pointer_group_interface::count (me, "heads");
}
/*
The note head which forms one end of the stem.
*/
-Score_element*
-Stem::first_head (Score_element*me)
+Grob*
+Stem::first_head (Grob*me)
{
return extremal_heads (me)[-get_direction (me)];
}
/*
START is part where stem reaches `last' head.
*/
-Drul_array<Score_element*>
-Stem::extremal_heads (Score_element*me)
+Drul_array<Grob*>
+Stem::extremal_heads (Grob*me)
{
const int inf = 1000000;
Drul_array<int> extpos;
extpos[DOWN] = inf;
extpos[UP] = -inf;
- Drul_array<Score_element *> exthead;
+ Drul_array<Grob *> exthead;
exthead[LEFT] = exthead[RIGHT] =0;
- for (SCM s = me->get_elt_property ("heads"); gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s))
{
- Score_element * n = unsmob_element (gh_car (s));
+ Grob * n = unsmob_grob (ly_car (s));
- int p = int(Staff_symbol_referencer::position_f (n));
+ int p = int (Staff_symbol_referencer::position_f (n));
Direction d = LEFT;
do {
return exthead;
}
+static int
+icmp (int const &a, int const &b)
+{
+ return a-b;
+}
+
+Array<int>
+Stem::note_head_positions (Grob *me)
+{
+ Array<int> ps ;
+ for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s))
+ {
+ Grob * n = unsmob_grob (ly_car (s));
+ int p = int (Staff_symbol_referencer::position_f (n));
+
+ ps.push (p);
+ }
+
+ ps.sort (icmp);
+ return ps;
+}
+
+
void
-Stem::add_head (Score_element*me, Score_element *n)
+Stem::add_head (Grob*me, Grob *n)
{
- n->set_elt_property ("stem", me->self_scm ());
+ n->set_grob_property ("stem", me->self_scm ());
n->add_dependency (me);
if (Note_head::has_interface (n))
{
- Pointer_group_interface::add_element (me, "heads",n);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n);
}
else
{
- n->set_elt_property ("rest", n->self_scm ());
+ n->set_grob_property ("rest", n->self_scm ());
}
}
bool
-Stem::invisible_b (Score_element*me)
+Stem::invisible_b (Grob*me)
{
- return !(heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1);
+ return ! (heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1);
}
int
-Stem::get_center_distance (Score_element*me, Direction d)
+Stem::get_center_distance (Grob*me, Direction d)
{
int staff_center = 0;
- int distance = (int) (d*(head_positions(me)[d] - staff_center));
+ int distance = (int) (d* (head_positions (me)[d] - staff_center));
return distance >? 0;
}
Direction
-Stem::get_default_dir (Score_element*me)
+Stem::get_default_dir (Grob*me)
{
int du = get_center_distance (me,UP);
int dd = get_center_distance (me,DOWN);
if (sign (dd - du))
return Direction (sign (dd -du));
- return to_dir (me->get_elt_property ("default-neutral-direction"));
+ return to_dir (me->get_grob_property ("neutral-direction"));
}
Real
-Stem::get_default_stem_end_position (Score_element*me)
+Stem::get_default_stem_end_position (Grob*me)
{
- bool grace_b = to_boolean (me->get_elt_property ("grace"));
+ bool grace_b = to_boolean (me->get_grob_property ("grace"));
SCM s;
Array<Real> a;
Real length_f = 0.;
- SCM scm_len = me->get_elt_property("length");
+ SCM scm_len = me->get_grob_property ("length");
if (gh_number_p (scm_len))
{
length_f = gh_scm2double (scm_len);
}
else
{
- s = me->get_elt_property("lengths");
- for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
- a.push (gh_scm2double (gh_car (q)));
+ s = me->get_grob_property ("lengths");
+ for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+ a.push (gh_scm2double (ly_car (q)));
// stem uses half-spaces
- length_f = a[((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ length_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
}
a.clear ();
- s = me->get_elt_property ("stem-shorten");
- for (SCM q = s; gh_pair_p (q); q = gh_cdr (q))
- a.push (gh_scm2double (gh_car (q)));
+ s = me->get_grob_property ("stem-shorten");
+ for (SCM q = s; gh_pair_p (q); q = ly_cdr (q))
+ a.push (gh_scm2double (ly_car (q)));
// stem uses half-spaces
- // fixme: use gh_list_ref () iso. array[]
- Real shorten_f = a[((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
+ // fixme: use scm_list_n_ref () iso. array[]
+ Real shorten_f = a[ ((flag_i (me) - 2) >? 0) <? (a.size () - 1)] * 2;
/* URGURGURG
'set-default-stemlen' sets direction too
stems in unnatural (forced) direction should be shortened,
according to [Roush & Gourlay]
*/
- if (((int)chord_start_f (me))
+ if (( (int)chord_start_f (me))
&& (get_direction (me) != get_default_dir (me)))
length_f -= shorten_f;
+ Interval hp = head_positions (me);
+ Real st = hp[dir] + dir * length_f;
+
- Real st = head_positions(me)[dir] + dir * length_f;
- bool no_extend_b = to_boolean (me->get_elt_property ("no-stem-extend"));
+
+ /*
+ Make a little room if we have a flag and there is a dot.
+
+ TODO:
+
+ maybe we should consider moving the dot to the right?
+ */
+ if (!beam_l (me)
+ && flag_i (me))
+ {
+ Grob * closest_to_flag = extremal_heads (me)[dir];
+ Grob * dots = closest_to_flag
+ ? Rhythmic_head::dots_l (closest_to_flag ) : 0;
+
+ if (dots)
+ {
+ Real dp = Staff_symbol_referencer::position_f (dots);
+ Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2; // should divide by staffspace
+
+ /*
+ Very gory: add myself to the X-support of the parent,
+ which should be a dot-column.
+ */
+ if (dir * (st + flagy - dp) < 0.5)
+ Side_position_interface::add_support (dots->get_parent (X_AXIS), me);
+
+ /*
+ previous approach was to lengthen the stem. This is not
+ good typesetting practice. */
+ }
+ }
+
+
+ bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend"));
if (!grace_b && !no_extend_b && dir * st < 0) // junkme?
st = 0.0;
return st;
}
+
+
/*
Number of hooks on the flag, ie. the log of the duration.
*/
int
-Stem::flag_i (Score_element*me)
+Stem::flag_i (Grob*me)
{
- SCM s = me->get_elt_property ("duration-log");
- return (gh_number_p (s)) ? gh_scm2int (s) : 2;
+ SCM s = me->get_grob_property ("duration-log");
+ return (gh_number_p (s)) ? gh_scm2int (s) : 2;
}
void
-Stem::position_noteheads (Score_element*me)
+Stem::position_noteheads (Grob*me)
{
if (!heads_i (me))
return;
- Link_array<Score_element> heads =
- Pointer_group_interface__extract_elements (me, (Score_element*)0, "heads");
+ Link_array<Grob> heads =
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "heads");
heads.sort (compare_position);
Direction dir =get_direction (me);
heads.reverse ();
- Score_element *hed = support_head (me);
- Real w = hed->extent (hed, X_AXIS)[dir];
+ Grob *hed = support_head (me);
+ Real w = Note_head::head_extent (hed,X_AXIS)[dir];
for (int i=0; i < heads.size (); i++)
{
- heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir], X_AXIS);
+ heads[i]->translate_axis (w - Note_head::head_extent (heads[i],X_AXIS)[dir],
+ X_AXIS);
}
bool parity= true; // todo: make me settable.
{
if (parity)
{
- Real l = heads[i]->extent (heads[i], X_AXIS).length ();
+ Real l = Note_head::head_extent (heads[i], X_AXIS).length ();
+
heads[i]->translate_axis (l * get_direction (me), X_AXIS);
}
parity = !parity;
}
}
-MAKE_SCHEME_CALLBACK(Stem,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Stem,before_line_breaking,1);
SCM
Stem::before_line_breaking (SCM smob)
{
- Score_element*me = unsmob_element (smob);
+ Grob*me = unsmob_grob (smob);
stem_end_position (me); // ugh. Trigger direction calc.
position_noteheads (me);
if (invisible_b (me))
{
- me->remove_elt_property ("molecule-callback");
- // suicide();
+ me->remove_grob_property ("molecule-callback");
+ // suicide ();
}
- set_spacing_hints (me);
return SCM_UNSPECIFIED;
}
-
-
-/**
- set stem directions for hinting the optical spacing correction.
-
- Modifies DIR_LIST property of the Stem's Paper_column
-
- TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities
+/*
+ ugh.
+ When in a beam with tuplet brackets, brew_mol is called early,
+ caching a wrong value.
*/
-void
-Stem::set_spacing_hints (Score_element*me)
+MAKE_SCHEME_CALLBACK (Stem, height, 2);
+SCM
+Stem::height (SCM smob, SCM ax)
{
- if (!invisible_b (me))
- {
- SCM scmdir = gh_int2scm (get_direction (me));
-
- Item* item = dynamic_cast<Item*> (me);
- Item * col = item->column_l ();
- SCM dirlist =col->get_elt_property ("dir-list");
- if (scm_sloppy_memq (scmdir, dirlist) == SCM_BOOL_F)
- {
- dirlist = gh_cons (scmdir, dirlist);
- col->set_elt_property ("dir-list", dirlist);
- }
- }
+ Axis a = (Axis)gh_scm2int (ax);
+ Grob * me = unsmob_grob (smob);
+ assert (a == Y_AXIS);
+
+ SCM mol = me->get_uncached_molecule ();
+ Interval iv;
+ if (mol != SCM_EOL)
+ iv = unsmob_molecule (mol)->extent (a);
+ return ly_interval2scm (iv);
}
+
Molecule
-Stem::flag (Score_element*me)
+Stem::flag (Grob*me)
{
- String style;
- SCM st = me->get_elt_property ("flag-style");
- if ( gh_string_p (st))
+ /* TODO: rename flag-style into something more appropriate,
+ e.g. "stroke-style", maybe with values "" (i.e. no stroke),
+ "single" and "double". Needs more discussion.
+ */
+ String style, fstyle, staffline_offs;
+ SCM fst = me->get_grob_property ("flag-style");
+ if (gh_string_p (fst))
{
- style = ly_scm2string (st);
+ fstyle = ly_scm2string (fst);
}
+ SCM st = me->get_grob_property ("style");
+ if (gh_symbol_p (st))
+ {
+ style = (ly_scm2string (scm_symbol_to_string (st)));
+ }
+ else
+ {
+ style = "";
+ }
+ bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline"));
+
+ if (String::compare_i (style, "mensural") == 0)
+ /* Mensural notation: For notes on staff lines, use different
+ flags than for notes between staff lines. The idea is that
+ flags are always vertically aligned with the staff lines,
+ regardless if the note head is on a staff line or between two
+ staff lines. In other words, the inner end of a flag always
+ touches a staff line.
+ */
+ {
+ if (adjust)
+ {
+ /* Urrgh! We have to detect wether this stem ends on a staff
+ line or between two staff lines. But we can not call
+ stem_end_position(me) or get_default_stem_end_position(me),
+ since this encounters the flag and hence results in an
+ infinite recursion. However, in pure mensural notation,
+ there are no multiple note heads attached to a single stem,
+ neither is there usually need for using the stem_shorten
+ property (except for 32th and 64th notes, but that is not a
+ problem since the stem length in this case is augmented by
+ an integral multiple of staff_space). Hence, it should be
+ sufficient to just take the first note head, assume it's
+ the only one, look if it's on a staff line, and select the
+ flag's shape accordingly. In the worst case, the shape
+ looks slightly misplaced, but that will usually be the
+ programmer's fault (e.g. when trying to attach multiple
+ note heads to a single stem in mensural notation). */
+ Grob *first = first_head(me);
+ int sz = Staff_symbol_referencer::line_count (me)-1;
+ int p = (int)rint (Staff_symbol_referencer::position_f (first));
+ staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0";
+ }
+ else
+ {
+ staffline_offs = "2";
+ }
+ }
+ else
+ {
+ staffline_offs = "";
+ }
char c = (get_direction (me) == UP) ? 'u' : 'd';
- Molecule m = me->lookup_l ()->afm_find (String ("flags-") + to_str (c) +
- to_str (flag_i (me)));
- if (!style.empty_b ())
- m.add_molecule(me->lookup_l ()->afm_find (String ("flags-") + to_str (c) + style));
+ String index_str
+ = String ("flags-") + style + to_str (c) + staffline_offs + to_str (flag_i (me));
+ Molecule m
+ = Font_interface::get_default_font (me)->find_by_name (index_str);
+ if (!fstyle.empty_b ())
+ m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + fstyle));
return m;
}
-MAKE_SCHEME_CALLBACK(Stem,dim_callback,2);
+MAKE_SCHEME_CALLBACK (Stem,dim_callback,2);
SCM
-Stem::dim_callback (SCM e, SCM )
+Stem::dim_callback (SCM e, SCM ax)
{
- Score_element *se = unsmob_element (e);
+ Axis a = (Axis) gh_scm2int (ax);
+ assert (a == X_AXIS);
+ Grob *se = unsmob_grob (e);
Interval r (0, 0);
- if (unsmob_element (se->get_elt_property ("beam")) || abs (flag_i (se)) <= 2)
+ if (unsmob_grob (se->get_grob_property ("beam")) || abs (flag_i (se)) <= 2)
; // TODO!
else
{
r = flag (se).extent (X_AXIS);
}
- return ly_interval2scm ( r);
+ return ly_interval2scm (r);
}
+
-const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Should be settable.
-
-
-MAKE_SCHEME_CALLBACK(Stem,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
SCM
Stem::brew_molecule (SCM smob)
{
- Score_element*me = unsmob_element (smob);
+ Grob*me = unsmob_grob (smob);
Molecule mol;
Direction d = get_direction (me);
Real y1 = Staff_symbol_referencer::position_f (first_head (me));
Real y2 = stem_end_position (me);
- Interval stem_y(y1,y2);
- stem_y.unite (Interval (y2,y1));
+ Interval stem_y (y1 <? y2,y2 >? y1);
- Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
- Real head_wid = 0;
-
- if (Score_element *hed = support_head (me))
- head_wid = hed->extent (hed,X_AXIS).length ();
- stem_y[Direction(-d)] += d * head_wid * tan(ANGLE)/(2*dy);
+
+ // dy?
+ Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
+
+ if (Grob *hed = support_head (me))
+ {
+ /*
+ must not take ledgers into account.
+ */
+ Interval head_height = Note_head::head_extent (hed,Y_AXIS);
+ Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS);
+
+ y_attach = head_height.linear_combination (y_attach);
+ stem_y[Direction (-d)] += d * y_attach/dy;
+ }
if (!invisible_b (me))
{
- Real stem_width = gh_scm2double (me->get_elt_property ("thickness")) * me->paper_l ()->get_var ("stafflinethickness");
- Molecule ss =me->lookup_l ()->filledbox (Box (Interval (-stem_width/2, stem_width/2),
- Interval (stem_y[DOWN]*dy, stem_y[UP]*dy)));
+ Real stem_width = gh_scm2double (me->get_grob_property ("thickness"))
+ // URG
+ * me->paper_l ()->get_var ("stafflinethickness");
+
+ Molecule ss =Lookup::filledbox (Box (Interval (-stem_width/2, stem_width/2),
+ Interval (stem_y[DOWN]*dy, stem_y[UP]*dy)));
mol.add_molecule (ss);
}
if (!beam_l (me) && abs (flag_i (me)) > 2)
{
Molecule fl = flag (me);
- fl.translate_axis(stem_y[d]*dy, Y_AXIS);
+ fl.translate_axis (stem_y[d]*dy, Y_AXIS);
mol.add_molecule (fl);
}
- return mol.create_scheme();
+ return mol.smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK(Stem,off_callback,2);
+/*
+ move the stem to right of the notehead if it is up.
+ */
+MAKE_SCHEME_CALLBACK (Stem,off_callback,2);
SCM
-Stem::off_callback (SCM element_smob, SCM )
+Stem::off_callback (SCM element_smob, SCM)
{
- Score_element *me = unsmob_element (element_smob);
+ Grob *me = unsmob_grob (element_smob);
Real r=0;
- if (Score_element * f = first_head (me))
+ if (Grob * f = first_head (me))
{
- Interval head_wid(0, f->extent (f,X_AXIS).length ());
+ Interval head_wid = Note_head::head_extent(f, X_AXIS);
+
+ Real attach =
+ Note_head::stem_attachment_coordinate(f, X_AXIS);
- if (to_boolean (me->get_elt_property ("stem-centered")))
- return gh_double2scm ( head_wid.center ());
-
- Real rule_thick = gh_scm2double (me->get_elt_property ("thickness")) * me->paper_l ()->get_var ("stafflinethickness");
Direction d = get_direction (me);
- r = head_wid[d] - d * rule_thick ;
+
+ Real real_attach = head_wid.linear_combination (d * attach);
+
+ r = real_attach;
+
+ /*
+ If not centered: correct for stem thickness.
+ */
+ if (attach)
+ {
+ Real rule_thick
+ = gh_scm2double (me->get_grob_property ("thickness"))
+ * me->paper_l ()->get_var ("stafflinethickness");
+
+
+ r += - d * rule_thick * 0.5;
+ }
}
return gh_double2scm (r);
}
-Score_element*
-Stem::beam_l (Score_element*me)
+Grob*
+Stem::beam_l (Grob*me)
{
- SCM b= me->get_elt_property ("beam");
- return unsmob_element (b);
+ SCM b= me->get_grob_property ("beam");
+ return unsmob_grob (b);
}
// ugh still very long.
Stem_info
-Stem::calc_stem_info (Score_element*me)
+Stem::calc_stem_info (Grob*me)
{
- Score_element * beam = beam_l (me);
+ Grob * beam = beam_l (me);
Direction beam_dir = Directional_element_interface::get (beam);
if (!beam_dir)
int multiplicity = Beam::get_multiplicity (beam);
- SCM space_proc = beam->get_elt_property ("space-function");
+ SCM space_proc = beam->get_grob_property ("space-function");
SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity));
Real interbeam_f = gh_scm2double (space) * staff_space;
- Real thick = gh_scm2double (beam->get_elt_property ("thickness"));
+ Real thick = gh_scm2double (beam->get_grob_property ("thickness"));
Stem_info info;
info.idealy_f_ = chord_start_f (me);
// for simplicity, we calculate as if dir == UP
info.idealy_f_ *= beam_dir;
- SCM grace_prop = me->get_elt_property ("grace");
+ SCM grace_prop = me->get_grob_property ("grace");
bool grace_b = to_boolean (grace_prop);
Array<Real> a;
SCM s;
- s = me->get_elt_property("beamed-minimum-lengths");
+ s = me->get_grob_property ("beamed-minimum-lengths");
a.clear ();
- for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
- a.push (gh_scm2double (gh_car (q)));
+ for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+ a.push (gh_scm2double (ly_car (q)));
Real minimum_length = a[multiplicity <? (a.size () - 1)] * staff_space;
- s = me->get_elt_property ("beamed-lengths");
+ s = me->get_grob_property ("beamed-lengths");
- a.clear();
- for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
- a.push (gh_scm2double (gh_car (q)));
+ a.clear ();
+ for (SCM q = s; q != SCM_EOL; q = ly_cdr (q))
+ a.push (gh_scm2double (ly_car (q)));
Real stem_length = a[multiplicity <? (a.size () - 1)] * staff_space;
than middle staffline, just as normal stems.
*/
- bool no_extend_b = to_boolean (me->get_elt_property ("no-stem-extend"));
+ bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend"));
if (!grace_b && !no_extend_b)
{
/* highest beam of (UP) beam must never be lower than middle
info.idealy_f_ = (info.maxy_f_ <? info.idealy_f_) >? info.miny_f_;
- s = beam->get_elt_property ("shorten");
+ s = beam->get_grob_property ("shorten");
if (gh_number_p (s))
info.idealy_f_ -= gh_scm2double (s);
- Real interstaff_f = -beam_dir* calc_interstaff_dist (dynamic_cast<Item*> (me), dynamic_cast<Spanner*> (beam));
+ Grob *common = me->common_refpoint (beam, Y_AXIS);
+ Real interstaff_f = beam_dir *
+ (me->relative_coordinate (common, Y_AXIS)
+ - beam->relative_coordinate (common, Y_AXIS));
info.idealy_f_ += interstaff_f;
info.miny_f_ += interstaff_f;
}
bool
-Stem::has_interface (Score_element*m)
+Stem::has_interface (Grob*m)
{
return m && m->has_interface (ly_symbol2scm ("stem-interface"));
}
void
-Stem::set_interface (Score_element*me)
+Stem::set_interface (Grob*me)
{
me->set_interface (ly_symbol2scm ("stem-interface"));
}
projects / lilypond.git / blobdiff