/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Real dy = 0;
SCM s = beam->get_property ("quantized-positions");
if (is_number_pair (s))
- dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s));
+ dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s));
Grob *s2 = Beam::last_normal_stem (beam);
Grob *s1 = Beam::first_normal_stem (beam);
-
+
Grob *common = s1->common_refpoint (s2, X_AXIS);
- Real dx = s2->relative_coordinate (common, X_AXIS) -
- s1->relative_coordinate (common, X_AXIS);
+ Real dx = s2->relative_coordinate (common, X_AXIS)
+ - s1->relative_coordinate (common, X_AXIS);
return scm_from_double (dx ? dy / dx : 0);
}
else
/* down stems with flags should have more sloped trems (helps avoid
flag/stem collisions without making the stem very long) */
- return scm_from_double (
- (Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN) ?
- 0.40 : 0.25);
+ return scm_from_double ((Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN)
+ ? 0.40 : 0.25);
}
MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_width, 1)
bool flag = Stem::duration_log (stem) >= 3 && !beam;
/* beamed stems and up-stems with flags have shorter tremolos */
- return scm_from_double (((stemdir == UP && flag) || beam)? 1.0 : 1.5);
+ return scm_from_double (((stemdir == UP && flag) || beam) ? 1.0 : 1.5);
}
MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_style, 1)
Spanner *beam = Stem::get_beam (stem);
return (beam && beam->is_live ())
- ? Beam::get_beam_translation (beam)
- : (Staff_symbol_referencer::staff_space (me)
- * robust_scm2double (me->get_property ("length-fraction"), 1.0) * 0.81);
+ ? Beam::get_beam_translation (beam)
+ : (Staff_symbol_referencer::staff_space (me)
+ * robust_scm2double (me->get_property ("length-fraction"), 1.0) * 0.81);
}
Stencil
return mol;
}
-
-
MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_height, 3);
SCM
Stem_tremolo::pure_height (SCM smob, SCM, SCM)
{
- Grob *me = unsmob_grob (smob);
+ Item *me = unsmob_item (smob);
/*
Cannot use the real slope, since it looks at the Beam.
*/
Stencil s1 (untranslated_stencil (me, 0.35));
+ Item *stem = unsmob_item (me->get_object ("stem"));
+ if (!stem)
+ return ly_interval2scm (s1.extent (Y_AXIS));
+
+ Direction stemdir = get_grob_direction (stem);
+ if (stemdir == 0)
+ stemdir = UP;
- return ly_interval2scm (s1.extent (Y_AXIS));
+ Spanner *beam = Stem::get_beam (stem);
+
+ if (!beam)
+ return ly_interval2scm (s1.extent (Y_AXIS));
+
+ Interval ph = stem->pure_height (stem, 0, INT_MAX);
+ Stem_info si = Stem::get_stem_info (stem);
+ ph[-stemdir] = si.shortest_y_;
+ int beam_count = Stem::beam_multiplicity (stem).length () + 1;
+ Real beam_translation = get_beam_translation (me);
+
+ ph = ph - stemdir * max (beam_count, 1) * beam_translation;
+ ph = ph - ph.center ();
+
+ return ly_interval2scm (ph);
}
MAKE_SCHEME_CALLBACK (Stem_tremolo, width, 1);
{
return untranslated_stencil (me, 0.35).extent (Y_AXIS).length ();
}
-
+
Stencil
Stem_tremolo::untranslated_stencil (Grob *me, Real slope)
{
return raw_stencil (me, slope, stencil_dir);
}
-
-Stencil
-Stem_tremolo::translated_stencil (Grob *me, Real slope)
+MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_y_offset, 1);
+SCM
+Stem_tremolo::calc_y_offset (SCM smob)
{
- Stencil mol = untranslated_stencil (me, slope);
+ Grob *me = unsmob_grob (smob);
+ return scm_from_double (y_offset (me, false));
+}
- Grob *stem = unsmob_grob (me->get_object ("stem"));
+MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_calc_y_offset, 3);
+SCM
+Stem_tremolo::pure_calc_y_offset (SCM smob,
+ SCM, /* start */
+ SCM /* end */)
+{
+ Grob *me = unsmob_grob (smob);
+ return scm_from_double (y_offset (me, true));
+}
+
+Real
+Stem_tremolo::y_offset (Grob *me, bool pure)
+{
+ Item *stem = unsmob_item (me->get_object ("stem"));
if (!stem)
- return Stencil ();
-
+ return 0.0;
+
Direction stemdir = get_grob_direction (stem);
if (stemdir == 0)
stemdir = UP;
Real beam_translation = get_beam_translation (me);
int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0;
- Real ss = Staff_symbol_referencer::staff_space (me);
+
+ if (pure && beam)
+ {
+ Interval ph = stem->pure_height (stem, 0, INT_MAX);
+ Stem_info si = Stem::get_stem_info (stem);
+ ph[-stemdir] = si.shortest_y_;
+
+ return (ph - stemdir * max (beam_count, 1) * beam_translation)[stemdir] - stemdir * 0.5 * me->pure_height (me, 0, INT_MAX).length ();
+ }
Real end_y
- = Stem::stem_end_position (stem) * ss / 2
- - stemdir * max (beam_count, 1) * beam_translation;
+ = (pure
+ ? stem->pure_height (stem, 0, INT_MAX)[stemdir]
+ : stem->extent (stem, Y_AXIS)[stemdir])
+ - stemdir * max (beam_count, 1) * beam_translation
+ - Stem::beam_end_corrective (stem);
if (!beam && Stem::duration_log (stem) >= 3)
{
{
/* we shouldn't position relative to the end of the stem since the stem
is invisible */
+ Real ss = Staff_symbol_referencer::staff_space (me);
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;
+ return end_y;
}
MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1);
Stem_tremolo::print (SCM grob)
{
Grob *me = unsmob_grob (grob);
-
- Stencil s = translated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25));
+
+ Stencil s = untranslated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25));
return s.smobbed_copy ();
}
ADD_INTERFACE (Stem_tremolo,
- "A beam slashing a stem to indicate a tremolo. The property"
- " @code{style} can be @code{default} or @code{rectangle}.",
+ "A beam slashing a stem to indicate a tremolo. The property"
+ " @code{style} can be @code{default} or @code{rectangle}.",
/* properties */
- "beam-thickness "
- "beam-width "
- "flag-count "
- "length-fraction "
- "stem "
+ "beam-thickness "
+ "beam-width "
+ "flag-count "
+ "length-fraction "
+ "stem "
"style "
- "slope "
- );
+ "slope "
+ );