Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / breathing-sign.cc

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 36b6502fc10cb60c525ae166e4578d6f33792678..f6bbdb1578425b63984ac3052db587cb82273e63 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,13 +1,21 @@
 /*
-  breathing_sign.cc -- implement Breathing_sign
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1999--2006 Michael Krause
+  Copyright (C) 1999--2010 Michael Krause
+  Extensions for ancient notation (c) 2003--2010 by Juergen Reuter
 
-  written for the GNU LilyPond music typesetter
+  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.
 
-  TODO: --> see breathing-sign-engraver.cc
+  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.
 
-  Extensions for ancient notation (c) 2003--2006 by Juergen Reuter
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "breathing-sign.hh"
@@ -20,6 +28,7 @@
 #include "direction.hh"
 #include "text-interface.hh"
 #include "font-interface.hh"
+#include "grob.hh"
 
 /*
   TODO: thickness should be a grob property (unit: linethickness)
@@ -40,14 +49,9 @@ Breathing_sign::divisio_minima (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
-  Real staff_size;
 
   Real thickness = Staff_symbol_referencer::line_thickness (me);
   thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
-  if (Staff_symbol_referencer::get_staff_symbol (me))
-    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
-  else
-    staff_size = 0.0;
 
   Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
@@ -181,6 +185,6 @@ Breathing_sign::offset_callback (SCM smob)
 ADD_INTERFACE (Breathing_sign,
               "A breathing sign.",
               
+              /* properties */
               "direction "
-
               );