patch::: 1.1.22.jcn3: jcn3

pl 22.jcn3
	- bf: mmrest

diff --git a/NEWS b/NEWS
index a3ad4ae23aadbc20028b527ecc6cb61e1238005c..b928b79688e5ca9f4c14a219fa173204404c86d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 22.jcn3
+       - bf: mmrest
+
 pl 22.jcn2
        - updated mi2mu
        - bf: multi-measure-rest (input/test/m.ly)

diff --git a/VERSION b/VERSION
index 7ea9167167d5a50da5823aacb5af56d2c1bde376..1f7d0570d919af45e360f5ecb01707fbd6a4d80c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=22
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 7f0c7583b1dc06eb46829171d9ea150b26ec60ac..6f3ba9597aed4d8991bea7340982d8710dc76710 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -77,7 +77,10 @@ void
 Multi_measure_rest_engraver::do_pre_move_processing ()
 {
   Moment now (now_moment ());
-  if (mmrest_p_ && (now >= rest_start_mom_) && (mmrest_p_->column_arr_.size () >= 2))
+  Time_description const *time = get_staff_info().time_C_;
+  if (mmrest_p_ && (now >= rest_start_mom_) 
+    && !time->whole_in_measure_
+    && (mmrest_p_->column_arr_.size () >= 2))
     {
       typeset_element (mmrest_p_);
       /*
@@ -97,7 +100,7 @@ Multi_measure_rest_engraver::do_post_move_processing ()
   Time_description const *time = get_staff_info().time_C_;
   Moment now (now_moment ());
 
-  if (mmrest_p_)
+  if (mmrest_p_ && !time->whole_in_measure_)
     {
       lastrest_p_ = mmrest_p_;
       lastrest_p_->measures_i_ = time->bars_i_ - start_measure_i_;