release: 1.3.121

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 54b5ef953c8348ab85b31ae8dd3b206982a7f15c..0d0dc9c6a4c2647ca8f54b8ad7f5ace3f06750bb 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -7,44 +7,47 @@
 */
 
 #include "span-bar.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "warn.hh"
 #include "axis-group-interface.hh"
 #include "group-interface.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "bar.hh"
 
 void
-Span_bar::add_bar (Score_element*me, Score_element*b)
+Span_bar::add_bar (Grob*me, Grob*b)
 {
-  Pointer_group_interface gi (me);
-  gi.add_element (b);
+  Pointer_group_interface::add_element (me,"elements", b);
 
   me->add_dependency (b);
 }
 
-Interval
-Span_bar::width_callback (Score_element *se, Axis )
+MAKE_SCHEME_CALLBACK(Span_bar,width_callback,2);
+SCM
+Span_bar::width_callback (SCM element_smob, SCM scm_axis)
 {
-  String gl = ly_scm2string (se->get_elt_property ("glyph"));
+  Grob *se = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (scm_axis);
+  assert (a == X_AXIS);
+  String gl = ly_scm2string (se->get_grob_property ("glyph"));
 
   /*
     urg.
    */
   Molecule m = Bar::compound_barline (se, gl, 40 PT);
   
-  return m.extent (X_AXIS);
+  return ly_interval2scm ( m.extent (X_AXIS));
 }
 
-MAKE_SCHEME_CALLBACK(Span_bar,before_line_breaking);
+MAKE_SCHEME_CALLBACK(Span_bar,before_line_breaking,1);
 SCM
 Span_bar::before_line_breaking (SCM smob)
 {
-  evaluate_empty (unsmob_element (smob));
-  evaluate_glyph (unsmob_element (smob));
+  evaluate_empty (unsmob_grob (smob));
+  evaluate_glyph (unsmob_grob (smob));
 
   /*
     no need to call   Bar::before_line_breaking (), because the info
@@ -53,9 +56,13 @@ Span_bar::before_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-Real
-Span_bar::center_on_spanned_callback (Score_element * me, Axis a)
+MAKE_SCHEME_CALLBACK(Span_bar,center_on_spanned_callback,2);
+
+SCM
+Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis)
 {
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
   assert (a == Y_AXIS);
   Interval i (get_spanned_interval (me));
 
@@ -63,12 +70,17 @@ Span_bar::center_on_spanned_callback (Score_element * me, Axis a)
     Bar::brew_molecule delivers a barline of y-extent (-h/2,h/2), so
     we have to translate ourselves to be in the center of the 
     interval that we span.  */
-
-  return i.center ();
+  if (i.empty_b ())
+    {
+      me->suicide();
+      return gh_double2scm (0.0);
+    }
+  
+  return gh_double2scm (i.center ());
 }
 
 void
-Span_bar::evaluate_empty (Score_element*me)
+Span_bar::evaluate_empty (Grob*me)
 {
   /*
     TODO: filter all hara-kiried out of ELEMENS list, and then
@@ -76,19 +88,19 @@ Span_bar::evaluate_empty (Score_element*me)
     center_on_spanned_callback() as well.
     
    */
-  if (!gh_pair_p (me->get_elt_property ("elements")))
+  if (!gh_pair_p (me->get_grob_property ("elements")))
     {
       me->suicide ();
     }
 }
 
 void
-Span_bar::evaluate_glyph (Score_element*me)
+Span_bar::evaluate_glyph (Grob*me)
 {
-  SCM elts = me->get_elt_property ("elements");
-  Score_element * b = unsmob_element (gh_car (elts));
+  SCM elts = me->get_grob_property ("elements");
+  Grob * b = unsmob_grob (gh_car (elts));
   SCM glsym =ly_symbol2scm ("glyph");
-  SCM gl =b ->get_elt_property (glsym);
+  SCM gl =b ->get_grob_property (glsym);
   if (!gh_string_p (gl))
     {
       me->suicide ();
@@ -111,22 +123,22 @@ Span_bar::evaluate_glyph (Score_element*me)
     }
 
   gl = ly_str02scm (type.ch_C());
-  if (scm_equal_p (me->get_elt_property (glsym), gl) != SCM_BOOL_T)
-    me->set_elt_property (glsym, gl);
+  if (scm_equal_p (me->get_grob_property (glsym), gl) != SCM_BOOL_T)
+    me->set_grob_property (glsym, gl);
 }
 
 Interval
-Span_bar::get_spanned_interval (Score_element*me) 
+Span_bar::get_spanned_interval (Grob*me) 
 {
-  return Axis_group_interface::group_extent_callback (me, Y_AXIS);  
+  return ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS))); 
 }
 
 
-MAKE_SCHEME_CALLBACK(Span_bar,get_bar_size);
+MAKE_SCHEME_CALLBACK(Span_bar,get_bar_size,1);
 SCM
 Span_bar::get_bar_size (SCM smob)
 {
-  Score_element* me =  unsmob_element (smob);
+  Grob* me =  unsmob_grob (smob);
   Interval iv (get_spanned_interval (me));
   if (iv.empty_b ())
     {
@@ -138,20 +150,18 @@ Span_bar::get_bar_size (SCM smob)
     }
   return gh_double2scm (iv.length ());
 }
+
 void
-Span_bar::set_interface (Score_element *me)
+Span_bar::set_interface (Grob *me)
 {
   Bar::set_interface (me);
   
-  Pointer_group_interface(me).set_interface ();
-  me->set_extent_callback (width_callback, X_AXIS);
-  me->add_offset_callback (center_on_spanned_callback, Y_AXIS);
   me->set_interface (ly_symbol2scm ("span-bar-interface"));
-  me->set_extent_callback (0, Y_AXIS);
+  me->set_extent_callback (SCM_EOL, Y_AXIS);
 }
 
 bool
-Span_bar::has_interface (Score_element*m)
+Span_bar::has_interface (Grob*m)
 {
   return m && m->has_interface (ly_symbol2scm ("span-bar-interface"));
 }