* lily/modified-font-metric.cc (text_dimension): try

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

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 6e4ba374c08ad8a69e12dda922357612ad398eb0..e128f9c745eaa1410e68be57e492ededc8f4826f 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -6,13 +6,13 @@
      (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 */
-#include <stdio.h>
+
+#include "staff-spacing.hh"
+
+#include <cstdio>
 
 #include "paper-column.hh" 
 #include "separation-item.hh"
-#include "item.hh"
-#include "staff-spacing.hh"
-#include "grob.hh"
 #include "warn.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
@@ -33,7 +33,7 @@ Staff_spacing::next_note_correction (Grob * me,
   if (!g || !Note_column::has_interface (g))
     return 0.0;
 
-  Item *col =dynamic_cast<Item*> (g)->get_column ();
+  Item *col = dynamic_cast<Item*> (g)->get_column ();
   Real max_corr = 0. >? (- g->extent (col, X_AXIS)[LEFT]);
 
   /*
@@ -125,7 +125,7 @@ Real
 Staff_spacing::next_notes_correction (Grob *me, Grob * last_grob)
 {
   Interval bar_size = bar_y_positions (last_grob);
-  Real max_corr =0.0;
+  Real max_corr = 0.0;
 
   for (SCM s = me->get_property ("right-items");
        scm_is_pair (s);  s = scm_cdr (s))
@@ -148,7 +148,7 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   *space = 1.0;
   *fixed = 1.0;
 
-  Grob * separation_item=0;
+  Grob * separation_item = 0;
   Item * me_item  = dynamic_cast<Item*> (me);
     
   for (SCM s = me->get_property ("left-items");