2011/2/17 Graham Percival <gra...@percival-music.ca>:
> On 2/17/11, Janek Warchoł <lemniskata.bernoull...@gmail.com> wrote:
>> I wanted to make Graham happy, so looked through the tracker, picked
>> an existing frog issue and made a patch without discussing it for 5
>> hours.
>
> Yay! :)
May i have a kiss?
;P
>> Unfortunately i got an error and i don't understand what went wrong, i
>> don't see any names of the files i modified. Here's the end of the
>> log:
>
> This one is important:
>
>> Failed files: (78/lily-8f0aedaa.ly)
>
> If you look in out/lybook-testdb/ DIR/FILENAME
> then you'll see the file that fails. That file will include a
> \sourcefilename
> which points out that this particular file is
> figured-bass-continuation-forbid.ly
Ok, now i see the typo that caused it.
> More thoughts:
> - if the regtest already contains a time signature, then altering the
> time signature is a good solution -- but I'd rather not see a *new*
> time signature if the regtest didn't already contain one.
> - if the music already contains a lot of s-rests, then go ahead and
> use an s rest. But in general, I prefer having "real" rests (with r8
> or r16 and the like).
Fortunately that's what i did in majority of cases. I wouldn't like to
dig throug all that 250 modified files again... Doing it once was
boring enough.
> - if the patch is too large to send to the mailing list, then chances
> are it's too large. :)
>
> Recommendation:
> - pick 50 (or so) of the "easiest" regtests to modify. Ones that only
> require a change of existing time signature, or adding a rest or two.
Since i have no reasonable means to pick "easiest ones" from all that
i changed, i've just selected all before letter D. That's about 70
files.
> - check that it compiles after your changes. (again, don't touch any
> regtest that looks at all unusual!)
strange thing happened here. Here's what i've done:
- copied contents of input/regression to desktop (so that it would be
available outside git)
- switched back to master (in order to have unmodified regtests again
in my working directory)
- created new branch and checked it out
- ran make from /build
- ran make test from /build
- ran make test-baseline from /build
- copied first 200 regtest files (that is, up to letter C) from
desktop to lilypond-git/input/regrression (they comprised of both
modified regtests and unmodified ones, since i had no means to
separate them)
- ran make check from /build
I expected that resulting file build/out/test-results/index.html,
containing comparisons between unmodified and modified regtests, will
show differencies in the 67 regtests i changed. But surprisingly it
shows many more differencies in files i didn't change - even in ones
beginning with letter D and above. I have no idea why this happened...
I attach the patch file. It looks normal, shows changes to 67 files.
Very strange.
Janek
From 273eec994a9b005e3977de53987ab8992c5ee6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janek=20Warcho=C5=82?= <lemniskata.bernoulli...@gmail.com>
Date: Fri, 18 Feb 2011 15:13:02 +0100
Subject: [PATCH] issue 1489 (regtests ending on barlines) part 1
modified regtests files up to "c*"
---
input/regression/accidental-collision.ly | 2 +-
input/regression/accidental-double.ly | 4 ++--
input/regression/accidental-forced-tie.ly | 2 +-
input/regression/accidental-ledger.ly | 1 +
input/regression/accidental-piano.ly | 4 ++--
input/regression/accidental-placement-samepitch.ly | 2 +-
input/regression/accidental-placement.ly | 1 +
input/regression/accidental-quarter.ly | 2 +-
.../regression/accidental-unbroken-tie-spacing.ly | 1 +
input/regression/allfontstyle.ily | 2 +-
input/regression/ambitus-percussion-staves.ly | 4 ++--
input/regression/apply-output.ly | 2 ++
input/regression/arpeggio-bracket.ly | 2 ++
input/regression/arpeggio-collision.ly | 1 +
input/regression/arpeggio-no-staff-symbol.ly | 1 +
input/regression/arpeggio.ly | 2 ++
input/regression/articulation-snappizzicato.ly | 2 +-
input/regression/auto-beam-no-beam.ly | 2 +-
input/regression/backend-excercise.ly | 3 +++
input/regression/balloon.ly | 1 +
input/regression/bar-line-dashed.ly | 4 ++--
input/regression/bar-line-dotted.ly | 4 ++--
input/regression/bar-scripts.ly | 4 ++--
input/regression/beam-break.ly | 2 +-
input/regression/beam-cross-staff-auto-knee.ly | 3 ++-
input/regression/beam-extreme.ly | 2 +-
input/regression/beam-feather-knee-stem-length.ly | 3 ++-
input/regression/beam-feather.ly | 3 ++-
input/regression/beam-french.ly | 1 +
input/regression/beam-funky-beamlet.ly | 4 +++-
input/regression/beam-isknee.ly | 2 +-
input/regression/beam-manual-beaming.ly | 2 ++
input/regression/beam-multiple-cross-staff.ly | 6 +++++-
input/regression/beam-multiplicity-over-rests.ly | 3 ++-
input/regression/beam-outside-beamlets.ly | 2 ++
input/regression/beam-over-barline.ly | 2 +-
input/regression/beam-position.ly | 3 ++-
input/regression/beam-quanting-horizontal.ly | 1 +
input/regression/beam-quarter.ly | 1 +
input/regression/beam-second.ly | 1 +
input/regression/beam-shortened-lengths.ly | 3 ++-
input/regression/beam-single-stem.ly | 2 ++
input/regression/beam-slope-stemlet.ly | 1 +
input/regression/beam-unconnected-beamlets.ly | 1 +
input/regression/beams.ly | 2 +-
input/regression/bend-dot.ly | 1 +
input/regression/bookparts.ly | 2 +-
input/regression/chord-name-entry-11.ly | 2 +-
input/regression/chord-scripts.ly | 1 +
input/regression/chord-tremolo-short.ly | 3 +++
input/regression/chord-tremolo-single.ly | 2 +-
input/regression/chromatic-scales.ly | 2 +-
input/regression/clef-oct.ly | 2 ++
input/regression/clef-warn.ly | 2 +-
input/regression/cluster-single-note.ly | 2 +-
input/regression/cluster-style.ly | 1 +
input/regression/cluster.ly | 4 ++--
input/regression/collision-alignment.ly | 6 +++---
input/regression/collision-dots-move.ly | 1 +
input/regression/collision-dots-up-space-dotted.ly | 5 +++--
input/regression/collision-head-chords.ly | 2 +-
input/regression/collision-head-solfa-fa.ly | 1 +
input/regression/collision-manual.ly | 1 +
.../collision-merge-differently-headed.ly | 4 ++--
input/regression/collision-merge-dots.ly | 1 +
input/regression/collision-seconds.ly | 6 ++++--
input/regression/completion-heads-multiple-ties.ly | 1 +
67 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly
index 062e1f8..ae74b31 100644
--- a/input/regression/accidental-collision.ly
+++ b/input/regression/accidental-collision.ly
@@ -7,4 +7,4 @@
\paper {
ragged-right = ##t
}
-\new Staff \relative <<bes' \\ a'>>
+\new Staff \relative { <<bes' \\ a'>> a, a a }
diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 3d91d10..61c4b09 100644
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -9,8 +9,8 @@
\transpose c c'
\context Staff <<
\key g \major
- \new Voice { \stemUp c' fis! }
- \new Voice { \stemDown c fis! }
+ \new Voice { \stemUp c' fis! b b }
+ \new Voice { \stemDown c fis! g g }
>>
diff --git a/input/regression/accidental-forced-tie.ly b/input/regression/accidental-forced-tie.ly
index 78bc724..13624e1 100644
--- a/input/regression/accidental-forced-tie.ly
+++ b/input/regression/accidental-forced-tie.ly
@@ -9,5 +9,5 @@
}
\relative c'' {
- gis4 ~ gis!~ gis?
+ gis4 ~ gis!~ gis? f
}
diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index 51dfe52..2d0d33a 100644
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -31,6 +31,7 @@ and only if the accidental is horizontally close to the head. "
fis
fisis
<cis,, gis'>
+ q q q
}
diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly
index 1c85862..21baffa 100644
--- a/input/regression/accidental-piano.ly
+++ b/input/regression/accidental-piano.ly
@@ -15,6 +15,6 @@ accidental."
\new PianoStaff \relative <<
#(set-accidental-style 'piano)
- \new Staff { ges'4 ges4 }
- \new Staff { r8 gis r8 gis }
+ \new Staff { ges'4 ges4 ges'4 ges4 }
+ \new Staff { r8 gis r8 gis r8 gis r8 gis }
>>
diff --git a/input/regression/accidental-placement-samepitch.ly b/input/regression/accidental-placement-samepitch.ly
index 87333dc..9f29b98 100644
--- a/input/regression/accidental-placement-samepitch.ly
+++ b/input/regression/accidental-placement-samepitch.ly
@@ -9,6 +9,6 @@ pitches are correctly computed."
}
\relative c''
-{<< <dis aeses as a! a! ais aisis a,! aeh cis'> \\ <ais aih> >> }
+{ \time 1/4 << <dis aeses as a! a! ais aisis a,! aeh cis'> \\ <ais aih> >> }
\paper {ragged-right = ##t}
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index a7ed3c6..d4d0d45 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -34,6 +34,7 @@ flats in a sixth should be staggered. "
<c! es ges beses>
<bes! c d f >
<bes,! c d f >
+ r
}
diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly
index 165e4c1..d4febce 100644
--- a/input/regression/accidental-quarter.ly
+++ b/input/regression/accidental-quarter.ly
@@ -7,7 +7,7 @@
\layout { ragged-right = ##t }
\relative c'' {
- \time 12/4
+ \time 10/4
ceses4
ceseh
ces
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 4e09dbe..7f69a35 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -10,5 +10,6 @@ texidoc = "Tied notes with accidentals do not cause problems with spacing."
\time 3/4
c8 b2 <g b des f>8 ~ |
<g b des f>8
+ r8 r2
}
diff --git a/input/regression/allfontstyle.ily b/input/regression/allfontstyle.ily
index 54a9ee3..b26c54a 100644
--- a/input/regression/allfontstyle.ily
+++ b/input/regression/allfontstyle.ily
@@ -18,5 +18,5 @@ Different text styles are used for various purposes.
d-4_\markup { \italic "cantabile" } }
{ e } } \acciaccatura { c16 }
- f4\ff^""^\markup { \large "Largo" } \mark "B" g
+ f4\ff^""^\markup { \large "Largo" } \mark "B" g d b2
}
diff --git a/input/regression/ambitus-percussion-staves.ly b/input/regression/ambitus-percussion-staves.ly
index 5901276..14528b8 100644
--- a/input/regression/ambitus-percussion-staves.ly
+++ b/input/regression/ambitus-percussion-staves.ly
@@ -7,6 +7,6 @@ acknowledge pitched note heads."
}
\new DrumStaff \with { \consists "Ambitus_engraver" } <<
- \new DrumVoice \drummode { \voiceOne cymr8 cymr }
- \new DrumVoice \drummode { \voiceTwo hhp4 }
+ \new DrumVoice \drummode { \voiceOne cymr8 cymr cymr cymr r2 }
+ \new DrumVoice \drummode { \voiceTwo hhp4 hhp r2 }
>>
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 2e1d521..7873172 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -35,4 +35,6 @@ position.
\applyOutput #'Voice #mc-squared
<d f g b>8
+
+ r4 r2
}
diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index 3446871..5737cbb 100644
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -13,6 +13,8 @@ arpeggiate the chord.
\arpeggioBracket
<fis, d a >\arpeggio
+
+ r4 r2
}
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index ba82ac1..38180aa 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -17,4 +17,5 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
<fis'' g d a>\arpeggio
<fis, g d a>\arpeggio
<fis'' g d a>\arpeggio
+ <fis'' gis d a>\arpeggio
}
diff --git a/input/regression/arpeggio-no-staff-symbol.ly b/input/regression/arpeggio-no-staff-symbol.ly
index a94f9a7..794fb6c 100644
--- a/input/regression/arpeggio-no-staff-symbol.ly
+++ b/input/regression/arpeggio-no-staff-symbol.ly
@@ -7,4 +7,5 @@
\new Staff \with { \remove "Staff_symbol_engraver" }
\relative c' {
<c c'>\arpeggio
+ r r2
}
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index abe2054..d343a02 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -17,6 +17,7 @@ Arpeggios are supported, both cross-staff and broken single staff.
%%\override PianoStaff.SpanArpeggio #'connect = ##t
\set PianoStaff.connectArpeggios = ##t
<fis d a>\arpeggio
+ r
}
\new Staff\relative c{
\clef bass
@@ -24,5 +25,6 @@ Arpeggios are supported, both cross-staff and broken single staff.
\arpeggioArrowDown
<g b d>\arpeggio
<g b d>\arpeggio
+ r
}
>>
diff --git a/input/regression/articulation-snappizzicato.ly b/input/regression/articulation-snappizzicato.ly
index 90ed805..bc05eac 100644
--- a/input/regression/articulation-snappizzicato.ly
+++ b/input/regression/articulation-snappizzicato.ly
@@ -3,4 +3,4 @@
}
\version "2.12.3"
-\relative c'' { c4\snappizzicato }
+\relative c'' { c4\snappizzicato c'\snappizzicato r2 }
diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly
index cf49337..59c11ee 100644
--- a/input/regression/auto-beam-no-beam.ly
+++ b/input/regression/auto-beam-no-beam.ly
@@ -11,4 +11,4 @@
ragged-right = ##t
}
-\relative c' { c8 c-\noBeam c c }
+\relative c' { c8 c-\noBeam c c r2 }
diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly
index a66224e..d990633 100644
--- a/input/regression/backend-excercise.ly
+++ b/input/regression/backend-excercise.ly
@@ -17,6 +17,8 @@
\override TextScript #'color = #red
g4^"red"
+ r
+ R1 R
}
\new Staff \relative c'' {
@@ -27,6 +29,7 @@
f2( \glissando f')
\easyHeadsOn
f e
+ r
}
>>
}
diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index a60f89e..69810b2 100644
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -14,5 +14,6 @@ with lines and explanatory text added."
\relative c' {
\balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
<c-\balloonText #'(-2 . -2) \markup { \simple #"hoi" } >8
+ r4. r2
}
}
diff --git a/input/regression/bar-line-dashed.ly b/input/regression/bar-line-dashed.ly
index 4267f02..0f3c6ad 100644
--- a/input/regression/bar-line-dashed.ly
+++ b/input/regression/bar-line-dashed.ly
@@ -9,9 +9,9 @@
\relative \new StaffGroup <<
\new Staff {
- c4 \bar "dashed" c }
+ c4 \bar "dashed" c r2 }
\new Staff {
- c c
+ c c r2
}
>>
diff --git a/input/regression/bar-line-dotted.ly b/input/regression/bar-line-dotted.ly
index f662c3c..d2641dd 100644
--- a/input/regression/bar-line-dotted.ly
+++ b/input/regression/bar-line-dotted.ly
@@ -10,9 +10,9 @@
\relative \new StaffGroup <<
\new Staff {
- c4 \bar ":" c }
+ c4 \bar ":" c r2 }
\new Staff {
- c c
+ c c r2
}
>>
diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index 263cbe3..3221da3 100644
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -14,7 +14,7 @@ Markings can be attached to (invisible) barlines.
\set Staff.shortInstrumentName = instr
- \mark "B" \break c1 \mark "A" c2 }
- \new Staff { c1 c2 }
+ \mark "B" \break c1 \mark "A" c2 r2 }
+ \new Staff { c1 c2 r2 }
>>
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index fffd0c4..4348eef 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -9,5 +9,5 @@
\relative c'' {
\override Score.Beam #'breakable = ##t
- \time 3/16 c16-[ d e \break f-]
+ \time 3/16 c16-[ d e \break f-] r8
}
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 3c9b165..411fb83 100644
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -17,9 +17,10 @@ produced with explicit staff switches)."
b8[ \change Staff="down" d,, ]
c[ \change Staff="up" c'' ]
b,[ \change Staff="down" d^"no knee" ]
+ r4
}
\new Staff = "down" {
\clef bass
- s2.
+ s2. r4
}
>>
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index 61462dd..18a9e04 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -28,7 +28,7 @@ extreme = \relative c'' {
\stemNeutral
\transpose c c {
- \stemDown e'8[ e e']
+ \stemDown e'8[ e e'] r4.
}
}
diff --git a/input/regression/beam-feather-knee-stem-length.ly b/input/regression/beam-feather-knee-stem-length.ly
index 58b602c..46f5d8a 100644
--- a/input/regression/beam-feather-knee-stem-length.ly
+++ b/input/regression/beam-feather-knee-stem-length.ly
@@ -28,5 +28,6 @@
c,,32 c32
\override Stem #'direction = #DOWN
c''32]
-
+
+ r4 r2
}
diff --git a/input/regression/beam-feather.ly b/input/regression/beam-feather.ly
index a1ca4b7..ee78865 100644
--- a/input/regression/beam-feather.ly
+++ b/input/regression/beam-feather.ly
@@ -22,5 +22,6 @@
\override Beam #'grow-direction = #LEFT
c16[
c c c
- c c c c ]
+ c c c c ]
+ r2
}
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index 14d33b0..882cb4e 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -11,6 +11,7 @@
\override Stem #'french-beaming = ##t
c16[ c c c]
c8[ c16 e16 f16 g16 g8]
+ r4
}
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 356b0d0..78f078b 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -26,6 +26,8 @@ should be pointing to the note head.
c16 c,,8
\once \override Stem #'direction = #UP
- c16
+ c16
+
+ r4
}
diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly
index 0c26f0d..dcf99b0 100644
--- a/input/regression/beam-isknee.ly
+++ b/input/regression/beam-isknee.ly
@@ -21,7 +21,7 @@ Beams can be placed across a @code{PianoStaff}.
\clef bass
% no knee
\stemUp c8[ \change Staff=one \stemDown g'16 f]
- s8
+ s4
s2
}
>>
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index 744c663..791867b 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -24,5 +24,7 @@
\once \override Stem
#'beaming = #(cons (list 0 2 4) (list 0 1 4))
c c c]
+
+ r16 r4 r2
}
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index 861fbd0..2484cfa 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -17,7 +17,9 @@ to the last beam.
\stemDown
c8[ c16 \change Staff = SB \stemUp c16 ]
\stemNeutral
- f[ g \change Staff = SA a c]
+ f[ g \change Staff = SA a c]
+
+ r2
}
\new Staff = SB \relative c' {
\clef bass
@@ -25,6 +27,8 @@ to the last beam.
g'4\rest
b,8[ b16 \stemDown b''16 b ]
+
+ r8.
}
>>
diff --git a/input/regression/beam-multiplicity-over-rests.ly b/input/regression/beam-multiplicity-over-rests.ly
index ddf2cc1..8d31469 100644
--- a/input/regression/beam-multiplicity-over-rests.ly
+++ b/input/regression/beam-multiplicity-over-rests.ly
@@ -12,4 +12,5 @@ beamlets pointing towards the rest unless absolutely necessary."
c32[ c32 r16 c8]
c16[ r32 c32 r16 c16]
c16[ r16 c32 r32 c16]
-}
\ No newline at end of file
+ r2
+}
diff --git a/input/regression/beam-outside-beamlets.ly b/input/regression/beam-outside-beamlets.ly
index 358dc18..4ff33b6 100644
--- a/input/regression/beam-outside-beamlets.ly
+++ b/input/regression/beam-outside-beamlets.ly
@@ -22,4 +22,6 @@
c16
\set stemRightBeamCount = #3
c ]
+
+ r2
}
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index 8a01631..304876e 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -5,7 +5,7 @@
}
\layout { ragged-right= ##t }
-\relative c'' { c2. c8[ c8 c8 c8] }
+\relative c'' { c2. c8[ c8 c8 c8] c2. }
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 174a7df..6cac739 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -23,5 +23,6 @@ note beams. Override with @code{no-stem-extend}. "
\revert Stem #'no-stem-extend
}
f8[ f]
-
+
+ r8.. r4
}
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index 91f7d22..f663e78 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -21,6 +21,7 @@ lengths are between 2 and 1.5."
f,[ f] e'[ e]
c,64[ c] a''[ a]
f,[ f] e'[ e]
+ r8
}
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index 512125e..e74d9a0 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -8,4 +8,5 @@
\relative c'' {
c8[ c4 c8] % should warn here!
+ r2
}
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index 1971bd8..97bb937 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -19,4 +19,5 @@ quickly."
b8[ c]
b16[ c]
a'[ b]
+ r2
}
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index 6cd9198..6bdf5d0 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -19,6 +19,7 @@
)))
\stemUp
- f'4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f]
+ f'4 f8[ f] f16[ f] f32[ f] f64[ f] f128[ f]
+ r64 r4
}
diff --git a/input/regression/beam-single-stem.ly b/input/regression/beam-single-stem.ly
index 742e4f0..d73827d 100644
--- a/input/regression/beam-single-stem.ly
+++ b/input/regression/beam-single-stem.ly
@@ -7,9 +7,11 @@
\version "2.12.0"
\relative c' {
+ \time 1/4
d16[]
\set stemRightBeamCount = #0
d32[]
+ r32 r8
}
\layout {
diff --git a/input/regression/beam-slope-stemlet.ly b/input/regression/beam-slope-stemlet.ly
index 002e3e9..651fc9a 100644
--- a/input/regression/beam-slope-stemlet.ly
+++ b/input/regression/beam-slope-stemlet.ly
@@ -17,6 +17,7 @@ as invisible stems."
\times 2/3 {r8[ c' g']}
\override Stem #'stemlet-length = #0.5
\times 2/3 {r8[ c, g']}
+ r2
}
diff --git a/input/regression/beam-unconnected-beamlets.ly b/input/regression/beam-unconnected-beamlets.ly
index f7477b4..b4d9d14 100644
--- a/input/regression/beam-unconnected-beamlets.ly
+++ b/input/regression/beam-unconnected-beamlets.ly
@@ -9,6 +9,7 @@
\version "2.12.0"
\relative c'' {
+ \time 1/8
\override Stem #'max-beam-connect = #1
c16[ c16]
}
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index d49f415..4b22f37 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -12,5 +12,5 @@
c8.[ c16]
c8[ c16 c16 c8]
c8[ c16 e16 g8]
-
+ r2.
}
diff --git a/input/regression/bend-dot.ly b/input/regression/bend-dot.ly
index 0e1b239..99076b9 100644
--- a/input/regression/bend-dot.ly
+++ b/input/regression/bend-dot.ly
@@ -14,6 +14,7 @@
g''4.-\bendAfter #+1
s8 s2
f4.-\bendAfter #+1
+ s8 s2
}
>>
}
diff --git a/input/regression/bookparts.ly b/input/regression/bookparts.ly
index a814fb5..4e002ba 100644
--- a/input/regression/bookparts.ly
+++ b/input/regression/bookparts.ly
@@ -30,7 +30,7 @@ Page labels are also collected into the top-level paper."
}
\tocItem \markup "Second part"
\markup \justify { Second part, with different margins and page header. }
- { c' }
+ { c'1 }
}
\tocItem \markup "Third part"
diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly
index d72b975..112cccb 100644
--- a/input/regression/chord-name-entry-11.ly
+++ b/input/regression/chord-name-entry-11.ly
@@ -9,5 +9,5 @@
\layout { ragged-right = ##t }
-\chordmode { c:13 c:13.11 c:m13 }
+\chordmode { \time 3/4 c:13 c:13.11 c:m13 }
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index 1e0f454..9479c2e 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -13,4 +13,5 @@ They obey manual direction indicators."
< c_^ >4
< c_^ e^^ >4
< c_^ e_^ >4
+ r4
}
diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly
index 883dbbe..319a818 100644
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -11,6 +11,9 @@
\repeat "tremolo" 2 { c32 e32 }
\stemDown
\repeat "tremolo" 2 { c32 e32 }
+ \stemNeutral
+ \repeat "tremolo" 2 { c32 c''32 }
+ r8 r2
}
diff --git a/input/regression/chord-tremolo-single.ly b/input/regression/chord-tremolo-single.ly
index e55106c..f6325d2 100644
--- a/input/regression/chord-tremolo-single.ly
+++ b/input/regression/chord-tremolo-single.ly
@@ -8,6 +8,6 @@ texidoc="Chord tremolos on a single note."
\time 4/4
\repeat "tremolo" 32 { d32 }
- c4 c4 c4 c4 c4
+ c4 c4 c4 c4
}
diff --git a/input/regression/chromatic-scales.ly b/input/regression/chromatic-scales.ly
index b6d9458..dcc22c0 100644
--- a/input/regression/chromatic-scales.ly
+++ b/input/regression/chromatic-scales.ly
@@ -22,7 +22,7 @@ scales = \relative c' {
}
{
\override Staff.StaffSymbol #'line-count = #5
- \time 4/4
+ \time 13/4
<<
\scales
\context NoteNames {
diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index 80b43a1..386601f 100644
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -25,5 +25,7 @@ higher or lower), and can take any value, including 15 for two octaves."
c4
\clef "G^9"
c4
+ \clef "G"
+ c4
}
diff --git a/input/regression/clef-warn.ly b/input/regression/clef-warn.ly
index 30f7bc6..c37ea4d 100644
--- a/input/regression/clef-warn.ly
+++ b/input/regression/clef-warn.ly
@@ -8,5 +8,5 @@
{
\clef "foo"
- c4
+ c1
}
diff --git a/input/regression/cluster-single-note.ly b/input/regression/cluster-single-note.ly
index b8f91ce..52ac42a 100644
--- a/input/regression/cluster-single-note.ly
+++ b/input/regression/cluster-single-note.ly
@@ -5,4 +5,4 @@
\version "2.12.0"
-\relative c' { \makeClusters <e d'> }
+\relative c' { \makeClusters <e d'> r4 r2 }
diff --git a/input/regression/cluster-style.ly b/input/regression/cluster-style.ly
index 37dfcbb..e1e6e44 100644
--- a/input/regression/cluster-style.ly
+++ b/input/regression/cluster-style.ly
@@ -27,6 +27,7 @@ fragment = \relative c' {
r4
\override ClusterSpanner #'style = #'centered-stairs
\makeClusters \fragment
+ r4
}
>>
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index ae74c3b..2386b8f 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -9,8 +9,8 @@ notes is to be played."
fragment = \relative c' {
c4 f4 <e d'>4
- <g a>8 <e a> a4 c2 <d b>4 e4
- c4
+ <g a>8 <e a> a4 c2 <d b>4
+ e4 c4 r2
}
<<
diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly
index b77a116..13c6346 100644
--- a/input/regression/collision-alignment.ly
+++ b/input/regression/collision-alignment.ly
@@ -12,10 +12,10 @@
\relative <<
\new Staff {
<<
- { f g } \\
- { g f }
+ { f g f r } \\
+ { g f a r }
>> }
\new Staff {
- c4 c
+ c4 c c r
}
>>
diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly
index e684871..d51725d 100644
--- a/input/regression/collision-dots-move.ly
+++ b/input/regression/collision-dots-move.ly
@@ -12,4 +12,5 @@ collision resolution moves the dots to the right."
\key d \minor
\clef bass
<< <cis a' cis>4 \\ { g'8. bes16} >>
+ r4 r2
}
diff --git a/input/regression/collision-dots-up-space-dotted.ly b/input/regression/collision-dots-up-space-dotted.ly
index 272ea35..5cf1fde 100644
--- a/input/regression/collision-dots-up-space-dotted.ly
+++ b/input/regression/collision-dots-up-space-dotted.ly
@@ -13,7 +13,8 @@
\new Staff \relative c' <<
{ fis4.
\override Staff.NoteCollision #'prefer-dotted-right = ##f
- fis4. }
+ fis4.
+ r4 }
\\
- { \autoBeamOff e8 e e e e e e }
+ { \autoBeamOff e8 e e e e e e e }
>>
diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 248e674..7b75c56 100644
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -10,7 +10,7 @@ they have the same positions in the extreme note heads.
\relative c'' {
- c4
+ c8
<< { c4 d4 <c d>8 <c d> <c d> } \\ { c4 c <a b>8 <b c> <c d>8 } >>
}
diff --git a/input/regression/collision-head-solfa-fa.ly b/input/regression/collision-head-solfa-fa.ly
index c894e5f..4d5c3ea 100644
--- a/input/regression/collision-head-solfa-fa.ly
+++ b/input/regression/collision-head-solfa-fa.ly
@@ -20,6 +20,7 @@
\\
{ f'4 }
>>
+ r2
}
diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly
index fe815ee..8ecd9d2 100644
--- a/input/regression/collision-manual.ly
+++ b/input/regression/collision-manual.ly
@@ -14,4 +14,5 @@
f } \\
{ e e }
>>
+ r2
}
diff --git a/input/regression/collision-merge-differently-headed.ly b/input/regression/collision-merge-differently-headed.ly
index 88ae808..7eb0da0 100644
--- a/input/regression/collision-merge-differently-headed.ly
+++ b/input/regression/collision-merge-differently-headed.ly
@@ -16,10 +16,10 @@ if the black note heads are from 8th or shorter notes.
{
\override Staff.NoteCollision #'merge-differently-headed = ##t
c2 c8 c4.
- c2
+ c2 r2
}\\
{
c8 c4. c2
- c4
+ c4 r4 r2
}
>>
diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index 9b3b446..d0f5cc6 100644
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -9,6 +9,7 @@
{
\relative c'' \new Staff {
<< { d8. e16 } \\ { d8. b16 } >>
+ r4 r2
}
}
diff --git a/input/regression/collision-seconds.ly b/input/regression/collision-seconds.ly
index 2dd97fd..21f3319 100644
--- a/input/regression/collision-seconds.ly
+++ b/input/regression/collision-seconds.ly
@@ -6,5 +6,7 @@ way to format this would be to merge the two Ds, but we will be happy for now
if the upstem D does not collide with the downstem C."
}
-
-<< d' \\ <c' d'> >>
+{
+ << d' \\ <c' d'> >>
+ r4 r2
+}
diff --git a/input/regression/completion-heads-multiple-ties.ly b/input/regression/completion-heads-multiple-ties.ly
index eb7948a..61fd561 100644
--- a/input/regression/completion-heads-multiple-ties.ly
+++ b/input/regression/completion-heads-multiple-ties.ly
@@ -15,4 +15,5 @@ The @code{Completion_heads_engraver} correctly handles notes that need to be spl
} \relative c'{
\time 2/4
c4.. c4. c4. c2 c1
+ r16 r4
}
--
1.7.0.4
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
