X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstaff-symbol.cc;h=f6e8d6890f4154efdcaaa9f31de40ee372d0cf8d;hb=72b030aeed611d4a24ed6ade7fcc570cceac4c0d;hp=7fa97b3e3598641680c1b79fb25b199665a0e711;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 7fa97b3e35..f6e8d6890f 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,56 +3,86 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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"
 #include "spanner.hh"
 
 
 
-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_element (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);
   
-  Real width =
-    // right_shift     - left_shift
-    + sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS)
-    - sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS)
-    ;
+  Real width  = 0.0;
 
-  Real t = me->paper_l ()->get_var ("stafflinethickness");
+  /*
+    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))
+    {
+
+      /*
+	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
+    {
+      width = sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS);
+    }
+
+  // respect indentation, if any
+  width -= sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
+
+  if (width < 0)
+    {
+      warning (_f ("staff symbol: indentation yields beyond end of line"));
+      width = 0;
+    }
+
+  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;
 }
@@ -68,18 +98,35 @@ Staff_symbol::line_count (Grob*me)
 }
 
 Real
-Staff_symbol::staff_space (Grob*me )
+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;
 }
 
-bool
-Staff_symbol::has_interface (Grob*m)
+Real
+Staff_symbol::get_ledger_line_thickness (Grob * me)
 {
-  return m && m->has_interface (ly_symbol2scm ("staff-symbol-interface"));
+  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. "
+	       "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. ",
+	       
+  "ledger-line-thickness width staff-space thickness line-count");