new file, move from

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 53beacabb045a61e08c81b3f75024d8573f4e21f..695ebb201c54a9ed893fd831910a79b5af65d874 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 "output-def.hh"
+#include "stencil.hh"
 #include "warn.hh"
 #include "item.hh"
 #include "staff-symbol.hh"
@@ -18,17 +18,18 @@
 
 
 
-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);
   
-  Real width  = 0.0;
+  Interval span_points (0,0);
+  
 
   /*
     For raggedright without ragged staffs, simply set width to the linewidth.
@@ -37,49 +38,50 @@ Staff_symbol::brew_molecule (SCM smob)
 
     --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
+  Direction d = LEFT;
+  do
     {
-      width = sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS);
+      SCM width_scm = me->get_property ("width");
+      if (d == RIGHT && ly_c_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.
+         */      
+         span_points[RIGHT] = ly_scm2double (width_scm);
+       }
+      else
+       {
+         Item * x = sp->get_bound (d);
+
+         span_points[d] = x->relative_coordinate (common , X_AXIS);
+         if (!x->break_status_dir ()
+             && !x->extent (x, X_AXIS).is_empty ())
+           span_points[d] += x->extent (x, X_AXIS)[d];
+       }
     }
+  while (flip (&d) !=LEFT);
 
-  // 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_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_dimension (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 a =
+    Lookup::horizontal_line (span_points
+                            -me->relative_coordinate (common, X_AXIS),
+                            t);
+
+  Stencil m;
   for (int i=0; i < l; i++)
     {
-      Molecule a =
-       Lookup::horizontal_line (Interval (0,width), t);
-
-      a.translate_axis (height - i * staff_space (me), Y_AXIS);
-      m.add_molecule (a);
+      Stencil b(a);
+      b.translate_axis (height - i * staff_space (me), Y_AXIS);
+      m.add_stencil (b);
     }
-
   return m.smobbed_copy ();
 }
 
@@ -92,9 +94,9 @@ Staff_symbol::get_steps (Grob*me)
 int
 Staff_symbol::line_count (Grob*me) 
 {
-  SCM c = me->get_grob_property ("line-count");
-  if (gh_number_p (c))
-    return gh_scm2int (c);
+  SCM c = me->get_property ("line-count");
+  if (ly_c_number_p (c))
+    return ly_scm2int (c);
   else
     return 0;
 }
@@ -102,21 +104,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_dimension (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");