X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=4d186e87bfc4e03f5936ce50a5387de5776c11f2;hb=8f8b3fb62d5d0776335de899b32aada69457810a;hp=bda21ab5e4073c20a4af81161baba10cfeb0160e;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index bda21ab5e4..4d186e87bf 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,33 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 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 "stencil.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,print,1);
+MAKE_SCHEME_CALLBACK (Staff_symbol, print, 1);
 
 SCM
 Staff_symbol::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Spanner* sp = dynamic_cast<Spanner*> (me);
-  Grob * common
+  Spanner *sp = dynamic_cast<Spanner *> (me);
+  Grob *common
     = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
-  
-  Interval span_points (0,0);
-  
+
+  Interval span_points (0, 0);
 
   /*
     For raggedright without ragged staffs, simply set width to the linewidth.
@@ -37,48 +34,49 @@ Staff_symbol::print (SCM smob)
     (ok -- lousy UI, since width is in staff spaces)
 
     --hwn.
-   */
+  */
+  Real t = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  t *= robust_scm2double (me->get_property ("thickness"), 1.0);
+
   Direction d = LEFT;
   do
     {
       SCM width_scm = me->get_property ("width");
-      if (d == RIGHT && is_number (width_scm))
+      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] = ly_scm2double (width_scm);
+	  */
+	  span_points[RIGHT] = scm_to_double (width_scm);
 	}
       else
 	{
-	  Item * x = sp->get_bound (d);
+	  Item *x = sp->get_bound (d);
 
-	  span_points[d] = x->relative_coordinate (common , X_AXIS);
+	  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);
 
+      span_points[d] -= d* t / 2;
+    }
+  while (flip (&d) != LEFT);
 
-  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;
-  Stencil a =
-    Lookup::horizontal_line (span_points
-			     -me->relative_coordinate (common, X_AXIS),
-			     t);
+
+  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++)
+  for (int i = 0; i < l; i++)
     {
-      Stencil b(a);
+      Stencil b (a);
       b.translate_axis (height - i * staff_space (me), Y_AXIS);
       m.add_stencil (b);
     }
@@ -86,51 +84,50 @@ Staff_symbol::print (SCM smob)
 }
 
 int
-Staff_symbol::get_steps (Grob*me) 
+Staff_symbol::get_steps (Grob *me)
 {
   return line_count (me) * 2;
 }
 
 int
-Staff_symbol::line_count (Grob*me) 
+Staff_symbol::line_count (Grob *me)
 {
   SCM c = me->get_property ("line-count");
-  if (is_number (c))
-    return ly_scm2int (c);
+  if (scm_is_number (c))
+    return scm_to_int (c);
   else
     return 0;
 }
 
 Real
-Staff_symbol::staff_space (Grob*me)
+Staff_symbol::staff_space (Grob *me)
 {
-  return robust_scm2double ( me->get_property ("staff-space"), 1.0);
+  return robust_scm2double (me->get_property ("staff-space"), 1.0);
 }
 
 Real
-Staff_symbol::get_line_thickness (Grob* me)
+Staff_symbol::get_line_thickness (Grob *me)
 {
-  Real lt =  me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->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)
+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);
-}
 
+  return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me);
+}
 
-ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
+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");
+
+	       "ledger-line-thickness width staff-space thickness line-count");