X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=d48091537aca3d55cc033389ef47dab9d126d43b;hb=6e99d79145c093c931838c1a8c2f447cb6d5660a;hp=ce9e3529b693746d51eea7ba6b75119f308b6a4a;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index ce9e3529b6..d48091537a 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,9 +1,20 @@ /* - stem-tremolo.cc -- implement Stem_tremolo + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Han-Wen Nienhuys - (c) 1997--2009 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "stem-tremolo.hh" @@ -31,23 +42,22 @@ Stem_tremolo::calc_slope (SCM smob) 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) @@ -61,7 +71,7 @@ Stem_tremolo::calc_width (SCM smob) 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) @@ -84,9 +94,9 @@ Stem_tremolo::get_beam_translation (Grob *me) 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 @@ -133,20 +143,39 @@ Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir) return mol; } - - -MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 1); +MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_height, 3); SCM -Stem_tremolo::height (SCM smob) +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 (translated_stencil (me, 0.35)); + 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; + + Spanner *beam = Stem::get_beam (stem); + + if (!beam) + return ly_interval2scm (s1.extent (Y_AXIS)); - 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); @@ -168,7 +197,7 @@ Stem_tremolo::vertical_length (Grob *me) { return untranslated_stencil (me, 0.35).extent (Y_AXIS).length (); } - + Stencil Stem_tremolo::untranslated_stencil (Grob *me, Real slope) { @@ -191,16 +220,31 @@ 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; @@ -209,11 +253,22 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope) 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) { @@ -227,13 +282,13 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope) { /* 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 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); @@ -241,21 +296,21 @@ SCM 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 " + );