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 "staff-symbol-referencer.hh"
-#include "spanner.hh"
#include "side-position-interface.hh"
#include "dot-column.hh"
#include "stem-tremolo.hh"
return 0;
}
-/* START is part where stem reaches `last' head.
+/*
+ START is part where stem reaches `last' head.
-This function returns a drul with (bottom-head, top-head).
+ This function returns a drul with (bottom-head, top-head).
*/
Drul_array<Grob*>
extpos[DOWN] = inf;
extpos[UP] = -inf;
- Drul_array<Grob *> exthead;
- exthead[LEFT] = exthead[RIGHT] =0;
-
+ Drul_array<Grob *> exthead (0, 0);
for (SCM s = me->get_property ("note-heads"); scm_is_pair (s);
s = scm_cdr (s))
{
}
static int
-icmp (int const &a, int const &b)
+integer_compare (int const &a, int const &b)
{
return a - b;
}
ps.push (p);
}
- ps.sort (icmp);
+ ps.sort (integer_compare);
return ps;
}
n->set_property ("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)
+ 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);
}
/* 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);
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
stem_end_position (me); // ugh. Trigger direction calc.
position_noteheads (me);
}
- else
- me->set_property ("print-function", SCM_EOL);
return SCM_UNSPECIFIED;
}
/*
ugh. - this dependency should be automatic.
*/
- Grob *beam= get_beam (me);
+ Grob *beam = get_beam (me);
if (beam)
{
Beam::after_line_breaking (beam->self_scm ());
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 ;
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));
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
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)
+ : lh = first_head (me);
+ Grob *beam = get_beam (me);
- if (!lh)
+ if (!lh && !stemlet)
return SCM_EOL;
+ if (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);
- // dy?
- Real dy = Staff_symbol_referencer::staff_space (me) * 0.5;
+ 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 * (0 >? (beam_count - 1))
+ + stemlet_length) / half_space;
+ }
+
+ Interval stem_y (y1 <? y2,y2 >? y1);
if (Grob *hed = support_head (me))
{
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;
}
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));
+ 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_y[d]*half_space - d * blot/2, Y_AXIS);
fl.translate_axis (stem_width/2, X_AXIS);
mol.add_stencil (fl);
}
Grob *me = unsmob_grob (element_smob);
Real r = 0.0;
- if (head_count (me))
- if (Grob *f = first_head (me))
- {
- Interval head_wid = f->extent (f, X_AXIS);
- Real attach = 0.0;
+ 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
+ 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;
+ 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;
- }
- }
+ /* If not centered: correct for stem thickness. */
+ if (attach)
+ {
+ Real rule_thick = thickness (me);
+ r += - d * rule_thick * 0.5;
+ }
+ }
+ else
+ {
+ SCM rests = me->get_property ("rests");
+ if (scm_is_pair (rests))
+ {
+ Grob * rest = unsmob_grob (scm_car (rests));
+ r = rest->extent (rest, X_AXIS).center ();
+ }
+ }
return scm_make_real (r);
}
Slice
Stem::beam_multiplicity (Grob *stem)
{
- SCM beaming= stem->get_property ("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);
"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