X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstaff-symbol-referencer.cc;h=f5ac177149e8d50e5d2dd1b5643600cee56dddf8;hb=f0d557033421e311064ce9f3e826476a632617c2;hp=38c39e04fe1851ec00dbc26893937040e065acee;hpb=0eb5d4ab7a8c5c147c7eaffe8752696c3728d6f0;p=lilypond.git

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 38c39e04fe..f5ac177149 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -1,9 +1,20 @@
 /*
-  staff-symbol-referencer.cc -- implement Staff_symbol_referencer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--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 "staff-symbol-referencer.hh"
@@ -70,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)
@@ -80,7 +91,6 @@ Staff_symbol_referencer::get_position (Grob *me)
   return robust_scm2double (me->get_property ("staff-position"), p);
 }
 
-
 Interval
 Staff_symbol_referencer::extent_in_staff (Grob *me)
 {
@@ -90,8 +100,8 @@ Staff_symbol_referencer::extent_in_staff (Grob *me)
   Interval retval;
   if (st && c)
     {
-      retval  = me->extent (c, Y_AXIS)
-	- st->relative_coordinate (c, Y_AXIS);
+      retval = me->extent (c, Y_AXIS)
+               - st->relative_coordinate (c, Y_AXIS);
     }
 
   return retval;
@@ -142,9 +152,8 @@ 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);
+  me->translate_axis ((p - oldpos) * ss * 0.5, Y_AXIS);
 }
 
 /* Half of the height, in staff space, i.e. 2.0 for a normal staff. */
@@ -158,22 +167,22 @@ int
 compare_position (Grob *const &a, Grob *const &b)
 {
   return sign (Staff_symbol_referencer::get_position ((Grob *)a)
-	       - Staff_symbol_referencer::get_position ((Grob *) b));
+               - Staff_symbol_referencer::get_position ((Grob *) b));
 }
 
 bool
 position_less (Grob *const &a, Grob *const &b)
 {
   return Staff_symbol_referencer::get_position (a)
-    < Staff_symbol_referencer::get_position (b);
+         < Staff_symbol_referencer::get_position (b);
 }
 
 ADD_INTERFACE (Staff_symbol_referencer,
-	       "An object whose Y@tie{}position is meant relative to a staff"
-	       " symbol.  These usually"
-	       " have @code{Staff_symbol_referencer::callback} in their"
-	       " @code{Y-offset-callbacks}.",
-
-	       /* properties */
-	       "staff-position "
-	       );
+               "An object whose Y@tie{}position is meant relative to a staff"
+               " symbol.  These usually"
+               " have @code{Staff_symbol_referencer::callback} in their"
+               " @code{Y-offset-callbacks}.",
+
+               /* properties */
+               "staff-position "
+              );