* mf/merge.pe: new file.

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 30c1d0e06cc9ff7a9ce32ca4c2c971cef1961528..baa061b2e4107b827fcaf29c2b3dbc7d41a5dbc3 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -180,7 +180,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
 Stencil
 Multi_measure_rest::big_rest (Grob *me, Real width)
 {
-  Real thick_thick =robust_scm2double (me->get_property ("thick-thickness"), 1.0);
+  Real thick_thick = robust_scm2double (me->get_property ("thick-thickness"), 1.0);
   Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1);
 
 
@@ -235,7 +235,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
              k = -1;
            }
 
-         Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
+         Stencil r (musfont->find_by_name ("rests." + to_string (k)));
          symbols_width += r.extent (X_AXIS).length ();
          mols = scm_cons (r.smobbed_copy (), mols);
        }
@@ -258,7 +258,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
              l--;
            }
 
-         Stencil r (musfont->find_by_name ("rests-" + to_string (k)));
+         Stencil r (musfont->find_by_name ("rests." + to_string (k)));
          if (k == 0)
            {
              Real staff_space = Staff_symbol_referencer::staff_space (me);
@@ -319,7 +319,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
 
   Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
   
-  for (int i=0; i < 4; i++)
+  for (int i = 0; i < 4; i++)
     {
       Item *li = combinations[i][0];
       Item *ri = combinations[i][1];