* lily/breathing-sign.cc (offset_callback): idem.

* lily/align-interface.cc (align_to_fixed_distance): remove
hungarian suffix.

diff --git a/ChangeLog b/ChangeLog
index 7fcc442275e947b07af96bfc8c18ff15ad2115c9..f464a1aa664d8cbc08c2482b175be6c8a24b0343 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-16  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/breathing-sign.cc (offset_callback): idem.
+
+       * lily/align-interface.cc (align_to_fixed_distance): remove
+       hungarian suffix.
+
        * lily/beaming-pattern.cc (count_factor_twos): oops. We want to
        x%2==0.
 

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 410344dae2487a58065812212e920e9672820f5f..afe470251ccac043c57940e159483a4be3de383c 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -93,7 +93,7 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 
   vector<Grob*> elems (elem_source); // writable..
 
-  Real where_f = 0;
+  Real where = 0;
 
   Interval v;
   v.set_empty ();
@@ -118,9 +118,9 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a)
 
   for (vsize j = 0; j < elems.size (); j++)
     {
-      where_f += stacking_dir * dy;
-      translates.push_back (where_f);
-      v.unite (Interval (where_f, where_f));
+      where += stacking_dir * dy;
+      translates.push_back (where);
+      v.unite (Interval (where, where));
     }
 
   /*

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index f39e748fb54f72e91edff6e418dd3a93621516b5..f8d02996f49a564f90d1d2e3bff3a4870239b689 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -173,11 +173,14 @@ Breathing_sign::offset_callback (SCM smob)
       set_grob_direction (me, d);
     }
 
-  Real inter_f = Staff_symbol_referencer::staff_space (me) / 2;
+  Real inter = Staff_symbol_referencer::staff_space (me) / 2;
   int sz = Staff_symbol_referencer::line_count (me) - 1;
-  return scm_from_double (inter_f * sz * d);
+  return scm_from_double (inter * sz * d);
 }
 
 ADD_INTERFACE (Breathing_sign, "breathing-sign-interface",
               "A breathing sign.",
-              "direction");
+              
+              "direction "
+
+              );