source file of the GNU LilyPond music typesetter
- (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
Stem-end, chord-start, etc. is all confusing naming.
*/
+#include "stem.hh"
+
#include <math.h> // rint
#include "lookup.hh"
#include "directional-element-interface.hh"
#include "note-head.hh"
-#include "stem.hh"
#include "warn.hh"
#include "output-def.hh"
#include "rhythmic-head.hh"
#include "font-interface.hh"
-#include "stencil.hh"
#include "paper-column.hh"
#include "misc.hh"
#include "beam.hh"
#include "rest.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "spanner.hh"
#include "side-position-interface.hh"
#include "dot-column.hh"
#include "stem-tremolo.hh"
{
SCM pair = me->get_property ("beaming");
- if (!ly_c_pair_p (pair))
+ if (!scm_is_pair (pair))
{
pair = scm_cons (SCM_EOL, SCM_EOL);
me->set_property ("beaming", pair);
index_set_cell (pair, d, lst);
}
+int
+Stem::get_beaming (Grob *me, Direction d)
+{
+ SCM pair = me->get_property ("beaming");
+ if (!scm_is_pair (pair))
+ return 0;
+
+ SCM lst = index_get_cell (pair, d);
+ return scm_ilength (lst);
+}
+
Interval
Stem::head_positions (Grob *me)
{
if (head_count (me))
{
- Drul_array<Grob*> e (extremal_heads (me));
+ Drul_array<Grob *> e (extremal_heads (me));
return Interval (Staff_symbol_referencer::get_position (e[DOWN]),
Staff_symbol_referencer::get_position (e[UP]));
}
{
SCM p = me->get_property ("stem-end-position");
Real pos;
- if (!ly_c_number_p (p))
+ if (!scm_is_number (p))
{
pos = get_default_stem_end_position (me);
me->set_property ("stem-end-position", scm_make_real (pos));
}
else
- pos = ly_scm2double (p);
+ pos = scm_to_double (p);
return pos;
}
// todo: margins
Direction d = get_direction (me);
- if (d && d * head_positions (me)[get_direction (me)] >= se*d)
- me->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_property ("stem-end-position", scm_make_real (se));
}
Grob *
Stem::support_head (Grob *me)
{
- if (head_count (me) == 1)
- /* UGH. */
- return unsmob_grob (ly_car (me->get_property ("note-heads")));
+ extract_grob_set (me, "note-heads", heads);
+ if (heads.size () == 1)
+ return heads[0];
+
return first_head (me);
}
int
Stem::head_count (Grob *me)
{
- return Pointer_group_interface::count (me, "note-heads");
+ return Pointer_group_interface::count (me, ly_symbol2scm ("note-heads"));
}
/* The note head which forms one end of the stem.
Direction d = get_direction (me);
if (d)
return extremal_heads (me)[d];
- return 0;
+ return 0;
}
-/* START is part where stem reaches `last' head.
-
-This function returns a drul with (bottom-head, top-head).
+/*
+ START is part where stem reaches `last' head.
+ This function returns a drul with (bottom-head, top-head).
*/
-Drul_array<Grob*>
+Drul_array<Grob *>
Stem::extremal_heads (Grob *me)
{
const int inf = 1000000;
extpos[DOWN] = inf;
extpos[UP] = -inf;
- Drul_array<Grob *> exthead;
- exthead[LEFT] = exthead[RIGHT] =0;
-
- for (SCM s = me->get_property ("note-heads"); ly_c_pair_p (s);
- s = ly_cdr (s))
+ Drul_array<Grob *> exthead (0, 0);
+ extract_grob_set (me, "note-heads", heads);
+
+ for (int i = heads.size (); i--;)
{
- Grob *n = unsmob_grob (ly_car (s));
+ Grob *n = heads[i];
int p = Staff_symbol_referencer::get_rounded_position (n);
Direction d = LEFT;
exthead[d] = n;
extpos[d] = p;
}
- } while (flip (&d) != DOWN);
+ }
+ while (flip (&d) != DOWN);
}
return exthead;
}
static int
-icmp (int const &a, int const &b)
+integer_compare (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_property ("note-heads"); ly_c_pair_p (s);
- s = ly_cdr (s))
+ Array<int> ps;
+ extract_grob_set (me, "note-heads", heads);
+
+ for (int i = heads.size (); i--;)
{
- Grob *n = unsmob_grob (ly_car (s));
+ Grob *n = heads[i];
int p = Staff_symbol_referencer::get_rounded_position (n);
ps.push (p);
}
- ps.sort (icmp);
+ ps.sort (integer_compare);
return ps;
}
void
Stem::add_head (Grob *me, Grob *n)
{
- n->set_property ("stem", me->self_scm ());
+ n->set_object ("stem", me->self_scm ());
n->add_dependency (me);
- /* TODO: why not store Rest pointers? */
if (Note_head::has_interface (n))
Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), n);
+ else if (Rest::has_interface (n))
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("rests"), n);
}
bool
Stem::is_invisible (Grob *me)
{
- return !(head_count (me)
- && ly_scm2int (me->get_property ("duration-log")) >= 1);
+ Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"),
+ 0.0);
+
+ return !((head_count (me)
+ || stemlet_length > 0.0)
+ && scm_to_int (me->get_property ("duration-log")) >= 1);
}
Direction
if (hp.is_empty ())
return CENTER;
- int udistance = (int) (UP * hp[UP] - staff_center);
- int ddistance = (int) (DOWN * hp[DOWN] - staff_center);
+ int udistance = (int) (UP *hp[UP] - staff_center);
+ int ddistance = (int) (DOWN *hp[DOWN] - staff_center);
if (sign (ddistance - udistance))
return Direction (sign (ddistance - udistance));
/* WARNING: IN HALF SPACES */
Real length = 7;
SCM scm_len = me->get_property ("length");
- if (ly_c_number_p (scm_len))
- length = ly_scm2double (scm_len);
+ if (scm_is_number (scm_len))
+ length = scm_to_double (scm_len);
else
{
s = me->get_property ("lengths");
- if (ly_c_pair_p (s))
- length = 2 * ly_scm2double (robust_list_ref (durlog - 2, s));
+ if (scm_is_pair (s))
+ length = 2 * scm_to_double (robust_list_ref (durlog - 2, s));
}
/* URGURGURG
if (dir && dir * hp[dir] >= 0)
{
SCM sshorten = me->get_property ("stem-shorten");
- SCM scm_shorten = ly_c_pair_p (sshorten) ?
- robust_list_ref ((duration_log (me) - 2) >? 0, sshorten): SCM_EOL;
- Real shorten = 2* robust_scm2double (scm_shorten,0);
+ SCM scm_shorten = scm_is_pair (sshorten)
+ ? robust_list_ref (max (duration_log (me) - 2, 0), sshorten) : SCM_EOL;
+ Real shorten = 2* robust_scm2double (scm_shorten, 0);
/* On boundary: shorten only half */
if (abs (head_positions (me)[dir]) <= 1)
}
/* Tremolo stuff. */
- Grob *t_flag = unsmob_grob (me->get_property ("tremolo-flag"));
- if (t_flag && !unsmob_grob (me->get_property ("beam")))
+ Grob *t_flag = unsmob_grob (me->get_object ("tremolo-flag"));
+ if (t_flag && !unsmob_grob (me->get_object ("beam")))
{
/* Crude hack: add extra space if tremolo flag is there.
- We can't do this for the beam, since we get into a loop
- (Stem_tremolo::raw_stencil () looks at the beam.) --hwn */
+ We can't do this for the beam, since we get into a loop
+ (Stem_tremolo::raw_stencil () looks at the beam.) --hwn */
Real minlen = 1.0
- + 2 * Stem_tremolo::raw_stencil (t_flag).extent (Y_AXIS).length ()
+ + 2 * Stem_tremolo::raw_stencil (t_flag).extent (Y_AXIS).length ()
/ ss;
if (durlog >= 3)
if (dir == DOWN)
minlen -= 1.0;
}
- length = length >? (minlen + 1.0);
+ length = max (length, minlen + 1.0);
}
Real st = dir ? hp[dir] + dir * length : 0;
if (!get_beam (me) && dir == UP
&& durlog > 2)
{
- Grob * closest_to_flag = extremal_heads (me)[dir];
- Grob * dots = closest_to_flag
- ? Rhythmic_head::get_dots (closest_to_flag ) : 0;
+ Grob *closest_to_flag = extremal_heads (me)[dir];
+ Grob *dots = closest_to_flag
+ ? Rhythmic_head::get_dots (closest_to_flag) : 0;
if (dots)
{
/* Very gory: add myself to the X-support of the parent,
which should be a dot-column. */
- if (dir * (st + flagy - dp) < 0.5)
+ if (dir * (st + flagy - dp) < 0.5)
{
Grob *par = dots->get_parent (X_AXIS);
Stem::duration_log (Grob *me)
{
SCM s = me->get_property ("duration-log");
- return (ly_c_number_p (s)) ? ly_scm2int (s) : 2;
+ return (scm_is_number (s)) ? scm_to_int (s) : 2;
}
void
if (!head_count (me))
return;
- Link_array<Grob> heads =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "note-heads");
-
+ extract_grob_set (me, "note-heads", ro_heads);
+ Link_array<Grob> heads (ro_heads);
heads.sort (compare_position);
- Direction dir =get_direction (me);
+ Direction dir = get_direction (me);
if (dir < 0)
heads.reverse ();
Real thick = thickness (me);
Grob *hed = support_head (me);
- Real w = Note_head::head_extent (hed,X_AXIS)[dir];
+ Real w = hed->extent (hed, X_AXIS)[dir];
for (int i = 0; i < heads.size (); i++)
- heads[i]->translate_axis (w - Note_head::head_extent (heads[i],
- X_AXIS)[dir],
+ heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir],
X_AXIS);
bool parity = true;
Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0]));
- for (int i = 1; i < heads.size (); i ++)
+ for (int i = 1; i < heads.size (); i++)
{
Real p = Staff_symbol_referencer::get_position (heads[i]);
- Real dy =fabs (lastpos- p);
+ Real dy = fabs (lastpos- p);
/*
- dy should always be 0.5, 0.0, 1.0, but provide safety margin
- for rounding errors.
+ dy should always be 0.5, 0.0, 1.0, but provide safety margin
+ for rounding errors.
*/
- if (dy < 1.1)
+ if (dy < 1.1)
{
if (parity)
{
- Real ell = Note_head::head_extent (heads[i], X_AXIS).length ();
+ Real ell = heads[i]->extent (heads[i], X_AXIS).length ();
Direction d = get_direction (me);
/*
heads[i]->translate_axis (-thick * (2 - reverse_overlap) * d,
X_AXIS);
- /* TODO:
-
+ /* TODO:
+
For some cases we should kern some more: when the
distance between the next or prev note is too large, we'd
get large white gaps, eg.
-
- |
+
+ |
X|
- |X <- kern this.
- |
+ |X <- kern this.
+ |
X
-
+
*/
}
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)
{
/*
Do the calculations for visible stems, but also for invisible stems
with note heads (i.e. half notes.)
- */
+ */
if (head_count (me))
{
stem_end_position (me); // ugh. Trigger direction calc.
position_noteheads (me);
}
- else
- me->set_property ("print-function", SCM_EOL);
-
+
return SCM_UNSPECIFIED;
}
ugh.
When in a beam with tuplet brackets, brew_mol is called early,
caching a wrong value.
- */
+*/
MAKE_SCHEME_CALLBACK (Stem, height, 2);
SCM
Stem::height (SCM smob, SCM ax)
{
- Axis a = (Axis)ly_scm2int (ax);
+ Axis a = (Axis)scm_to_int (ax);
Grob *me = unsmob_grob (smob);
assert (a == Y_AXIS);
+ /*
+ ugh. - this dependency should be automatic.
+ */
+ Grob *beam = get_beam (me);
+ if (beam)
+ {
+ Beam::after_line_breaking (beam->self_scm ());
+ }
+
SCM mol = me->get_uncached_stencil ();
Interval iv;
if (mol != SCM_EOL)
iv = unsmob_stencil (mol)->extent (a);
- if (Grob *b =get_beam (me))
+ if (Grob *b = get_beam (me))
{
Direction d = get_direction (me);
- iv[d] += d * Beam::get_thickness (b) * 0.5 ;
+ if (d == CENTER)
+ {
+ programming_error ("no stem direction");
+ d = UP;
+ }
+ iv[d] += d * Beam::get_thickness (b) * 0.5;
}
return ly_interval2scm (iv);
}
-
Stencil
Stem::flag (Grob *me)
{
String flag_style;
SCM flag_style_scm = me->get_property ("flag-style");
- if (ly_c_symbol_p (flag_style_scm))
+ if (scm_is_symbol (flag_style_scm))
flag_style = ly_symbol2string (flag_style_scm);
-
+
if (flag_style == "no-flag")
return Stencil ();
*/
{
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).
- */
-
- /*
- perhaps the detection whether this correction is needed should
- happen in a different place to avoid the recursion.
-
- --hwn.
- */
- int p = Staff_symbol_referencer::get_rounded_position (me);
- staffline_offs = Staff_symbol_referencer::on_staffline (me, p)
- ? "1" : "0";
+ {
+ int p = (int) (rint (stem_end_position (me)));
+ staffline_offs
+ = Staff_symbol_referencer::on_staffline (me, p) ? "0" : "1";
}
else
- {
+ {
staffline_offs = "2";
}
}
String font_char = flag_style
+ to_string (dir) + staffline_offs + to_string (duration_log (me));
Font_metric *fm = Font_interface::get_default_font (me);
- Stencil flag = fm->find_by_name ("flags-" + font_char);
+ Stencil flag = fm->find_by_name ("flags." + font_char);
if (flag.is_empty ())
me->warning (_f ("flag `%s' not found", font_char));
SCM stroke_style_scm = me->get_property ("stroke-style");
- if (ly_c_string_p (stroke_style_scm))
+ if (scm_is_string (stroke_style_scm))
{
String stroke_style = ly_scm2string (stroke_style_scm);
if (!stroke_style.is_empty ())
{
String font_char = to_string (dir) + stroke_style;
- Stencil stroke = fm->find_by_name ("flags-" + font_char);
+ Stencil stroke = fm->find_by_name ("flags." + font_char);
if (stroke.is_empty ())
me->warning (_f ("flag stroke `%s' not found", font_char));
else
return flag;
}
-MAKE_SCHEME_CALLBACK (Stem,dim_callback,2);
+MAKE_SCHEME_CALLBACK (Stem, width_callback, 2);
SCM
-Stem::dim_callback (SCM e, SCM ax)
+Stem::width_callback (SCM e, SCM ax)
{
- Axis a = (Axis) ly_scm2int (ax);
- assert (a == X_AXIS);
+ (void) ax;
+ assert (scm_to_int (ax) == X_AXIS);
Grob *me = unsmob_grob (e);
- Interval r (0, 0);
- if (unsmob_grob (me->get_property ("beam")) || abs (duration_log (me)) <= 2)
- ; // TODO!
+
+ Interval r;
+
+ if (is_invisible (me))
+ {
+ r.set_empty ();
+ }
+ else if (unsmob_grob (me->get_object ("beam")) || abs (duration_log (me)) <= 2)
+ {
+ r = Interval (-1, 1);
+ r *= thickness (me) / 2;
+ }
else
- r = flag (me).extent (X_AXIS)
- + thickness (me)/2;
+ {
+ r = Interval (-1,1) * thickness (me) * 0.5;
+ r.unite (flag (me).extent (X_AXIS));
+ }
return ly_interval2scm (r);
}
Real
Stem::thickness (Grob *me)
{
- return ly_scm2double (me->get_property ("thickness"))
+ return scm_to_double (me->get_property ("thickness"))
* Staff_symbol_referencer::line_thickness (me);
}
Stencil mol;
Direction d = get_direction (me);
+ Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"),
+ 0.0);
+ bool stemlet = stemlet_length > 0.0;
+
/* TODO: make the stem start a direction ?
This is required to avoid stems passing in tablature chords. */
- Grob *lh = to_boolean (me->get_property ("avoid-note-head"))
- ? last_head (me) : lh = first_head (me);
+ Grob *lh
+ = to_boolean (me->get_property ("avoid-note-head"))
+ ? last_head (me)
+ : first_head (me);
+ Grob *beam = get_beam (me);
+
+ if (!lh && !stemlet)
+ return SCM_EOL;
- if (!lh)
+ if (!lh && stemlet && !beam)
return SCM_EOL;
if (is_invisible (me))
return SCM_EOL;
- Real y1 = Staff_symbol_referencer::get_position (lh);
Real y2 = stem_end_position (me);
+ Real y1 = y2;
+ Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
- Interval stem_y (y1 <? y2,y2 >? y1);
+ if (lh)
+ y2 = Staff_symbol_referencer::get_position (lh);
+ else if (stemlet)
+ {
+ Real beam_translation = Beam::get_beam_translation (beam);
+ Real beam_thickness = Beam::get_thickness (beam);
+ int beam_count = beam_multiplicity (me).length () + 1;
+
+ y2 -= d
+ * (0.5 * beam_thickness
+ + beam_translation * max (0, (beam_count - 1))
+ + stemlet_length) / half_space;
+ }
- // dy?
- Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
+ Interval stem_y (min (y1, y2), max (y2, y1));
if (Grob *hed = support_head (me))
{
/*
must not take ledgers into account.
- */
- Interval head_height = Note_head::head_extent (hed,Y_AXIS);
+ */
+ Interval head_height = hed->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;
+ stem_y[Direction (-d)] += d * y_attach / half_space;
}
-
// URG
Real stem_width = thickness (me);
- Real blot =
- me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blot
+ = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
- Box b = Box (Interval (-stem_width/2, stem_width/2),
- Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));
+ Box b = Box (Interval (-stem_width / 2, stem_width / 2),
+ Interval (stem_y[DOWN] * half_space, stem_y[UP] * half_space));
Stencil ss = Lookup::round_filled_box (b, blot);
mol.add_stencil (ss);
if (!get_beam (me) && abs (duration_log (me)) > 2)
{
Stencil fl = flag (me);
- fl.translate_axis (stem_y[d]*dy - d * blot/2, Y_AXIS);
- fl.translate_axis (stem_width/2, X_AXIS);
+ fl.translate_axis (stem_y[d] * half_space - d * blot / 2, Y_AXIS);
+ fl.translate_axis (stem_width / 2, X_AXIS);
mol.add_stencil (fl);
}
/*
move the stem to right of the notehead if it is up.
- */
-MAKE_SCHEME_CALLBACK (Stem, off_callback, 2);
+*/
+MAKE_SCHEME_CALLBACK (Stem, offset_callback, 2);
SCM
-Stem::off_callback (SCM element_smob, SCM)
+Stem::offset_callback (SCM element_smob, SCM)
{
Grob *me = unsmob_grob (element_smob);
Real r = 0.0;
-
- if (head_count (me))
- if (Grob *f = first_head (me))
- {
- Interval head_wid = Note_head::head_extent (f, X_AXIS);
- Real attach = 0.0;
-
- if (is_invisible (me))
- attach = 0.0;
- else
+
+ if (Grob *f = first_head (me))
+ {
+ Interval head_wid = f->extent (f, X_AXIS);
+ Real attach = 0.0;
+
+ if (is_invisible (me))
+ attach = 0.0;
+ else
attach = Note_head::stem_attachment_coordinate (f, X_AXIS);
-
- Direction d = get_direction (me);
- Real real_attach = head_wid.linear_combination (d * attach);
- r = real_attach;
-
- /* If not centered: correct for stem thickness. */
- if (attach)
- {
- Real rule_thick = thickness (me);
- r += - d * rule_thick * 0.5;
- }
- }
+
+ Direction d = get_direction (me);
+ Real real_attach = head_wid.linear_combination (d * attach);
+ r = real_attach;
+
+ /* If not centered: correct for stem thickness. */
+ if (attach)
+ {
+ Real rule_thick = thickness (me);
+ r += -d * rule_thick * 0.5;
+ }
+ }
+ else
+ {
+ extract_grob_set (me, "rests", rests);
+ if (rests.size ())
+ {
+ Grob *rest = rests.top ();
+ r = rest->extent (rest, X_AXIS).center ();
+ }
+ }
return scm_make_real (r);
}
-Grob *
+Spanner *
Stem::get_beam (Grob *me)
{
- SCM b = me->get_property ("beam");
- return unsmob_grob (b);
+ SCM b = me->get_object ("beam");
+ return dynamic_cast<Spanner *> (unsmob_grob (b));
}
Stem_info
{
/* Return cached info if available */
SCM scm_info = me->get_property ("stem-info");
- if (!ly_c_pair_p (scm_info))
+ if (!scm_is_pair (scm_info))
{
calc_stem_info (me);
scm_info = me->get_property ("stem-info");
Stem_info si;
si.dir_ = get_grob_direction (me);
- si.ideal_y_ = ly_scm2double (ly_car (scm_info));
- si.shortest_y_ = ly_scm2double (ly_cadr (scm_info));
+ si.ideal_y_ = scm_to_double (scm_car (scm_info));
+ si.shortest_y_ = scm_to_double (scm_cadr (scm_info));
return si;
}
-
/* TODO: add extra space for tremolos! */
void
Stem::calc_stem_info (Grob *me)
if (!my_dir)
{
- programming_error ("No stem dir set?");
- my_dir = UP;
+ programming_error ("no stem dir set");
+ my_dir = UP;
}
Real staff_space = Staff_symbol_referencer::staff_space (me);
Real beam_thickness = Beam::get_thickness (beam);
int beam_count = Beam::get_direction_beam_count (beam, my_dir);
-
/* Simple standard stem length */
SCM lengths = me->get_property ("beamed-lengths");
- Real ideal_length =
- ly_scm2double (robust_list_ref (beam_count - 1,lengths))
-
+ Real ideal_length
+ = scm_to_double (robust_list_ref (beam_count - 1, lengths))
+
* staff_space
- /* stem only extends to center of beam */
+ /* stem only extends to center of beam
+ */
- 0.5 * beam_thickness;
/* Condition: sane minimum free stem length (chord to beams) */
lengths = me->get_property ("beamed-minimum-free-lengths");
- Real ideal_minimum_free =
- ly_scm2double (robust_list_ref (beam_count - 1, lengths))
+ Real ideal_minimum_free
+ = scm_to_double (robust_list_ref (beam_count - 1, lengths))
* staff_space;
-
/* UGH
It seems that also for ideal minimum length, we must use
the maximum beam count (for this direction):
/* stem only extends to center of beam */
- 0.5 * beam_thickness;
- ideal_length = ideal_length >? ideal_minimum_length;
+ ideal_length = max (ideal_length, ideal_minimum_length);
/* Convert to Y position, calculate for dir == UP */
- Real note_start =
- /* staff positions */
+ Real note_start
+ = /* staff positions */
head_positions (me)[my_dir] * 0.5
* my_dir * staff_space;
Real ideal_y = note_start + ideal_length;
-
/* Conditions for Y position */
/* Lowest beam of (UP) beam must never be lower than second staffline
- Reference?
+ Reference?
- Although this (additional) rule is probably correct,
- I expect that highest beam (UP) should also never be lower
- than middle staffline, just as normal stems.
+ Although this (additional) rule is probably correct,
+ I expect that highest beam (UP) should also never be lower
+ than middle staffline, just as normal stems.
- Reference?
+ Reference?
- Obviously not for grace beams.
+ Obviously not for grace beams.
- Also, not for knees. Seems to be a good thing. */
+ Also, not for knees. Seems to be a good thing. */
bool no_extend_b = to_boolean (me->get_property ("no-stem-extend"));
bool is_knee = to_boolean (beam->get_property ("knee"));
if (!no_extend_b && !is_knee)
{
/* Highest beam of (UP) beam must never be lower than middle
staffline */
- ideal_y = ideal_y >? 0;
+ ideal_y = max (ideal_y, 0.0);
/* Lowest beam of (UP) beam must never be lower than second staffline */
- ideal_y = ideal_y >? (-staff_space
- - beam_thickness + height_of_my_beams);
+ ideal_y = max (ideal_y, (-staff_space
+ - beam_thickness + height_of_my_beams));
}
-
ideal_y -= robust_scm2double (beam->get_property ("shorten"), 0);
- Real minimum_free =
- ly_scm2double (robust_list_ref
- (beam_count - 1,
- me->get_property
- ("beamed-extreme-minimum-free-lengths")))
+ Real minimum_free
+ = scm_to_double (robust_list_ref
+ (beam_count - 1,
+ me->get_property
+ ("beamed-extreme-minimum-free-lengths")))
* staff_space;
Real minimum_length = minimum_free
/* stem only extends to center of beam */
- 0.5 * beam_thickness;
+ if (Grob *tremolo = unsmob_grob (me->get_object ("tremolo-flag")))
+ {
+ Interval y_ext = tremolo->extent (tremolo, Y_AXIS);
+ y_ext.widen (0.5); // FIXME. Should be tunable?
+ minimum_length = max (minimum_length, y_ext.length ());
+ }
+
ideal_y *= my_dir;
Real minimum_y = note_start + minimum_length;
Real shortest_y = minimum_y * my_dir;
Slice
Stem::beam_multiplicity (Grob *stem)
{
- SCM beaming= stem->get_property ("beaming");
- Slice le = int_list_to_slice (ly_car (beaming));
- Slice ri = int_list_to_slice (ly_cdr (beaming));
+ SCM beaming = stem->get_property ("beaming");
+ Slice le = int_list_to_slice (scm_car (beaming));
+ Slice ri = int_list_to_slice (scm_cdr (beaming));
le.unite (ri);
return le;
}
-
/* FIXME: Too many properties */
ADD_INTERFACE (Stem, "stem-interface",
"The stem represent the graphical stem. "
"Rests and whole notes have invisible stems.",
"tremolo-flag french-beaming "
"avoid-note-head thickness "
+ "stemlet-length rests "
"stem-info beamed-lengths beamed-minimum-free-lengths "
"beamed-extreme-minimum-free-lengths lengths beam stem-shorten "
"duration-log beaming neutral-direction stem-end-position "
projects / lilypond.git / blobdiff