*** empty log message ***

[lilypond.git] / lily / break-substitution.cc

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 7415d4950bc7b19abb49e4b4f87398679d0a3372..29298fe15aab2ed123b02c92a8b8eb6eb5c60d42 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -1,10 +1,8 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
-#include  "grob.hh"
 #include "item.hh"
-#include  "spanner.hh"
-#include  "system.hh"
+#include "system.hh"
 
 static SCM break_criterion; 
 void
@@ -144,7 +142,7 @@ substitute_grob_list (SCM grob_list)
 
   for (SCM s = grob_list; scm_is_pair (s); s =  scm_cdr (s))
     {
-      SCM n= substitute_grob (unsmob_grob (scm_car (s)));
+      SCM n = substitute_grob (unsmob_grob (scm_car (s)));
 
       if (n != SCM_UNDEFINED)
        {
@@ -230,7 +228,7 @@ spanner_system_range (Spanner* sp)
 Slice
 item_system_range (Item* it)
 {
-  if (System*st= it->get_system ())
+  if (System*st = it->get_system ())
     return Slice (st->rank_, st->rank_);
 
   Slice sr;
@@ -241,7 +239,7 @@ item_system_range (Item* it)
       if (bi && bi->get_system ())
        sr.add_point (bi->get_system ()->rank_);
     }
-  while (flip (&d)!=LEFT);
+  while (flip (&d)!= LEFT);
   
   return sr;
 }
@@ -287,7 +285,7 @@ struct Substitution_entry
   }
   Substitution_entry ()
   {
-    grob_ =0;
+    grob_ = 0;
     left_ = right_ = -2;
   }
   
@@ -409,7 +407,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym,
      for (int k = 0; k < 2;k++)
        for (int j = (*arrs[k])[i][LEFT]; j <= (*arrs[k])[i][RIGHT]; j++)
          {
-           SCM subs =substitute_grob (vec[j].grob_);
+           SCM subs = substitute_grob (vec[j].grob_);
            if (subs!= SCM_UNDEFINED)
              {
                *tail = scm_cons (subs, SCM_EOL);
@@ -426,7 +424,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym,
              sp_indices[i].length () , len -sp_index);
              
       {
-       SCM l1 =substitute_grob_list (grob_list);
+       SCM l1 = substitute_grob_list (grob_list);
        assert (scm_ilength (l1) == scm_ilength (newval));
       }
 #endif
@@ -463,7 +461,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym,
 SCM
 substitute_mutable_property_alist (SCM alist)
 {
-  SCM grob_list_p = ly_scheme_function ("grob-list?");
+  SCM grob_list_p = ly_lily_module_constant ("grob-list?");
 
   SCM l = SCM_EOL;
   SCM *tail = &l;
@@ -501,7 +499,7 @@ Spanner::substitute_one_mutable_property (SCM sym,
   Spanner*s = this;
   
   bool fast_done = false;
-  SCM grob_list_p = ly_scheme_function ("grob-list?");
+  SCM grob_list_p = ly_lily_module_constant ("grob-list?");
   if (type == grob_list_p)
     fast_done = s->fast_fubstitute_grob_list (sym, val);