* make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 30c1d0e06cc9ff7a9ce32ca4c2c971cef1961528..0d95c82f8abec91b4ee09c5a2241e7a11df2f6af 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -22,7 +22,7 @@
 #include "lookup.hh"
 #include "separation-item.hh"
 
-MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1);
 SCM
 Multi_measure_rest::percent (SCM smob)
 {
@@ -58,13 +58,13 @@ Multi_measure_rest::percent (SCM smob)
    */
   x_off += sp_iv.length ()/ 2;
 
-  r.translate_axis (x_off,X_AXIS);
+  r.translate_axis (x_off, X_AXIS);
 
   
   return r.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Multi_measure_rest,print,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1);
 SCM
 Multi_measure_rest::print (SCM smob) 
 {
@@ -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);
@@ -312,14 +312,14 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   Item *lb = li->find_prebroken_piece (RIGHT);
   Item *rb = ri->find_prebroken_piece (LEFT);      
   
-  Item *combinations[4][2] = {{li,ri},
-                             {lb,ri},
-                             {li,rb},
-                             {lb,rb}};
+  Item *combinations[4][2] = {{li, ri},
+                             {lb, ri},
+                             {li, rb},
+                             {lb, rb}};
 
   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];
@@ -343,7 +343,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
+ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface",
               "A rest that spans a whole number of measures.",
               "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length");