release: 1.5.4

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

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 9861ac19c557004e0df2574a1c1a112785c3314b..32ef10e334c577a67fb73efb69c424b3a542e3f0 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -5,11 +5,12 @@
 
   written for the GNU LilyPond music typesetter
 
-TODO: --> see breathing-sign-engraver.cc
+  TODO: --> see breathing-sign-engraver.cc
 
 */
-#include "staff-symbol-referencer.hh"
 
+#include "staff-symbol-referencer.hh"
+#include "directional-element-interface.hh"
 #include "breathing-sign.hh"
 #include "string.hh"
 #include "molecule.hh"
@@ -19,34 +20,41 @@ TODO: --> see breathing-sign-engraver.cc
 #include "dimensions.hh"
 #include "direction.hh"
 
-
-Breathing_sign::Breathing_sign ()
+MAKE_SCHEME_CALLBACK (Breathing_sign,brew_molecule,1);
+SCM 
+Breathing_sign::brew_molecule (SCM smob)
 {
-  set_direction (UP);
-  set_elt_property ("breakable", SCM_BOOL_T);
-}
+  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);
 
+  return Lookup::filledbox (b).smobbed_copy ();
+}
 
-Molecule*
-Breathing_sign::do_brew_molecule_p () const
+MAKE_SCHEME_CALLBACK (Breathing_sign,offset_callback,2);
+SCM
+Breathing_sign::offset_callback (SCM element_smob, SCM)
 {
-  Staff_symbol_referencer_interface si (this);
+  Grob *me = unsmob_grob (element_smob);
   
-  Real dl = si.staff_space();
-  Interval i1(0, dl / 6), i2(-dl / 2, dl / 2);
-  Box b(i1, i2);
-
-  Molecule *output = new Molecule (lookup_l()->filledbox(b));
-
-  return output;
+  Direction d = Directional_element_interface::get (me);
+  if (!d)
+    {
+      d = UP;
+      Directional_element_interface::set (me, 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::do_post_processing()
+Breathing_sign::set_interface (Grob *b)
 {
-  Real dl = Staff_symbol_referencer_interface (this).staff_space();
+  Staff_symbol_referencer::set_interface (b);
 
-  translate_axis(2.0 * dl * get_direction (), Y_AXIS);
 }
-