X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=e6b73143fea5770213d3627c05789003ed88f857;hb=d393626a5a05ae79713f94714cd203dc8ba2dd14;hp=bb0a9674c05b4bb6e2e1fa93c0144868be28295a;hpb=c484fb1da7751d35734194e623cb823b559e190f;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index bb0a9674c0..e6b73143fe 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -8,7 +8,7 @@
 
 #include "lookup.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "stencil.hh"
 #include "warn.hh"
 #include "item.hh"
@@ -28,7 +28,8 @@ Staff_symbol::print (SCM smob)
   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,47 +38,52 @@ Staff_symbol::print (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
+  Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  t *= robust_scm2double (me->get_property ("thickness"), 1.0);
+  
+  Direction d = LEFT;
+  do
     {
-      width = sp->get_bound (RIGHT)->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);
 
-  // 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;
+  Stencil a =
+    Lookup::horizontal_line (span_points
+			     -me->relative_coordinate (common, X_AXIS),
+			     t);
+
   Stencil m;
   for (int i=0; i < l; i++)
     {
-      Stencil a =
-	Lookup::horizontal_line (Interval (0,width), t);
-
-      a.translate_axis (height - i * staff_space (me), Y_AXIS);
-      m.add_stencil (a);
+      Stencil b(a);
+      b.translate_axis (height - i * staff_space (me), Y_AXIS);
+      m.add_stencil (b);
     }
-
   return m.smobbed_copy ();
 }
 
@@ -90,9 +96,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 (scm_is_number (c))
+    return scm_to_int (c);
   else
     return 0;
 }
@@ -100,30 +106,30 @@ 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_property ("staff-space"), 1.0);
 }
 
 Real
 Staff_symbol::get_line_thickness (Grob* me)
 {
-  Real lt =  me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real lt =  me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
 
-  return robust_scm2double (me->get_grob_property ("thickness"), 1.0) * lt;
+  return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }
 
 Real
 Staff_symbol::get_ledger_line_thickness (Grob * me)
 {
-  SCM lt_pair = me->get_grob_property ("ledger-line-thickness");
+  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);
+  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 "
+	       "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 "