X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=c1508066783b1f26cb468aa4915f842a602c60de;hb=f166a6e3a57e6cff6dbaf97b2c47edc114c8ec2f;hp=cc4589827e69d13b37da34030d98ca5a5fe1658c;hpb=b9a18c38bf25fe66b0ecea5e83d7beaf69ffa6c0;p=lilypond.git

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index cc4589827e..c150806678 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -1,7 +1,7 @@
 /*
   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
@@ -147,14 +147,35 @@ 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;
+
+  Spanner *beam = Stem::get_beam (stem);
 
-  return ly_interval2scm (s1.extent (Y_AXIS));
+  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);
@@ -199,14 +220,30 @@ 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)
@@ -217,9 +254,19 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope)
 
   int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0;
 
+  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->extent (stem, Y_AXIS)[stemdir]
-      - stemdir * max (beam_count, 1) * beam_translation;
+      - stemdir * max (beam_count, 1) * beam_translation
+      - Stem::beam_end_corrective (stem);
 
   if (!beam && Stem::duration_log (stem) >= 3)
     {
@@ -238,9 +285,8 @@ Stem_tremolo::translated_stencil (Grob *me, Real slope)
       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);
@@ -249,7 +295,7 @@ 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 ();
 }