Fix 352.

Ensure that stem-tremolos have a width so they are included in the skyline.

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index 36cb146efec3ca588f9d9b0cf3efca54963fd43b..b6512b9960fefd25e5b41a8083d1e9bed349df67 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -21,6 +21,7 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_width, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_style, (SCM));
   static Stencil raw_stencil (Grob *, Real slope, Direction stemdir);
   static Stencil translated_stencil (Grob*, Real slope);

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index a718b7f69d132918fe6ee370fe87f503a879cc00..b91b18fd5a1e9359edb3747ab50f3b77e45cfd93 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -149,6 +149,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)
 {

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 196b5501584c3956287745533d28756d798725b2..9b75b09afe1cb8c3048fb512542c6a1ac025139d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1622,8 +1622,8 @@
     (StemTremolo
      . (
        (Y-extent . ,ly:stem-tremolo::height)
+       (X-extent . ,ly:stem-tremolo::width)
        (stencil . ,ly:stem-tremolo::print)
-       (X-extent . #f)
        (slope . ,ly:stem-tremolo::calc-slope)
        (beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
         (style . ,ly:stem-tremolo::calc-style)