X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=f8d02996f49a564f90d1d2e3bff3a4870239b689;hb=cf4b1202d9f3d891a98ebab7d5df0d5cfb7f8ad8;hp=0b244431b52fbc71350ee30a6932da302953af6b;hpb=26380ed75fbd7b32781715c043dfa5dd96dfbe4a;p=lilypond.git

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 0b244431b5..f8d02996f4 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -1,13 +1,13 @@
 /*
   breathing_sign.cc -- implement Breathing_sign
 
-  (c) 1999--2005 Michael Krause
+  (c) 1999--2006 Michael Krause
 
   written for the GNU LilyPond music typesetter
 
   TODO: --> see breathing-sign-engraver.cc
 
-  Extensions for ancient notation (c) 2003--2005 by Juergen Reuter
+  Extensions for ancient notation (c) 2003--2006 by Juergen Reuter
 */
 
 #include "breathing-sign.hh"
@@ -45,13 +45,11 @@ Breathing_sign::divisio_minima (SCM smob)
   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;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_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
@@ -78,13 +76,11 @@ Breathing_sign::divisio_maior (SCM smob)
   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;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_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,13 +114,11 @@ Breathing_sign::divisio_maxima (SCM smob)
   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;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
@@ -148,13 +142,11 @@ Breathing_sign::finalis (SCM smob)
   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;
-    }
+    staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space;
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
@@ -168,11 +160,11 @@ Breathing_sign::finalis (SCM smob)
   return line1.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 2);
+MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1);
 SCM
-Breathing_sign::offset_callback (SCM element_smob, SCM)
+Breathing_sign::offset_callback (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
+  Grob *me = unsmob_grob (smob);
 
   Direction d = get_grob_direction (me);
   if (!d)
@@ -181,11 +173,14 @@ Breathing_sign::offset_callback (SCM element_smob, SCM)
       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_make_real (inter_f * sz * d);
+  return scm_from_double (inter * sz * d);
 }
 
 ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",
 	       "A breathing sign.",
-	       "direction");
+	       
+	       "direction "
+
+	       );