release: 1.4.3

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 7a83efbd41675d0138e6404b21a072d0dcb8f6cd..9870a13a883dcfc7bf28ec01b1419c42e6616114 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -19,6 +19,8 @@
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
 #include "text-item.hh"
+#include "percent-repeat-item.hh"
+
 
 void
 Multi_measure_rest::set_interface (Grob*me)
@@ -36,12 +38,11 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
 SCM
 Multi_measure_rest::percent (SCM smob)
 {
+  
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner*> (me);
   
-  Font_metric *musfont = Font_interface::get_default_font (me);
-                       
-  Molecule r (musfont->find_by_name ("scripts-repeatsign"));
+  Molecule r = Percent_repeat_item_interface::x_percent (me, 1,  0.75, 1.6);
 
   // ugh copy & paste.
   
@@ -135,7 +136,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
   
   Molecule s;
 
-  int measures = 1;
+  int measures = 0;
   SCM m (me->get_grob_property ("measure-count"));
   if (gh_number_p (m))
     {
@@ -144,6 +145,8 @@ Multi_measure_rest::brew_molecule (SCM smob)
   
 
   SCM limit = me->get_grob_property ("expand-limit");
+  if (measures <= 0)
+    return SCM_EOL;
   if (measures == 1)
     {
       s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));