* lily/font-select.cc (get_font_by_design_size): revert

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index b8f7448e361c40c7684320bdc4044487b35a0082..f2298a92de21d9e497dc29e3f6a30802976a7af7 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -1,5 +1,5 @@
 /*   
-  multi-measure-rest.cc --  implement Multi_measure_rest
+  multi-measure-rest.cc -- implement Multi_measure_rest
   
   source file of the GNU LilyPond music typesetter
   
@@ -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) 
 {
@@ -312,10 +312,10 @@ 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 ();
   
@@ -328,8 +328,8 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
        continue;
 
       Rod rod;
-      rod.item_l_drul_[LEFT] = li;
-      rod.item_l_drul_[RIGHT] = ri;
+      rod.item_drul_[LEFT] = li;
+      rod.item_drul_[RIGHT] = ri;
 
       rod.distance_ = li->extent (li, X_AXIS)[BIGGER]
        - ri->extent (ri, X_AXIS)[SMALLER]
@@ -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");