From 421e0ca393bcefec2660d96faeab282aea084ee4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 4 Jun 2005 11:59:23 +0000 Subject: [PATCH] Regression test line lengths --- ChangeLog | 2 +- input/regression/allfontstyle.ily | 2 +- input/regression/part-combine-cross.ly | 6 ++---- input/regression/part-combine-solo-global.ly | 5 ++--- input/regression/part-combine-solo.ly | 8 ++++---- input/regression/rehearsal-mark-letter.ly | 16 ++++++++++------ input/regression/rehearsal-mark-number.ly | 3 +++ input/regression/repeat-fold.ly | 6 +++--- .../repeat-volta-skip-alternatives.ly | 7 +++++-- input/regression/rest-dot-position.ly | 2 ++ input/regression/rest-ledger.ly | 10 ++++------ input/regression/rest.ly | 17 +++++++++-------- 12 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5342d9bcd0..f7a452c114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -340,7 +340,7 @@ 2005-05-24 Han-Wen Nienhuys * lily/parser.yy (bare_int): remove rule. From now on, we require - # before negative integers. + # before negative integers. 2005-05-23 Graham Percival diff --git a/input/regression/allfontstyle.ily b/input/regression/allfontstyle.ily index 12b1714ee1..2aca758d45 100644 --- a/input/regression/allfontstyle.ily +++ b/input/regression/allfontstyle.ily @@ -12,7 +12,7 @@ Different text styles are used for various purposes. \relative c'' \context Staff { \emptyText - \repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata } + \repeat volta 2 { \time 4/4 c4^"cuivre"_\fermata } \alternative { { d-4_\markup { \italic "cantabile" } } diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index ec2bd9d989..0044b3cec8 100644 --- a/input/regression/part-combine-cross.ly +++ b/input/regression/part-combine-cross.ly @@ -8,9 +8,7 @@ vone = \relative a' { g4 g f f e e d d } vtwo = \relative a' { e4 e f f g g a a } +\layout { raggedright = ##t } -\score { - \partcombine \vone \vtwo - \layout { raggedright = ##t } -} +\partcombine \vone \vtwo diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index 60353b74c3..af129707f7 100644 --- a/input/regression/part-combine-solo-global.ly +++ b/input/regression/part-combine-solo-global.ly @@ -6,9 +6,9 @@ } \version "2.4.0" +\paper { raggedright = ##t } -\score { - \new Staff +\new Staff \partcombine \relative c'' { bes2( a4) @@ -16,4 +16,3 @@ \relative c' { r2 cis4 } -} diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index 304589e4ba..c9f23735d2 100644 --- a/input/regression/part-combine-solo.ly +++ b/input/regression/part-combine-solo.ly @@ -19,10 +19,10 @@ vtwo = \relative g' { g4. g8 r2 g4 r4 r2 g4 } \version "2.4.0" -\score { +\paper { raggedright = ##t } + - << \set Score.skipBars = ##t +<< \set Score.skipBars = ##t \partcombine \vone \vtwo - >> -} +>> diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index 04b227fc6a..4065d6ac1d 100644 --- a/input/regression/rehearsal-mark-letter.ly +++ b/input/regression/rehearsal-mark-letter.ly @@ -1,12 +1,17 @@ -\header { texidoc= "Rehearsal marks in letter style: the I is skipped, -and after Z, double letters are used. The mark may be set -with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}." - } +\header { + + texidoc= "Rehearsal marks in letter style: the I is skipped, and +after Z, double letters are used. The mark may be set with +@code{\mark NUMBER}, or with @code{Score.rehearsalMark}." + +} \version "2.4.0" -\score { \relative c'' { +\paper { raggedright = ##t } + +\relative c'' { c1 \mark \default c1 \mark #7 c1 \mark \default @@ -17,5 +22,4 @@ with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}." c1 \mark \default c1 \mark \default c1 \mark \default - } } diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly index e6c1e3550d..11189bf53b 100644 --- a/input/regression/rehearsal-mark-number.ly +++ b/input/regression/rehearsal-mark-number.ly @@ -6,6 +6,9 @@ By setting @code{markFormatter} we may choose a different style of mark printing } \version "2.4.0" + +\paper { raggedright = ##t } + \relative c''{ \set Score.markFormatter = #format-mark-numbers c1 | \mark \markup { \musicglyph #"scripts-coda" } diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index 8d1098ec0e..6d8bc4a869 100644 --- a/input/regression/repeat-fold.ly +++ b/input/regression/repeat-fold.ly @@ -7,14 +7,14 @@ should not be more alternatives than repeats. " } -\score { - \context Staff \relative c'' { +\paper { raggedright = ##t } + +\context Staff \relative c'' { \repeat fold 3 { c^"3$\\times$ 0alt" d } % less alts than body \repeat fold 4 { c^"4$\\times$ 2alt" d } \alternative { e f } % more alts than body \repeat fold 2 { c^"2$\\times$ 3alt" d } \alternative { e f g } } -} diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index b16a6868eb..7605743481 100644 --- a/input/regression/repeat-volta-skip-alternatives.ly +++ b/input/regression/repeat-volta-skip-alternatives.ly @@ -6,8 +6,11 @@ alternative is repeated, by printing a range for the 1st repeat." } +\paper { raggedright = ##t } -\score { \relative c'' \context Voice { + +\relative c'' \context Voice { \repeat volta 3 c1 - \alternative { d f } e4 } } + \alternative { d f } e4 +} diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly index d60ddf2d4f..5b14c44a23 100644 --- a/input/regression/rest-dot-position.ly +++ b/input/regression/rest-dot-position.ly @@ -6,6 +6,8 @@ \version "2.4.0" +\paper { raggedright = ##t } + { \set Score.timing = ##f r\longa. r\breve. diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index b96b6bdb2d..8c2b3150bf 100644 --- a/input/regression/rest-ledger.ly +++ b/input/regression/rest-ledger.ly @@ -5,8 +5,9 @@ ledger lines." } -\score { - { +\paper { raggedright = ##t } + +{ \override Rest #'staff-position = #4 r1 \override Rest #'staff-position = #5 r1 \override Rest #'staff-position = #6 @@ -25,8 +26,5 @@ ledger lines." r2 \override Rest #'staff-position = #-6 r2 - - - -}} +} diff --git a/input/regression/rest.ly b/input/regression/rest.ly index af559cd312..6a7da8a7ab 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,19 +1,20 @@ \version "2.4.0" \header{ -texidoc=" + texidoc=" There is a big variety of rests. Note that the dot of 8th, 16th and 32nd rests rest should be next to the top of the rest. All rests except the whole rest are centered on the middle staff line. " } +\paper { raggedright = ##t } - \score { { - \time 4/4 -r \longa * 1/4 r\breve * 1/2 -r1 r2 r4 r8 r16 r32 r64 r128 r128 -\time 6/4 -r1. r2. r4. r8. r16. r32. r64. r128. r128. -}} +{ + \time 4/4 + r \longa * 1/4 r\breve * 1/2 + r1 r2 r4 r8 r16 r32 r64 r128 r128 + \time 6/4 + r1. r2. r4. r8. r16. r32. r64. r128. r128. +} -- 2.39.2