patch::: 1.3.107.mb1: Re: lily 1.3.107

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index e414c09bf64c3538ae34fab29f8a8f8ef706c9eb..c6e143d3299e3ce666e8b48592761628810bd637 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -11,13 +11,14 @@
 #include "debug.hh"
 #include "paper-def.hh"
 #include "paper-column.hh" // urg
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "rest.hh"
 #include "molecule.hh"
 #include "misc.hh"
 #include "group-interface.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
+#include "text-item.hh"
 
 void
 Multi_measure_rest::set_interface (Score_element*me)
@@ -41,6 +42,17 @@ Multi_measure_rest::brew_molecule (SCM smob)
 {
   Score_element *me = unsmob_element (smob);
   Spanner * sp = dynamic_cast<Spanner*> (me);
+
+  SCM alist_chain = Font_interface::font_alist_chain (me);
+
+  
+  SCM style_chain =
+    Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"),
+                              alist_chain);
+
+  Font_metric *musfont
+    = Font_interface::get_font (me,style_chain);
+                       
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   Interval sp_iv;
@@ -49,8 +61,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
     {
       Item * col = sp->get_bound (d)->column_l ();
 
-      Interval coldim = col->extent (X_AXIS)
-       + col->relative_coordinate (0, X_AXIS);
+      Interval coldim = col->extent (0, X_AXIS);
 
       sp_iv[d] = coldim[-d]  ;
     }
@@ -111,7 +122,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
          Real pad = s.empty_b ()
            ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space;
 
-         Molecule r (me->lookup_l ()->afm_find ("rests-" + to_str (k)));
+         Molecule r (musfont->find_by_name ("rests-" + to_str (k)));
          if (k == 0)
            r.translate_axis (staff_space, Y_AXIS);
          
@@ -124,20 +135,22 @@ Multi_measure_rest::brew_molecule (SCM smob)
   else 
     {
       String idx =  ("rests-") + to_str (-4);
-      s = me->lookup_l ()->afm_find (idx);
+      s = musfont->find_by_name (idx);
     }
   
   mol.add_molecule (s);
 
   if (measures > 1)
     {
-      Molecule s (me->lookup_l ()->text ("number", to_str (measures), me->paper_l ()));
+      Molecule s = Text_item::text2molecule (me,
+                                            ly_str02scm (to_str (measures).ch_C ()),
+                                            alist_chain);
       s.align_to (X_AXIS, CENTER);
       s.translate_axis (3.0 * staff_space, Y_AXIS);
       mol.add_molecule (s);
     }
   mol.translate_axis (x_off, X_AXIS);
-  return mol.create_scheme();
+  return mol.smobbed_copy();
 }
 
 /*
@@ -146,8 +159,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
 void
 Multi_measure_rest::add_column (Score_element*me,Item* c)
 {
-  Pointer_group_interface gi (me, "columns");
-  gi.add_element (c);
+  Pointer_group_interface::add_element (me, "columns",c);
 
   add_bound_item (dynamic_cast<Spanner*> (me),c);
 }
@@ -189,7 +201,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
        /*
          should do something more advanced.
         */
-      rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER]
+      rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
        + gh_scm2double (me->get_elt_property ("minimum-width")) * staff_space;
   
       rod.add_to_cols ();