X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=c1634ac4fee4dff6305216f059a56e02a09f63c8;hb=2a334fabd98bb8aaab153b83f2cd5f37faaf238a;hp=75bb907c140514249a99f57a561e2f84b9d3d714;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 75bb907c14..c1634ac4fe 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,73 +3,90 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "staff-symbol.hh"
+
 #include "lookup.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
-#include "molecule.hh"
-#include "debug.hh"
+#include "output-def.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_grob (smob);
   Spanner* sp = dynamic_cast<Spanner*> (me);
   Grob * common
     = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
   
-  bool ragged = to_boolean (me->paper_l ()->get_scmvar ("raggedright"));
-  Real width;
-  if (ragged)
-    {
-      // *prevent* staff symbol from being ragged right
-      width =
-	me->paper_l ()->get_var ("linewidth")
-	- sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS)
-	;
-    }
-  else
+  Interval span_points (0, 0);
+  
+
+  /*
+    For raggedright without ragged staffs, simply set width to the linewidth.
+
+    (ok -- lousy UI, since width is in staff spaces)
+
+    --hwn.
+   */
+  Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  t *= robust_scm2double (me->get_property ("thickness"), 1.0);
+  
+  Direction d = LEFT;
+  do
     {
-      width =
-	// right_shift     - left_shift
-	+ sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS)
-	- sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS)
-	;
+      SCM width_scm = me->get_property ("width");
+      if (d == RIGHT && scm_is_number (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] = scm_to_double (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];
+	}
+
+      span_points[d] -= d* t/2;
     }
+  while (flip (&d) != LEFT);
+
 
-  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);
-  
   int l = Staff_symbol::line_count (me);
   
   Real height = (l-1) * staff_space (me) /2;
-  Molecule 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 (span_points
+			     -me->relative_coordinate (common, X_AXIS),
+			     t);
 
-      a.translate_axis (height - i * staff_space (me), Y_AXIS);
-      m.add_molecule (a);
+  Stencil m;
+  for (int i = 0; i < l; i++)
+    {
+      Stencil b(a);
+      b.translate_axis (height - i * staff_space (me), Y_AXIS);
+      m.add_stencil (b);
     }
-
   return m.smobbed_copy ();
 }
 
 int
-Staff_symbol::steps_i (Grob*me) 
+Staff_symbol::get_steps (Grob*me) 
 {
   return line_count (me) * 2;
 }
@@ -77,9 +94,9 @@ Staff_symbol::steps_i (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 (scm_is_number (c))
+    return scm_to_int (c);
   else
     return 0;
 }
@@ -87,20 +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_layout ()->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.",
+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. ",
 	       
-  "staff-space thickness line-count");
-
+  "ledger-line-thickness width staff-space thickness line-count");