From 1640066951ca0dcf197f33d34e5d2fd47dc20108 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 18 Jan 1999 18:01:52 +0100
Subject: [PATCH] patch::: 1.1.22.jcn3: jcn3

pl 22.jcn3
	- bf: mmrest
---
 NEWS                                | 3 +++
 VERSION                             | 2 +-
 lily/multi-measure-rest-engraver.cc | 7 +++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index a3ad4ae23a..b928b79688 100644
--- 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 7ea9167167..1f7d0570d9 100644
--- 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 7f0c7583b1..6f3ba9597a 100644
--- 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_;
-- 
2.39.5