Fix 1382

diff --git a/input/regression/zero_staff_space.ly b/input/regression/zero_staff_space.ly
new file mode 100644 (file)
index 0000000..cc30e65
--- /dev/null
+++ b/input/regression/zero_staff_space.ly
@@ -0,0 +1,17 @@
+
+\version "2.13.40"
+\header{
+
+  texidoc="
+Setting staff-space to 0 does not cause a segmentation fault.
+"
+
+}
+
+\new Staff \with {
+  \override StaffSymbol #'staff-space = #0
+  } {
+  \relative c' {
+    c1
+  }
+}

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index bec8c8001f9d01ad741365808337c248a953ee94..4dbd6d2d6b0b354f9c8d91124786758c9b6af70c 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -81,9 +81,9 @@ Staff_symbol_referencer::get_position (Grob *me)
   if (st && c)
     {
       Real y = me->relative_coordinate (c, Y_AXIS)
-       - st->relative_coordinate (c, Y_AXIS);
-
-      p += 2.0 * y / Staff_symbol::staff_space (st);
+              - st->relative_coordinate (c, Y_AXIS);
+      Real space = Staff_symbol::staff_space (st);
+      p = (space == 0) ? 0 : 2.0 * y / space;
       return p;
     }
   else if (!st)
@@ -153,7 +153,6 @@ Staff_symbol_referencer::set_position (Grob *me, Real p)
       oldpos = get_position (me);
     }
 
-  
   Real ss = Staff_symbol_referencer::staff_space (me);
   me->translate_axis ((p  - oldpos) * ss * 0.5, Y_AXIS);
 }