* mf/merge.pe: new file.

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 030ce6ce6bc787773e45dd33d161a904d0d512d0..888e6836db9511097a1ae04989189b582b03486c 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -9,7 +9,7 @@
 #include "grob.hh"
 
 #include <cstring>
-#include <cmath>
+#include <math.h>
 
 #include "main.hh"
 #include "input-smob.hh"
@@ -48,7 +48,7 @@ Grob::Grob (SCM basicprops,
   key_ = key;
   /* FIXME: default should be no callback.  */
   self_scm_ = SCM_EOL;
-  pscore_= 0;
+  pscore_ = 0;
   status_ = 0;
   original_ = 0;
   immutable_property_alist_ =  basicprops;
@@ -90,7 +90,7 @@ Grob::Grob (SCM basicprops,
     {
       SCM l = get_property (onames[a]);
 
-      if (scm_ilength (l) >=0)
+      if (scm_ilength (l) >= 0)
        {
          dim_cache_[a].offset_callbacks_ = l;
          dim_cache_[a].offsets_left_ = scm_ilength (l);
@@ -414,7 +414,7 @@ Grob::extent (Grob *refp, Axis a) const
     ;
   else if (ly_c_procedure_p (d->dimension_))
     /* FIXME: add doco on types, and should typecheck maybe?  */
-    d->dimension_= scm_call_2 (d->dimension_, self_scm (), scm_int2num (a));
+    d->dimension_ = scm_call_2 (d->dimension_, self_scm (), scm_int2num (a));
   else
     return ext;