summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Daniels <t.daniels@treda.co.uk>2015-05-01 22:04:51 +0100
committerTrevor Daniels <t.daniels@treda.co.uk>2015-05-06 17:46:56 +0100
commitbe72b961ab5c4f6ade95e962c872babf7b0338a0 (patch)
treeed85c6413c5d5db271c609c3207ee5f8da49741c
parentf509f0d4df0b7d4336d904ca61902ad67dc2be5e (diff)
Issue 3687 (part 4): Update regression tests to use \compressMMRests
-rw-r--r--input/regression/make-relative.ly10
-rw-r--r--input/regression/part-combine-mmrest-shared.ly8
-rw-r--r--input/regression/rest-positioning.ly4
-rw-r--r--input/regression/tablature-full-notation.ly37
4 files changed, 30 insertions, 29 deletions
diff --git a/input/regression/make-relative.ly b/input/regression/make-relative.ly
index c3bf0a01d3..0cf3ef1184 100644
--- a/input/regression/make-relative.ly
+++ b/input/regression/make-relative.ly
@@ -1,4 +1,4 @@
-\version "2.19.2"
+\version "2.19.20"
\header {
texidoc = "@code{make-relative} is a Scheme utility macro mainly
@@ -40,8 +40,8 @@ ph =
}
\score {
- \new PianoStaff <<
- \compressFullBarRests
+ \new PianoStaff
+ \compressMMRests <<
\new Staff = "up" {
<< \high \\ \middle >>
}
@@ -69,8 +69,8 @@ ph =
}
\score {
- \new PianoStaff <<
- \compressFullBarRests
+ \new PianoStaff
+ \compressMMRests <<
\new Staff = "up" {
<< \high \\ \middle >>
}
diff --git a/input/regression/part-combine-mmrest-shared.ly b/input/regression/part-combine-mmrest-shared.ly
index 62a866770b..ede5bc2a85 100644
--- a/input/regression/part-combine-mmrest-shared.ly
+++ b/input/regression/part-combine-mmrest-shared.ly
@@ -1,25 +1,25 @@
-\version "2.19.16"
+\version "2.19.20"
\header {
texidoc = "Multi-measure rests do not have to begin and end simultaneously to be combined."
}
\score { <<
- \compressFullBarRests
+ \compressMMRests
\partcombine
\relative f' { R1*8 | R1*16 | R1*4 }
\relative f' { R1*16 | R1*8 | R1*4 }
>> }
\score { <<
- \compressFullBarRests
+ \compressMMRests
\partcombine
\relative f' { R1*8 | r1^"r" | R1*15 | R1*4 }
\relative f' { R1*16 | R1*8 | R1*4 }
>> }
\score { <<
- \compressFullBarRests
+ \compressMMRests
\partcombine
\relative f' { R1*16 | R1*8 | R1*4 }
\relative f' { R1*8 | r1_"r" | R1*15 | R1*4 }
diff --git a/input/regression/rest-positioning.ly b/input/regression/rest-positioning.ly
index a34b773586..889932560f 100644
--- a/input/regression/rest-positioning.ly
+++ b/input/regression/rest-positioning.ly
@@ -1,4 +1,4 @@
-\version "2.17.16"
+\version "2.19.20"
\header {
texidoc = "This shows the single and multi voice rest positions for
@@ -14,7 +14,7 @@ mus = { \mark "R1*7" R1*7 \mark "R1" R1 \mark "r1" r1 \mark "r2" r2 \mark "r4" r
\score {
{
- \compressFullBarRests
+ \compressMMRests
\new StaffGroup <<
$@(map
(lambda (n)
diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly
index eed3f35a5f..065463be37 100644
--- a/input/regression/tablature-full-notation.ly
+++ b/input/regression/tablature-full-notation.ly
@@ -1,4 +1,4 @@
-\version "2.19.2"
+\version "2.19.20"
\header{ texidoc = "As default, tablature staves show only the fret numbers, because
in most situations, they are combined with normal staves.
@@ -8,23 +8,24 @@
tabstuff = {
\time 3/4
- \compressFullBarRests
- c4^"test" d( e) |
- f4\f g a^\fermata |
- R2.*3 |
- c8\<\( c16 c ~ 2\! |
- \mark \default
- c'2.\) |
- \ottava #1
- r4 d'4 r8 e |
- \ottava #0
- \tuplet 4/3 { b,4 c \glissando d\5 \glissando c } |
- c4. d-_( |
- e\varcoda-> )
- \override TextSpanner.bound-details.left.text = "rit." f\startTextSpan |
- g ~ g\prall |
- g\thumb e-.\stopTextSpan
- \bar "|."
+ \compressMMRests {
+ c4^"test" d( e) |
+ f4\f g a^\fermata |
+ R2.*3 |
+ c8\<\( c16 c ~ 2\! |
+ \mark \default
+ c'2.\) |
+ \ottava #1
+ r4 d'4 r8 e |
+ \ottava #0
+ \tuplet 4/3 { b,4 c \glissando d\5 \glissando c } |
+ c4. d-_( |
+ e\varcoda-> )
+ \override TextSpanner.bound-details.left.text = "rit." f\startTextSpan |
+ g ~ g\prall |
+ g\thumb e-.\stopTextSpan
+ \bar "|."
+ }
}
#(set-global-staff-size 18)