X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=7c605c4b1950c0012c3026a025d22b27d386b0e2;hb=23093de8c16965c17ef06ada9949cfaa14933dff;hp=6e342f451337a0de7f7a7301a696693f04d0d445;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 6e342f4513..7c605c4b19 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,13 +1,13 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  (c) 1999--2006 Michael Krause
+  (c) 1999--2007 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO: --> see breathing-sign-engraver.cc
 
-  Extensions for ancient notation (c) 2003--2006 by Juergen Reuter
+  Extensions for ancient notation (c) 2003--2007 by Juergen Reuter
 */
 
 #include "breathing-sign.hh"
@@ -20,6 +20,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,16 +41,11 @@ 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 ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -80,7 +76,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -118,7 +114,7 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
@@ -146,7 +142,7 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
@@ -173,11 +169,14 @@ Breathing_sign::offset_callback (SCM smob)
       set_grob_direction (me, d);
     }
 
-  Real inter_f = Staff_symbol_referencer::staff_space (me) / 2;
+  Real inter = Staff_symbol_referencer::staff_space (me) / 2;
   int sz = Staff_symbol_referencer::line_count (me) - 1;
-  return scm_from_double (inter_f * sz * d);
+  return scm_from_double (inter * sz * d);
 }
 
-ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",
+ADD_INTERFACE (Breathing_sign,
 	       "A breathing sign.",
-	       "direction");
+	       
+	       /* properties */
+	       "direction "
+	       );