X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=4d1678889a63ee382a4a207bf5d31fd2424194f2;hb=9b8bc059ef1f4b932b9cd6ec522945cdcd99e1cb;hp=60cde74744edbf31b59b8c75ecb0ff0051705d60;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 60cde74744..4d1678889a 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "stem-tremolo.hh"
@@ -84,7 +95,9 @@ Stem_tremolo::get_beam_translation (Grob *me)
   Spanner *beam = Stem::get_beam (stem);
 
   return (beam && beam->is_live ())
-    ? Beam::get_beam_translation (beam) : 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
@@ -147,6 +160,20 @@ Stem_tremolo::height (SCM smob)
   return ly_interval2scm (s1.extent (Y_AXIS));
 }
 
+MAKE_SCHEME_CALLBACK (Stem_tremolo, width, 1);
+SCM
+Stem_tremolo::width (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+
+  /*
+    Cannot use the real slope, since it looks at the Beam.
+   */
+  Stencil s1 (untranslated_stencil (me, 0.35));
+
+  return ly_interval2scm (s1.extent (X_AXIS));
+}
+
 Real
 Stem_tremolo::vertical_length (Grob *me)
 {
@@ -160,7 +187,7 @@ Stem_tremolo::untranslated_stencil (Grob *me, Real slope)
   if (!stem)
     {
       programming_error ("no stem for stem-tremolo");
-      return Stencil();
+      return Stencil ();
     }
 
   Direction stemdir = get_grob_direction (stem);
@@ -231,11 +258,14 @@ Stem_tremolo::print (SCM grob)
 }
 
 ADD_INTERFACE (Stem_tremolo,
-	       "A beam slashing a stem to indicate a tremolo.",
+	       "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 "
                "style "
 	       "slope "