($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 69a332b6a147dde767421812aae757e5a48c79f8..ab0c72b0d52e5dfa96e3da8a1c4ff7abe7208335 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--2003 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);
@@ -68,14 +68,14 @@ Staff_symbol::brew_molecule (SCM smob)
   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 =
+      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 ();
@@ -100,10 +100,25 @@ Staff_symbol::line_count (Grob*me)
 Real
 Staff_symbol::staff_space (Grob*me)
 {
-  return  robust_scm2double ( me->get_grob_property ("staff-space"), 1.0);
+  return robust_scm2double ( me->get_grob_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_grob_property ("thickness"), 1.0) * lt;
+}
+
+Real
+Staff_symbol::get_ledger_line_thickness (Grob * me)
+{
+  SCM lt_pair = me->get_grob_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",
@@ -111,5 +126,4 @@ ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
 "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");