release: 1.5.7

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

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 73580c0f2c5950f11a4b900b63fce37bba72bb3d..32ef10e334c577a67fb73efb69c424b3a542e3f0 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -20,44 +20,41 @@
 #include "dimensions.hh"
 #include "direction.hh"
 
-
-
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Breathing_sign,brew_molecule);
-
+MAKE_SCHEME_CALLBACK (Breathing_sign,brew_molecule,1);
 SCM 
 Breathing_sign::brew_molecule (SCM smob)
 {
-  Score_element * sc = unsmob_element (smob);
-  Staff_symbol_referencer_interface si (sc);
-  
-  Real space = si.staff_space();
+  Grob * me = unsmob_grob (smob);
+  Real space = Staff_symbol_referencer::staff_space (me);
 
   // todo: cfg'able.
-  Interval i1(0, space / 6), i2(-space / 2, space / 2);
-  Box b(i1, i2);
+  Interval i1 (0, space / 6), i2 (-space / 2, space / 2);
+  Box b (i1, i2);
 
-  return sc->lookup_l()->filledbox(b).create_scheme ();
+  return Lookup::filledbox (b).smobbed_copy ();
 }
 
-Real
-Breathing_sign::offset_callback (Score_element * b, Axis a)
+MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2);
+SCM
+Breathing_sign::offset_callback (SCM element_smob, SCM)
 {
-  Score_element * me = (Score_element*)b;
+  Grob *me = unsmob_grob (element_smob);
   
-  Real space = Staff_symbol_referencer_interface (b).staff_space();
-  Direction d = Directional_element_interface (b). get ();
+  Direction d = Directional_element_interface::get (me);
   if (!d)
     {
       d = UP;
-      Directional_element_interface (me).set (d);
+      Directional_element_interface::set (me, d);
     }
 
-  return 2.0 * space * d;
+  Real inter_f = Staff_symbol_referencer::staff_space (me)/2;
+  int sz = Staff_symbol_referencer::line_count (me)-1;
+  return gh_double2scm (inter_f * sz * d);
 }
 
 void
-Breathing_sign::set_interface (Score_element *b)
+Breathing_sign::set_interface (Grob *b)
 {
-  Staff_symbol_referencer_interface::set_interface  (b);
-  b->add_offset_callback (Breathing_sign::offset_callback,Y_AXIS); 
+  Staff_symbol_referencer::set_interface (b);
+
 }