($(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 5f5d916118b6771ac1c5db0d18f5987abcfa68e0..ab0c72b0d52e5dfa96e3da8a1c4ff7abe7208335 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,14 +3,14 @@
 
   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 "debug.hh"
+#include "stencil.hh"
+#include "warn.hh"
 #include "item.hh"
 #include "staff-symbol.hh"
 #include "staff-symbol-referencer.hh"
@@ -18,39 +18,39 @@
 
 
 
-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);
   Grob * common
     = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
   
-  bool paper_raggedright = to_boolean (me->paper_l ()->get_scmvar ("raggedright"));
-  bool grob_raggedright = to_boolean (me->get_grob_property ("ragged-right"));
-  Real width;
+  Real width  = 0.0;
 
+  /*
+    For raggedright without ragged staffs, simply set width to the linewidth.
+
+    (ok -- lousy UI, since width is in staff spaces)
+
+    --hwn.
+   */
   SCM width_scm = me->get_grob_property ("width");
-  if (gh_number_p (width_scm)) // user-defined width
+  if (gh_number_p (width_scm))
     {
-      width =
-       gh_scm2double (width_scm) *
-       Staff_symbol_referencer::staff_space (me);
+
+      /*
+       don't multiply by Staff_symbol_referencer::staff_space (me),
+       since that would make aligning staff symbols of different sizes to
+       one right margin hell.
+      */      
+      width = gh_scm2double (width_scm);
     }
-  else // determine width automatically
+  else
     {
-      if (paper_raggedright && !grob_raggedright)
-       {
-         // *prevent* staff symbol from being ragged right; instead, use
-         // paper variable "linewidth"
-         width = me->paper_l ()->get_var ("linewidth");
-       }
-      else // determine width from my own bounds
-       {
-         width = sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS);
-       }
+      width = sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS);
     }
 
   // respect indentation, if any
@@ -62,30 +62,27 @@ Staff_symbol::brew_molecule (SCM smob)
       width = 0;
     }
 
-  Real t = me->paper_l ()->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_grob_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 ();
 }
 
 int
-Staff_symbol::steps_i (Grob*me) 
+Staff_symbol::get_steps (Grob*me) 
 {
   return line_count (me) * 2;
 }
@@ -103,20 +100,30 @@ 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_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",
-  "This spanner draws the lines of a staff.  The center (i.e. middle line
-or space) is position 0.",
+  "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. ",
               
-  "staff-space thickness line-count");
-
+  "ledger-line-thickness width staff-space thickness line-count");