release: 1.3.101

[lilypond.git] / lily / staff-symbol.cc

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 4419d8dc126ea043d2a587eb71e1fd070f75c6bc..e7754b799b40284ba29feb9bf1a37e1e37007d5a 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -1,64 +1,85 @@
 /*
-  staffsym.cc -- implement Staff_symbol
+  staff-symbol.cc -- implement Staff_symbol
 
   source file of the GNU LilyPond music typesetter
 
   (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "staff-symbol.hh"
+
 #include "lookup.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
 #include "molecule.hh"
 #include "debug.hh"
 #include "item.hh"
+#include "staff-symbol.hh"
+#include "spanner.hh"
+
 
 
+MAKE_SCHEME_CALLBACK(Staff_symbol,brew_molecule,1);
 
-Molecule 
-Staff_symbol::do_brew_molecule() const
+SCM
+Staff_symbol::brew_molecule (SCM smob)
 {
+  Score_element *me = unsmob_element (smob);
+  Spanner* sp = dynamic_cast<Spanner*> (me);
   Score_element * common
-    = get_bound (LEFT)->common_refpoint (get_bound (RIGHT), X_AXIS);
+    = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
   
   Real width =
     // right_shift     - left_shift
-    + get_bound (RIGHT)->relative_coordinate (common , X_AXIS)
-    - get_bound (LEFT)->relative_coordinate (common, X_AXIS)
+    + sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS)
+    - sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS)
     ;
 
-  Real t = paper_l ()->get_var ("stafflinethickness");
-  int l = line_count ();
+  Real t = me->paper_l ()->get_var ("stafflinethickness");
+  int l = Staff_symbol::line_count (me);
   
-  Real height = (l-1) * staff_space () /2;
-  Molecule  m;
+  Real height = (l-1) * staff_space (me) /2;
+  Molecule m;
   for (int i=0; i < l; i++)
     {
       Molecule a =
-       lookup_l ()->filledbox (Box (Interval (0,width),
-                                    Interval (-t/2, t/2)));
+       Lookup::filledbox (Box (Interval (0,width),
+                                        Interval (-t/2, t/2)));
 
-      a.translate_axis (height - i * staff_space (), Y_AXIS);
+      a.translate_axis (height - i * staff_space (me), Y_AXIS);
       m.add_molecule (a);
     }
 
-  return m;
+  return m.create_scheme();
 }
 
 int
-Staff_symbol::steps_i() const
+Staff_symbol::steps_i(Score_element*me) 
 {
-  return line_count () * 2;
+  return line_count (me) * 2;
 }
 
 int
-Staff_symbol::line_count () const
+Staff_symbol::line_count (Score_element*me) 
 {
-  return gh_scm2int (get_elt_property ("line-count"));
+  SCM c = me->get_elt_property ("line-count");
+  if (gh_number_p (c))
+    return gh_scm2int (c);
+  else
+    return 0;
 }
 
 Real
-Staff_symbol::staff_space ()const
+Staff_symbol::staff_space (Score_element*me )
+{
+  Real ss = 1.0;
+  
+  SCM s = me->get_elt_property ("staff-space");
+  if (gh_number_p (s))
+    ss *= gh_scm2double (s);
+  return ss;
+}
+
+bool
+Staff_symbol::has_interface (Score_element*m)
 {
-  return gh_scm2double (get_elt_property ("staff-space"));
+  return m && m->has_interface (ly_symbol2scm ("staff-symbol-interface"));
 }