>From 660db241f08c3e4a90b11783ee0eeb8bf74ee55d Mon Sep 17 00:00:00 2001
From: Malte Meyn <address@hidden>
Date: Fri, 6 Oct 2017 22:45:38 +0200
Subject: [PATCH 2/2] Issue 5211/2: add regtest

Add a regtest for Merge_rests_engraver with \magnifyStaff.

Also add a brevis MMR to the original Merge_rests_engraver regtest.
---
 input/regression/merge-rests-engraver.ly      |  9 ++++++++-
 input/regression/merge-rests-magnify-staff.ly | 28 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 input/regression/merge-rests-magnify-staff.ly

diff --git a/input/regression/merge-rests-engraver.ly b/input/regression/merge-rests-engraver.ly
index c03b33ce54..f24a88c136 100644
--- a/input/regression/merge-rests-engraver.ly
+++ b/input/regression/merge-rests-engraver.ly
@@ -24,7 +24,13 @@ voiceA = \relative {
   % compressed multi-measure rests are combined
   R1*3 |
 
+  % multi-measure rests longer than semi-breve
+  % are merged at the correct vertical position
+  \time 4/2
+  R\breve
+
   % combining between beams, slurs
+  \time 4/4
   c8[( r c]) r c16[( r c] r c[ r c]) r |
 
   % combining in tuplets
@@ -62,6 +68,7 @@ voiceB = \relative {
   r2_"Down" r4 r8 r16 r32 r64 r128 r |
   R1_"Lower text" |
   R1*3 |
+  R\breve |
   c8[( r c]) r c16[( r c] r c[ r c]) r |
   \tuplet 3/2 { c8 r r } r4 \tuplet 3/2 { c4 r r } |
   r4-> r-. r r |
@@ -75,7 +82,7 @@ voiceB = \relative {
 voiceC = \relative {
   s1*2 |
   r2 r4 r8 r16 r32 r64 r128 r | % Combines rests from more than 2 voices
-  s1*11
+  s1*13
   r4. r8 r4. r8 |
   r4. r8 r4. r8 |
 }
diff --git a/input/regression/merge-rests-magnify-staff.ly b/input/regression/merge-rests-magnify-staff.ly
new file mode 100644
index 0000000000..1119581dc9
--- /dev/null
+++ b/input/regression/merge-rests-magnify-staff.ly
@@ -0,0 +1,28 @@
+\version "2.21.0"
+
+\header {
+  texidoc = "Test for vertical positions of merged rests in magnified staves."
+}
+
+music = {
+  R1
+  R1*2
+  \compressFullBarRests
+  R1*7
+  R1*11
+  \time 4/2
+  R\breve
+  r\breve
+  r1 r2 r4 r8 r
+}
+
+<<
+  \new Staff \with {
+    \magnifyStaff #3/4
+    \consists "Merge_rests_engraver"
+  } << \music \\ \music >>
+  \new Staff \with {
+    \magnifyStaff #4/3
+    \consists "Merge_rests_engraver"
+  } << \music \\ \music >>
+>>
\ No newline at end of file
-- 
2.14.1