patch::: 1.3.94.jcn2

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 7ba3c9e235f6503aa9f12d0034afefde93e87dd7..00aafa5adab08b329d96e87450a663d7d2399f43 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -1,79 +1,84 @@
 /*
-  staffsym.cc -- implement Staff_symbol
+  staff-symbol.cc -- implement Staff_symbol
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (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"
 
 
-Staff_symbol::Staff_symbol ()
-{
-  no_lines_i_ = 5;
-  staff_space_ = 5.0 PT;
-}
-
-void
-Staff_symbol::do_print() const
-{
-#ifndef NPRINT
-  Spanner::do_print();
-  DEBUG_OUT << "lines: " << no_lines_i_;
-#endif
-}
-
+MAKE_SCHEME_CALLBACK(Staff_symbol,brew_molecule,1);
 
-Molecule*
-Staff_symbol::do_brew_molecule_p() const
+SCM
+Staff_symbol::brew_molecule (SCM smob)
 {
+  Score_element *me = unsmob_element (smob);
+  Spanner* sp = dynamic_cast<Spanner*> (me);
   Score_element * common
-    = spanned_drul_[LEFT]->common_refpoint (spanned_drul_[RIGHT], X_AXIS);
-
-#if 0
-  Interval r =  spanned_drul_[RIGHT]->extent (X_AXIS);
-  Interval l =  spanned_drul_[LEFT]->extent (X_AXIS);
+    = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
   
-  Real left_shift =l.empty_b () ? 0.0: l[LEFT];
-  Real right_shift =r.empty_b () ? 0.0: r[RIGHT];  
-#endif
   Real width =
     // right_shift     - left_shift
-    + spanned_drul_[RIGHT]->relative_coordinate (common , X_AXIS)
-    - spanned_drul_[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");
-  Molecule rule  = lookup_l ()->filledbox (Box (Interval (0,width),
-                                               Interval (-t/2, t/2)));
-
-  Real height = (no_lines_i_-1) * staff_space_ /2;
-  Molecule * m = new Molecule;
-  for (int i=0; i < no_lines_i_; i++)
+  Real t = me->paper_l ()->get_var ("stafflinethickness");
+  int l = Staff_symbol::line_count (me);
+  
+  Real height = (l-1) * staff_space (me) /2;
+  Molecule m;
+  for (int i=0; i < l; i++)
     {
-      Molecule a (rule);
-      a.translate_axis (height - i * staff_space_, Y_AXIS);
-      m->add_molecule (a);
+      Molecule a =
+       me->lookup_l ()->filledbox (Box (Interval (0,width),
+                                        Interval (-t/2, t/2)));
+
+      a.translate_axis (height - i * staff_space (me), Y_AXIS);
+      m.add_molecule (a);
     }
 
-  //  m->translate_axis (left_shift, X_AXIS);
-  return m;
+  return m.create_scheme();
 }
 
+int
+Staff_symbol::steps_i(Score_element*me) 
+{
+  return line_count (me) * 2;
+}
 
 int
-Staff_symbol::steps_i() const
+Staff_symbol::line_count (Score_element*me) 
 {
-  return no_lines_i_*2;
+  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 ()
+Staff_symbol::staff_space (Score_element*me )
+{
+  Real ss = me->paper_l ()->get_var ("staffspace");
+  
+  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 staff_space_;
+  return m && m->has_interface (ly_symbol2scm ("staff-symbol-interface"));
 }