Run grand replace for 2015.

[lilypond.git] / lily / staff-symbol.cc

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index e2c199633a1933246ab5ed3a94d2cac7ae4d3ef5..6ae66d85c1880bb0dd817c70389abc43aff262a5 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -263,7 +263,9 @@ Staff_symbol::line_count (Grob *me)
 Real
 Staff_symbol::staff_space (Grob *me)
 {
-  return robust_scm2double (me->get_property ("staff-space"), 1.0);
+  Real ss = me->layout ()->get_dimension (ly_symbol2scm ("staff-space"));
+
+  return robust_scm2double (me->get_property ("staff-space"), 1.0) * ss;
 }
 
 Real