Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / stem-tremolo.cc

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 9bb588db4f73450917cfe182143ffad014aac300..5a115835ef55cc8561dfda677b5ef0b7f2c060a0 100644 (file)
--- 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--2007 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
@@ -133,20 +146,34 @@ Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir)
 
 
 
-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);
 
   /*
     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));
 
   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)
 {
@@ -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 "