*** empty log message ***

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index f669bc57f2fde1fde565c11f3840dd0b62bafd66..0b15a94cfc4e6f974072215bfef704e601b504dc 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "lookup.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "warn.hh"
 #include "item.hh"
 #include "staff-symbol.hh"
@@ -18,10 +18,10 @@
 
 
 
-MAKE_SCHEME_CALLBACK (Staff_symbol,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Staff_symbol,print,1);
 
 SCM
-Staff_symbol::brew_molecule (SCM smob)
+Staff_symbol::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Spanner* sp = dynamic_cast<Spanner*> (me);
@@ -37,8 +37,7 @@ Staff_symbol::brew_molecule (SCM smob)
 
     --hwn.
    */
-  
-  SCM width_scm = me->get_grob_property ("width");
+  SCM width_scm = me->get_property ("width");
   if (gh_number_p (width_scm))
     {
 
@@ -63,23 +62,20 @@ Staff_symbol::brew_molecule (SCM smob)
       width = 0;
     }
 
-  Real t = me->get_paper ()->get_var ("linethickness");
-  SCM my_thick = me->get_grob_property("thickness");
-  if (gh_number_p (my_thick))
-    t *= gh_scm2double (my_thick);
+  Real t = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  t *= robust_scm2double ( me->get_property("thickness"), 1.0);
   
   int l = Staff_symbol::line_count (me);
   
   Real height = (l-1) * staff_space (me) /2;
-  Molecule m;
+  Stencil m;
   for (int i=0; i < l; i++)
     {
-      Molecule a =
-       Lookup::filledbox (Box (Interval (0,width),
-                                        Interval (-t/2, t/2)));
+      Stencil a =
+       Lookup::horizontal_line (Interval (0,width), t);
 
       a.translate_axis (height - i * staff_space (me), Y_AXIS);
-      m.add_molecule (a);
+      m.add_stencil (a);
     }
 
   return m.smobbed_copy ();
@@ -94,7 +90,7 @@ Staff_symbol::get_steps (Grob*me)
 int
 Staff_symbol::line_count (Grob*me) 
 {
-  SCM c = me->get_grob_property ("line-count");
+  SCM c = me->get_property ("line-count");
   if (gh_number_p (c))
     return gh_scm2int (c);
   else
@@ -104,22 +100,33 @@ Staff_symbol::line_count (Grob*me)
 Real
 Staff_symbol::staff_space (Grob*me)
 {
-  Real ss = 1.0;
-  
-  SCM s = me->get_grob_property ("staff-space");
-  if (gh_number_p (s))
-    ss *= gh_scm2double (s);
-  return ss;
+  return robust_scm2double ( me->get_property ("staff-space"), 1.0);
 }
 
+Real
+Staff_symbol::get_line_thickness (Grob* me)
+{
+  Real lt =  me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
 
+  return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
+}
+
+Real
+Staff_symbol::get_ledger_line_thickness (Grob * me)
+{
+  SCM lt_pair = me->get_property ("ledger-line-thickness");
+  Offset z = robust_scm2offset (lt_pair, Offset (1.0, 0.1));
+  
+  return z[X_AXIS] * get_line_thickness(me) + z[Y_AXIS]* staff_space (me);
+}
 
 
 ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
-  "This spanner draws the lines of a staff.  The center (i.e. middle line
-or space) is position 0. The length of the symbol may be set by hand
-through the @code{width} property.
-",
+              "This spanner draws the lines of a staff. "
+              "A staff symbol definines a vertical unit, the staff space. "
+              "Quantities that go by a half staff space are called positions "
+              "The center (i.e. middle line "
+              "or space) is position 0. The length of the symbol may be set by hand "
+              "through the @code{width} property. ",
               
-  "width staff-space thickness line-count");
-
+  "ledger-line-thickness width staff-space thickness line-count");