X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=5d0d7d97135b1d8f46e8f266e86e81f632c4b83d;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=20199593994f1ba0c0386daf56cce529c6af20aa;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 2019959399..5d0d7d9713 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -12,6 +12,7 @@
 #include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 #include "moment.hh"
+#include "spanner.hh"
 
 #include "translator.icc"
 
@@ -137,7 +138,7 @@ Multi_measure_rest_engraver::process_music ()
 	}
 
       start_measure_
-	= scm_to_int (get_property ("currentBarNumber"));
+	= scm_to_int (get_property ("internalBarNumber"));
     }
 
   bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
@@ -204,7 +205,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       last_rest_ = mmrest_;
       last_numbers_ = numbers_;
 
-      int cur = scm_to_int (get_property ("currentBarNumber"));
+      int cur = scm_to_int (get_property ("internalBarNumber"));
       int num = cur - start_measure_;
 
       /*
@@ -251,16 +252,21 @@ Multi_measure_rest_engraver::finalize ()
 ADD_TRANSLATOR (Multi_measure_rest_engraver,
 		/* doc */
 		"Engraves multi-measure rests that are produced with @code{R}.  Reads "
-		"measurePosition and currentBarNumber to determine what number to print "
-		"over the MultiMeasureRest.  Reads measureLength to determine if it "
+		"@code{measurePosition} and @code{internalBarNumber} to determine what number to print "
+		"over the @ref{MultiMeasureRest}.  Reads @code{measureLength} to determine if it "
 		"should use a whole rest or a breve rest to represent 1 measure ",
-		/* create */ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText",
-		/* accept */ "multi-measure-rest-event multi-measure-text-event",
+		
+		/* create */
+		"MultiMeasureRest "
+		"MultiMeasureRestNumber "
+		"MultiMeasureRestText ",
+
 		/* read */
-		"currentBarNumber "
+		"internalBarNumber "
 		"restNumberThreshold "
 		"breakableSeparationItem "
 		"currentCommandColumn "
 		"measurePosition "
-		"measureLength",
+		"measureLength ",
+		
 		/* write */ "");