Grand fixcc.py run on all .hh .cc files.

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index d1629dfb243fbe26d88323a052a9b9aeffd1ce3d..f80a5c57741dfc1c2523f403fa809149c370d8d3 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -54,25 +54,25 @@ Staff_symbol::print (SCM smob)
     {
       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);
-       }
+        {
+          /*
+            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);
+        {
+          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] = 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;
+      span_points[d] -= d * t / 2;
     }
   while (flip (&d) != LEFT);
 
@@ -81,36 +81,35 @@ Staff_symbol::print (SCM smob)
   SCM line_positions = me->get_property ("line-positions");
   Stencil line
     = Lookup::horizontal_line (span_points
-                              -me->relative_coordinate (common, X_AXIS),
-                              t);
+                               - me->relative_coordinate (common, X_AXIS),
+                               t);
 
   Real space = staff_space (me);
   if (scm_is_pair (line_positions))
     {
       for (SCM s = line_positions; scm_is_pair (s);
-          s = scm_cdr (s))
-       {
-         Stencil b (line);
-         b.translate_axis (scm_to_double (scm_car (s))
-                           * 0.5 * space, Y_AXIS);
-         m.add_stencil (b);
-       }
+           s = scm_cdr (s))
+        {
+          Stencil b (line);
+          b.translate_axis (scm_to_double (scm_car (s))
+                            * 0.5 * space, Y_AXIS);
+          m.add_stencil (b);
+        }
     }
   else
     {
       int l = Staff_symbol::line_count (me);
       Real height = (l - 1) * staff_space (me) / 2;
       for (int i = 0; i < l; i++)
-       {
-         Stencil b (line);
-         b.translate_axis (height - i * space, Y_AXIS);
-         m.add_stencil (b);
-       }
+        {
+          Stencil b (line);
+          b.translate_axis (height - i * space, Y_AXIS);
+          m.add_stencil (b);
+        }
     }
   return m.smobbed_copy ();
 }
 
-
 int
 Staff_symbol::get_steps (Grob *me)
 {
@@ -150,14 +149,14 @@ Staff_symbol::get_ledger_line_thickness (Grob *me)
   return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me);
 }
 
-MAKE_SCHEME_CALLBACK (Staff_symbol, height,1);
+MAKE_SCHEME_CALLBACK (Staff_symbol, height, 1);
 SCM
-Staff_symbol::height  (SCM smob)
+Staff_symbol::height (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
-  
+
   SCM line_positions = me->get_property ("line-positions");
 
   Interval y_ext;
@@ -165,8 +164,8 @@ Staff_symbol::height  (SCM smob)
   if (scm_is_pair (line_positions))
     {
       for (SCM s = line_positions; scm_is_pair (s);
-          s = scm_cdr (s))
-       y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space);
+           s = scm_cdr (s))
+        y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space);
     }
   else
     {
@@ -174,7 +173,7 @@ Staff_symbol::height  (SCM smob)
       Real height = (l - 1) * staff_space (me) / 2;
       y_ext = Interval (-height, height);
     }
-  y_ext.widen (t/2);
+  y_ext.widen (t / 2);
   return ly_interval2scm (y_ext);
 }
 
@@ -187,20 +186,20 @@ Staff_symbol::on_line (Grob *me, int pos)
       Real min_line = HUGE_VAL;
       Real max_line = -HUGE_VAL;
       for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s))
-       {
-         Real current_line = scm_to_double (scm_car (s));
-         if (pos == current_line)
-           return true;
-         if (current_line > max_line)
-           max_line = current_line;
-         if (current_line < min_line)
-           min_line = current_line;
-       
-       }
+        {
+          Real current_line = scm_to_double (scm_car (s));
+          if (pos == current_line)
+            return true;
+          if (current_line > max_line)
+            max_line = current_line;
+          if (current_line < min_line)
+            min_line = current_line;
+
+        }
       if (pos < min_line)
-       return (( (int) (rint (pos - min_line)) % 2) == 0);
+        return (( (int) (rint (pos - min_line)) % 2) == 0);
       if (pos > max_line)
-       return (( (int) (rint (pos - max_line)) % 2) == 0);
+        return (( (int) (rint (pos - max_line)) % 2) == 0);
 
       return false;
     }
@@ -227,18 +226,18 @@ Staff_symbol::line_span (Grob *me)
 }
 
 ADD_INTERFACE (Staff_symbol,
-              "This spanner draws the lines of a staff.  A staff symbol"
-              " defines a vertical unit, the @emph{staff space}.  Quantities"
-              " that go by a half staff space are called @emph{positions}."
-              "  The center (i.e., middle line or space) is position@tie{}0."
-              " The length of the symbol may be set by hand through the"
-              " @code{width} property.",
-
-              /* properties */
-              "ledger-line-thickness "
-              "line-count "
-              "line-positions "
-              "staff-space "
-              "thickness "
-              "width "
-              );
+               "This spanner draws the lines of a staff.  A staff symbol"
+               " defines a vertical unit, the @emph{staff space}.  Quantities"
+               " that go by a half staff space are called @emph{positions}."
+               "  The center (i.e., middle line or space) is position@tie{}0."
+               " The length of the symbol may be set by hand through the"
+               " @code{width} property.",
+
+               /* properties */
+               "ledger-line-thickness "
+               "line-count "
+               "line-positions "
+               "staff-space "
+               "thickness "
+               "width "
+              );