release: 1.3.6

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index a7974c5ead393a78206aa057c0b456130525cfd5..fbfbdb5ff1fe3b6a3c46c88fe4463479866d3f7e 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -18,7 +18,7 @@ void
 Rest::do_add_processing ()
 {
   if (balltype_i_ == 0)
-    position_i_ += 2;          // guh.
+    set_position (position_f () + 2);
 
   Rhythmic_head::do_add_processing ();
 }
@@ -56,11 +56,10 @@ Rest::do_brew_molecule_p () const
     {
       style = ly_scm2string (style_sym);
     }
-  
-  Molecule s(lookup_l ()->rest (balltype_i_, ledger_b, style));
-  Molecule * m = new Molecule ( Molecule (s));
 
-  return m;
+  String idx =  ("rests-") + to_str (balltype_i_) + (ledger_b ? "o" : "") + style;
+
+  return new Molecule(lookup_l ()->afm_find (idx));
 }