{
Interval hp = head_positions (me);
if (!hp.is_empty ())
- return hp[get_direction (me)] * Staff_symbol_referencer::staff_space (me)
+ return hp[get_grob_direction (me)] * Staff_symbol_referencer::staff_space (me)
* 0.5;
return 0;
}
-Real
-Stem::stem_end_position (Grob *me)
-{
- SCM p = me->get_property ("stem-end-position");
- Real pos;
- if (!scm_is_number (p))
- {
- pos = get_default_stem_end_position (me);
- me->set_property ("stem-end-position", scm_from_double (pos));
- }
- else
- pos = scm_to_double (p);
-
- return pos;
-}
-
-Direction
-Stem::get_direction (Grob *me)
-{
- Direction d = get_grob_direction (me);
- if (!d)
- {
- d = get_default_dir (me);
- // urg, AAARGH!
- set_grob_direction (me, d);
- }
- return d;
-}
void
Stem::set_stemend (Grob *me, Real se)
{
// todo: margins
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
- if (d && d * head_positions (me)[get_direction (me)] >= se * d)
+ if (d && d * head_positions (me)[get_grob_direction (me)] >= se * d)
me->warning (_ ("weird stem size, check for narrow beams"));
me->set_property ("stem-end-position", scm_from_double (se));
Grob *
Stem::first_head (Grob *me)
{
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
if (d)
return extremal_heads (me)[-d];
return 0;
Grob *
Stem::last_head (Grob *me)
{
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
if (d)
return extremal_heads (me)[d];
return 0;
&& scm_to_int (me->get_property ("duration-log")) >= 1);
}
-Direction
-Stem::get_default_dir (Grob *me)
+MAKE_SCHEME_CALLBACK (Stem, calc_stem_end_position, 1)
+SCM
+Stem::calc_stem_end_position (SCM smob)
{
- int staff_center = 0;
+ Grob *me = unsmob_grob (smob);
+
+ if (!head_count (me))
+ return scm_from_double (0.0);
+
+
+ Real ss = Staff_symbol_referencer::staff_space (me);
+ int durlog = duration_log (me);
+ Array<Real> a;
+
+ /* WARNING: IN HALF SPACES */
+ Real length = robust_scm2double (me->get_property ("length"), 7);
+
+ Direction dir = get_grob_direction (me);
Interval hp = head_positions (me);
- if (hp.is_empty ())
- return CENTER;
+ Real st = dir ? hp[dir] + dir * length : 0;
- int udistance = (int) (UP *hp[UP] - staff_center);
- int ddistance = (int) (DOWN *hp[DOWN] - staff_center);
+ /* TODO: change name to extend-stems to staff/center/'() */
+ bool no_extend_b = to_boolean (me->get_property ("no-stem-extend"));
+ if (!no_extend_b && dir * st < 0)
+ st = 0.0;
+
+ /* Make a little room if we have a upflag and there is a dot.
+ previous approach was to lengthen the stem. This is not
+ good typesetting practice. */
+ 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;
+
+ if (dots)
+ {
+ Real dp = Staff_symbol_referencer::get_position (dots);
+ Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2 / ss;
+
+ /* Very gory: add myself to the X-support of the parent,
+ which should be a dot-column. */
+ if (dir * (st + flagy - dp) < 0.5)
+ {
+ Grob *par = dots->get_parent (X_AXIS);
- if (sign (ddistance - udistance))
- return Direction (sign (ddistance - udistance));
+ if (Dot_column::has_interface (par))
+ {
+ Side_position_interface::add_support (par, me);
- return to_dir (me->get_property ("neutral-direction"));
+ /* TODO: apply some better logic here. The flag is
+ curved inwards, so this will typically be too
+ much. */
+ }
+ }
+ }
+ }
+
+ return scm_from_double (st);
}
-Real
-Stem::get_default_stem_end_position (Grob *me)
+MAKE_SCHEME_CALLBACK (Stem, calc_length, 1)
+SCM
+Stem::calc_length (SCM smob)
{
- Real ss = Staff_symbol_referencer::staff_space (me);
+ Grob *me = unsmob_grob (smob);
+
+ SCM details = me->get_property ("details");
int durlog = duration_log (me);
- SCM s;
- Array<Real> a;
- /* WARNING: IN HALF SPACES */
+ Real ss = Staff_symbol_referencer::staff_space (me);
Real length = 7;
- SCM scm_len = me->get_property ("length");
- if (scm_is_number (scm_len))
- length = scm_to_double (scm_len);
- else
- {
- s = me->get_property ("lengths");
- if (scm_is_pair (s))
- length = 2 * scm_to_double (robust_list_ref (durlog - 2, s));
- }
+ SCM s = scm_cdr (scm_assq (ly_symbol2scm ("lengths"), details));
+ if (scm_is_pair (s))
+ length = 2 * scm_to_double (robust_list_ref (durlog - 2, s));
- /* URGURGURG
- 'set-default-stemlen' sets direction too. */
- Direction dir = get_direction (me);
+ Direction dir = get_grob_direction (me);
/* Stems in unnatural (forced) direction should be shortened,
according to [Roush & Gourlay] */
Interval hp = head_positions (me);
if (dir && dir * hp[dir] >= 0)
{
- SCM sshorten = me->get_property ("stem-shorten");
+ SCM sshorten = scm_cdr (scm_assq (ly_symbol2scm ("stem-shorten"), details));
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);
}
length = max (length, minlen + 1.0);
}
-
- Real st = dir ? hp[dir] + dir * length : 0;
-
- /* TODO: change name to extend-stems to staff/center/'() */
- bool no_extend_b = to_boolean (me->get_property ("no-stem-extend"));
- if (!no_extend_b && dir * st < 0)
- st = 0.0;
-
- /* Make a little room if we have a upflag and there is a dot.
- previous approach was to lengthen the stem. This is not
- good typesetting practice. */
- 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;
-
- if (dots)
- {
- Real dp = Staff_symbol_referencer::get_position (dots);
- Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2 / ss;
-
- /* Very gory: add myself to the X-support of the parent,
- which should be a dot-column. */
- if (dir * (st + flagy - dp) < 0.5)
- {
- Grob *par = dots->get_parent (X_AXIS);
-
- if (Dot_column::has_interface (par))
- {
- Side_position_interface::add_support (par, me);
-
- /* TODO: apply some better logic here. The flag is
- curved inwards, so this will typically be too
- much. */
- }
- }
- }
- }
- return st;
+
+ return scm_from_double (length);
}
-
/* The log of the duration (Number of hooks on the flag minus two) */
int
Stem::duration_log (Grob *me)
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_grob_direction (me);
if (dir < 0)
heads.reverse ();
{
Real ell = heads[i]->extent (heads[i], X_AXIS).length ();
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
/*
Reversed head should be shifted ell-thickness, but this
looks too crowded, so we only shift ell-0.5*thickness.
}
else
dir = get_default_dir (me);
-
+
return scm_from_int (dir);
}
-MAKE_SCHEME_CALLBACK (Stem, calc_stem_end_position, 1);
-SCM
-Stem::calc_stem_end_position (SCM smob)
+Direction
+Stem::get_default_dir (Grob *me)
{
- Grob *me = unsmob_grob (smob);
-
- /*
- Do the calculations for visible stems, but also for invisible stems
- with note heads (i.e. half notes.)
- */
- Real pos = 0.0;
- if (head_count (me))
+ Direction dir = CENTER;
+ int staff_center = 0;
+ Interval hp = head_positions (me);
+ if (!hp.is_empty ())
{
- pos = stem_end_position (me); // ugh. Trigger direction calc.
+ int udistance = (int) (UP *hp[UP] - staff_center);
+ int ddistance = (int) (DOWN *hp[DOWN] - staff_center);
+
+ if (sign (ddistance - udistance))
+ dir = Direction (sign (ddistance - udistance));
+ else
+ dir = to_dir (me->get_property ("neutral-direction"));
}
-
- return scm_from_double (pos);
+ return dir;
}
+
+
MAKE_SCHEME_CALLBACK (Stem, height, 2);
SCM
Stem::height (SCM smob, SCM ax)
return ly_interval2scm (iv);
}
+Real
+Stem::stem_end_position (Grob *me)
+{
+ return robust_scm2double (me->get_property ("stem-end-position"), 0);
+}
+
Stencil
Stem::flag (Grob *me)
{
else
staffline_offs = "";
- char dir = (get_direction (me) == UP) ? 'u' : 'd';
+ char dir = (get_grob_direction (me) == UP) ? 'u' : 'd';
String font_char = flag_style
+ to_string (dir) + staffline_offs + to_string (log);
Font_metric *fm = Font_interface::get_default_font (me);
{
Grob *me = unsmob_grob (smob);
Stencil mol;
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"),
0.0);
if (is_invisible (me))
return SCM_EOL;
- Real y2 = stem_end_position (me);
+ Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0);
Real y1 = y2;
Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
Stencil fl = flag (me);
if (!fl.is_empty ())
{
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
Real blot
= me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
Real stem_width = thickness (me);
Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
- Real y2 = stem_end_position (me);
+ Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0);
fl.translate_axis (y2 * half_space - d * blot / 2, Y_AXIS);
fl.translate_axis (stem_width / 2, X_AXIS);
}
else
attach = Note_head::stem_attachment_coordinate (f, X_AXIS);
- Direction d = get_direction (me);
+ Direction d = get_grob_direction (me);
Real real_attach = head_wid.linear_combination (d * attach);
r = real_attach;
int beam_count = Beam::get_direction_beam_count (beam, my_dir);
/* Simple standard stem length */
- SCM lengths = me->get_property ("beamed-lengths");
+ SCM details = me->get_property ("details");
+ SCM lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-lengths"), details));
Real ideal_length
= scm_to_double (robust_list_ref (beam_count - 1, lengths))
- 0.5 * beam_thickness;
/* Condition: sane minimum free stem length (chord to beams) */
- lengths = me->get_property ("beamed-minimum-free-lengths");
+ lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-minimum-free-lengths"), details));
Real ideal_minimum_free
= scm_to_double (robust_list_ref (beam_count - 1, lengths))
* staff_space;
ideal_y -= robust_scm2double (beam->get_property ("shorten"), 0);
+ SCM bemfl = scm_cdr (scm_assq (ly_symbol2scm ("beamed-extreme-minimum-free-lengths"), details));
+
Real minimum_free
- = scm_to_double (robust_list_ref
- (beam_count - 1,
- me->get_property
- ("beamed-extreme-minimum-free-lengths")))
+ = scm_to_double (robust_list_ref (beam_count - 1, bemfl))
* staff_space;
Real minimum_length = minimum_free
"The stem represent the graphical stem. "
"In addition, it internally connects note heads, beams and"
"tremolos. "
- "Rests and whole notes have invisible stems.",
+ "Rests and whole notes have invisible stems."
+
+ "\n\nThe following properties may be set in the details list."
+ "@table @code\n"
+ "@item beamed-lengths \n"
+ "list of stem lengths given beam multiplicity. \n"
+ "@item beamed-minimum-free-lengths \n"
+ "list of normal minimum free stem lengths (chord to beams) given beam multiplicity.\n"
+ "@item beamed-extreme-minimum-free-lengths\n"
+ "list of extreme minimum free stem lengths (chord to beams) given beam multiplicity.\n"
+ "@item lengths\n"
+ "Default stem lengths. The list gives a length for each flag-count.\n"
+ "@item stem-shorten\n"
+ "How much a stem in a forced direction "
+ "should be shortened. The list gives an amount depending on the number "
+ "of flags/beams."
+ "@end table\n"
+
+ ,
/* properties */
"avoid-note-head "
"beam "
- "beamed-extreme-minimum-free-lengths "
- "beamed-lengths "
- "beamed-minimum-free-lengths "
"beaming "
"direction "
"duration-log "
"flag-style "
"french-beaming "
"length "
- "lengths "
"neutral-direction "
"no-stem-extend "
"note-heads "
"rests "
"stem-end-position "
"stem-info "
- "stem-shorten "
"stemlet-length "
"stroke-style "
"thickness "
(stem-info . ,Stem::calc_stem_info)
(positioning-done . ,Stem::calc_positioning_done)
(stencil . ,Stem::print)
+ (length . ,Stem::calc_length)
))
(thickness . 1.3)
- ;; 3.5 (or 3 measured from note head) is standard length
- ;; 32nd, 64th flagged stems should be longer
- (lengths . (3.5 3.5 3.5 4.5 5.0))
+ (details
+ . (
+ ;; 3.5 (or 3 measured from note head) is standard length
+ ;; 32nd, 64th flagged stems should be longer
+ (lengths . (3.5 3.5 3.5 4.5 5.0))
- ;; Stems in unnatural (forced) direction should be shortened by
- ;; one staff space, according to [Roush & Gourlay].
- ;; Flagged stems we shorten only half a staff space.
- (stem-shorten . (1.0 0.5))
+ ;; FIXME. 3.5 yields too long beams (according to Ross and
+ ;; looking at Baerenreiter examples) for a number of common
+ ;; boundary cases. Subtracting half a beam thickness fixes
+ ;; this, but the bug may well be somewhere else.
- ;; default stem direction for note on middle line
- (neutral-direction . -1)
+ ;; FIXME this should come from 'lengths
+ (beamed-lengths . (3.26 3.5 3.6))
- ;; FIXME. 3.5 yields too long beams (according to Ross and
- ;; looking at Baerenreiter examples) for a number of common
- ;; boundary cases. Subtracting half a beam thickness fixes
- ;; this, but the bug may well be somewhere else.
+ ;; The 'normal' minima
+ (beamed-minimum-free-lengths . (1.83 1.5 1.25))
+ ;(beamed-minimum-free-lengths . (2.0 1.83 1.25))
- ;; FIXME this should come from 'lengths
+ ;; The 'extreme case' minima
+ (beamed-extreme-minimum-free-lengths . (2.0 1.25))
- (beamed-lengths . (3.26 3.5 3.6))
+ ;; Stems in unnatural (forced) direction should be shortened by
+ ;; one staff space, according to [Roush & Gourlay].
+ ;; Flagged stems we shorten only half a staff space.
+ (stem-shorten . (1.0 0.5))
- ;; We use the normal minima as minimum for the ideal lengths,
- ;; and the extreme minima as abolute minimum length.
+ ))
+
- ;; The 'normal' minima
- (beamed-minimum-free-lengths . (1.83 1.5 1.25))
- ;(beamed-minimum-free-lengths . (2.0 1.83 1.25))
+ ;; default stem direction for note on middle line
+ (neutral-direction . -1)
- ;; The 'extreme case' minima
- (beamed-extreme-minimum-free-lengths . (2.0 1.25))
+ ;; We use the normal minima as minimum for the ideal lengths,
+ ;; and the extreme minima as abolute minimum length.
(X-offset-callbacks . (,Stem::offset_callback))
(X-extent-callback . ,Stem::width_callback)
projects / lilypond.git / commitdiff