* lily/include/transposed-music.hh (class Transposed_music): remove.

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

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index ecd9625c8b0ae500a3f4093c64cb6fa34ff67094..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]);
 
   /*
@@ -101,7 +101,7 @@ Staff_spacing::bar_y_positions (Grob *bar_grob)
     {
       SCM glyph = bar_grob->get_property ("glyph");
       
-      String glyph_string = is_string (glyph) ? ly_scm2string (glyph) : "";
+      String glyph_string = scm_is_string (glyph) ? ly_scm2string (glyph) : "";
       if (glyph_string.left_string (1) == "|" || glyph_string.left_string (1) == ".")
        {
          SCM sz = Bar_line::get_staff_bar_size (bar_grob->self_scm ());
@@ -125,17 +125,17 @@ 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");
-       is_pair (s);  s = ly_cdr (s))
+       scm_is_pair (s);  s = scm_cdr (s))
     {
-      Grob * g = unsmob_grob (ly_car (s));
+      Grob * g = unsmob_grob (scm_car (s));
 
       max_corr = max_corr >?  next_note_correction (me, g,  bar_size);
       for (SCM t = g->get_property ("elements");
-          is_pair (t); t  = ly_cdr (t))
-       max_corr = max_corr >? next_note_correction (me, unsmob_grob (ly_car (t)), bar_size);
+          scm_is_pair (t); t  = scm_cdr (t))
+       max_corr = max_corr >? next_note_correction (me, unsmob_grob (scm_car (t)), bar_size);
       
     }
   
@@ -148,13 +148,13 @@ 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");
-       is_pair (s); s = ly_cdr (s))
+       scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * cand = unsmob_grob (ly_car (s));
+      Grob * cand = unsmob_grob (scm_car (s));
       if (cand && Separation_item::has_interface (cand))
        separation_item = cand ;
     }
@@ -197,20 +197,20 @@ Staff_spacing::get_spacing_params (Grob *me, Real * space, Real * fixed)
   if (me_item->break_status_dir () == CENTER)
     {
       SCM nndef = scm_sloppy_assq (ly_symbol2scm ("next-note"), alist);
-      if (is_pair (nndef))
+      if (scm_is_pair (nndef))
        space_def = nndef;
     }
   
   
-  if (!is_pair (space_def))
+  if (!scm_is_pair (space_def))
     {
       programming_error ("Unknown prefatory spacing. "); 
       return; 
     }
 
-  space_def = ly_cdr (space_def);
-  Real distance = ly_scm2double (ly_cdr (space_def));
-  SCM type = ly_car (space_def) ;
+  space_def = scm_cdr (space_def);
+  Real distance = scm_to_double (scm_cdr (space_def));
+  SCM type = scm_car (space_def) ;
 
   *fixed = last_ext[RIGHT];
   if (type == ly_symbol2scm ("fixed-space"))