* scm/lily.scm: Register sodipodi output module.

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

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 4810dec72ef05f24311c7ea4bf71d3fa3a4fc268..730a3f496485574b2a8a33e826708be9de3a506d 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -16,33 +16,31 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "debug.hh"
+
 #include "dimensions.hh"
 #include "direction.hh"
 
-
-
-MAKE_SCHEME_CALLBACK(Breathing_sign,brew_molecule);
-
+MAKE_SCHEME_CALLBACK (Breathing_sign,brew_molecule,1);
 SCM 
 Breathing_sign::brew_molecule (SCM smob)
 {
-  Score_element * me = unsmob_element (smob);
+  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 me->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);
   
-  Direction d = Directional_element_interface::get (b);
+  Direction d = Directional_element_interface::get (me);
   if (!d)
     {
       d = UP;
@@ -51,12 +49,10 @@ Breathing_sign::offset_callback (Score_element * b, Axis a)
 
   Real inter_f = Staff_symbol_referencer::staff_space (me)/2;
   int sz = Staff_symbol_referencer::line_count (me)-1;
-  return inter_f * sz * d;
+  return gh_double2scm (inter_f * sz * d);
 }
 
-void
-Breathing_sign::set_interface (Score_element *b)
-{
-  Staff_symbol_referencer::set_interface  (b);
-  b->add_offset_callback (Breathing_sign::offset_callback,Y_AXIS); 
-}
+
+ADD_INTERFACE(Breathing_sign, "breathing-sign-interface",
+             "A breathing sign.",
+             "direction");