* mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index cb9cd684e95ff147ea2ca7ce819c6e839caf2572..baa061b2e4107b827fcaf29c2b3dbc7d41a5dbc3 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -8,12 +8,12 @@
  */
 
 #include "multi-measure-rest.hh"
+
 #include "warn.hh"
 #include "output-def.hh"
 #include "paper-column.hh" // urg
 #include "font-interface.hh"
 #include "rest.hh"
-#include "stencil.hh"
 #include "misc.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
@@ -139,7 +139,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Font_metric *musfont
-    = select_font (me->get_paper (), alist_chain);
+    = select_font (me->get_layout (), alist_chain);
 
   SCM sml = me->get_property ("use-breve-rest");
   if (measures == 1)
@@ -180,12 +180,12 @@ 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);
 
 
   Real ss = Staff_symbol_referencer::staff_space (me);
-  Real slt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real slt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real y = slt * thick_thick/2 * ss;
   Real ythick = hair_thick * slt * ss;
   Box b (Interval (0,  0 >? (width - 2 * ythick)), Interval (-y, y));
@@ -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);
@@ -279,8 +279,8 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
     inner_padding = 1.0;
   
   Stencil mol; 
-  for (SCM  s = mols; ly_c_pair_p (s); s = ly_cdr (s))
-      mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (ly_car (s)),
+  for (SCM  s = mols; scm_is_pair (s); s = scm_cdr (s))
+      mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)),
                       inner_padding, 0);
   mol.align_to (X_AXIS, LEFT);
   mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
@@ -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];