Grob *stem = unsmob_grob (me->get_object ("stem"));
Spanner *beam = Stem::get_beam (stem);
- return beam ? Beam::get_beam_translation (beam) : 0.81;
-}
-
-/* FIXME: move to Lookup? */
-Stencil
-Stem_tremolo::rotated_box (Real slope, Real width, Real thick, Real blot)
-{
- vector<Offset> pts;
- Offset rot (1, slope);
-
- thick -= 2*blot;
- width -= 2*blot;
- rot /= sqrt (1 + slope*slope);
- pts.push_back (Offset (0, -thick / 2) * rot);
- pts.push_back (Offset (width, -thick / 2) * rot);
- pts.push_back (Offset (width, thick / 2) * rot);
- pts.push_back (Offset (0, thick / 2) * rot);
- return Lookup::round_filled_polygon (pts, blot);
+ return (beam && beam->is_live ())
+ ? Beam::get_beam_translation (beam) : 0.81;
}
Stencil
width *= ss;
thick *= ss;
- Stencil a = style == ly_symbol2scm ("rectangle") ?
- rotated_box (slope, width, thick, blot) :
- Lookup::beam (slope, width, thick, blot);
+ Stencil a;
+ if (style == ly_symbol2scm ("rectangle"))
+ a = Lookup::rotated_box (slope, width, thick, blot);
+ else
+ a = Lookup::beam (slope, width, thick, blot);
+
a.align_to (X_AXIS, CENTER);
a.align_to (Y_AXIS, CENTER);
return Stencil ();
}
- Real beam_translation = get_beam_translation(me);
+ Real beam_translation = get_beam_translation (me);
Stencil mol;
for (int i = 0; i < tremolo_flags; i++)
/*
Cannot use the real slope, since it looks at the Beam.
*/
- Stencil s1 (raw_stencil (me, 0.35, UP));
+ Stencil s1 (translated_stencil (me, 0.35));
return ly_interval2scm (s1.extent (Y_AXIS));
}
-
-MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1);
-SCM
-Stem_tremolo::print (SCM grob)
+Stencil
+Stem_tremolo::translated_stencil (Grob *me, Real slope)
{
- Grob *me = unsmob_grob (grob);
Grob *stem = unsmob_grob (me->get_object ("stem"));
if (!stem)
{
programming_error ("no stem for stem-tremolo");
- return SCM_EOL;
+ return Stencil();
}
Spanner *beam = Stem::get_beam (stem);
if (stemdir == 0)
stemdir = UP;
- Real beam_translation
- = (beam && beam->is_live ())
- ? Beam::get_beam_translation (beam)
- : 0.81;
+ bool whole_note = Stem::duration_log (stem) <= 0;
- Stencil mol = raw_stencil (me, robust_scm2double (me->get_property ("slope"),
- 0.25), stemdir);
+ Real beam_translation = get_beam_translation (me);
+
+ /* for a whole note, we position relative to the notehead, so we want the
+ stencil aligned on the flag closest to the head */
+ Direction stencil_dir = whole_note ? -stemdir : stemdir;
+ Stencil mol = raw_stencil (me, slope, stencil_dir);
Interval mol_ext = mol.extent (Y_AXIS);
Real ss = Staff_symbol_referencer::staff_space (me);
if (stemdir == UP)
end_y -= stemdir * beam_translation * 0.5;
}
+ if (whole_note)
+ {
+ /* we shouldn't position relative to the end of the stem since the stem
+ is invisible */
+ vector<int> nhp = Stem::note_head_positions (stem);
+ Real note_head = (stemdir == UP ? nhp.back () : nhp[0]) * ss / 2;
+ end_y = note_head + stemdir * 1.5;
+ }
mol.translate_axis (end_y, Y_AXIS);
- return mol.smobbed_copy ();
+ return mol;
+}
+
+MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1);
+SCM
+Stem_tremolo::print (SCM grob)
+{
+ Grob *me = unsmob_grob (grob);
+
+ Stencil s = translated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25));
+ return s.smobbed_copy ();
}
ADD_INTERFACE (Stem_tremolo, "stem-tremolo-interface",