Fix #661.

Remove bounding box from stencil in Line_interface::make_zigzag_line ().

2 files changed, 20 insertions, 7 deletions

diff --git a/input/regression/line-style-zigzag-spacing.ly b/input/regression/line-style-zigzag-spacing.ly
new file mode 100644
index 0000000000..0d9368a664
--- /dev/null
+++ b/input/regression/line-style-zigzag-spacing.ly
@@ -0,0 +1,19 @@
+\version "2.11.57"
+
+\header {
+  texidoc = "Setting zigzag style for spanners does not cause
+spacing problems: in this example, the first text markup and
+zigzag trillspanner have the same outside staff positioning as
+the second markup and default trillspanner.
+"
+}
+
+\relative c' {
+  c1^"text"
+  \override TrillSpanner #'style = #'zigzag
+  c1\startTrillSpan
+  c2^\stopTrillSpan c^"text"
+  \revert TrillSpanner #'style
+  c1\startTrillSpan
+  c1^\stopTrillSpan
+}
diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index c662d77d9f..771ed69b59 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -111,13 +111,7 @@ Line_interface::make_zigzag_line (Grob *me,
       total.add_stencil (moved_squiggle);
     }
 
-  Box b;
-  b.add_point (Offset (0, 0));
-  b.add_point (dz);
-  b[X_AXIS].widen (thick / 2);
-  b[Y_AXIS].widen (thick / 2);
-
-  return Stencil (b, total.expr ());
+  return total;
 }