Grob *stem = unsmob_grob (me->get_object ("stem"));
Spanner *beam = Stem::get_beam (stem);
- return beam ? Beam::get_beam_translation (beam) : 0.81;
+ return (beam && beam->is_live ())
+ ? Beam::get_beam_translation (beam) : 0.81;
}
Stencil
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);
Direction stemdir = get_grob_direction (stem);
- bool whole_note = Stem::duration_log (stem) <= 0;
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;
+
+ 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, robust_scm2double (me->get_property ("slope"),
- 0.25), stencil_dir);
+ Stencil mol = raw_stencil (me, slope, stencil_dir);
Interval mol_ext = mol.extent (Y_AXIS);
Real ss = Staff_symbol_referencer::staff_space (me);
}
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",