From: hanwen Date: Fri, 13 Jun 2003 22:36:21 +0000 (+0000) Subject: move from input/test/ X-Git-Tag: release/1.7.25~142 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=190df9d071bef8720152abe9a12e027f690972bb;p=lilypond.git move from input/test/ --- diff --git a/ChangeLog b/ChangeLog index 76437b6c8c..5b570f1450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-06-14 Han-Wen Nienhuys + * input/regression/spacing-multi-tuplet.ly: move from input/test/ + + * input/test/{scripts,volta-start,sleur}.ly: remove + * input/regression/span-bar.ly: smaller file. * input/regression/spacing-{natural,tight,loose}.ly: remove diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly new file mode 100644 index 0000000000..27dc5f034a --- /dev/null +++ b/input/regression/spacing-multi-tuplet.ly @@ -0,0 +1,70 @@ +\version "1.7.18" +\header{ +texidoc = "Concurrent tuplets should be spaced equidistantly on +all staffs" +} + + + +multipart = \notes \relative c'{ + \context StaffGroup < + \context Staff = one \context Voice { + c4 + c + } + \context Staff = two \context Voice { + c8-[ c] + c-[ c] + } + \context Staff = three \context Voice { + \times 2/3 { c8-[ c c] } + \times 2/3 { c-[ c c] } + } + \context Staff = four \context Voice { + \times 2/4 { c8-[ c c c] } + \times 2/4 { c-[ c c c] } + } + \context Staff = five \context Voice { + \times 2/5 { c8-[ c c c c] } + \times 2/5 { c-[ c c c c] } + } + \context Staff = six \context Voice { + \times 2/6 { c8-[ c c c c c] } + \times 2/6 { c-[ c c c c c] } + } + \context Staff = seven \context Voice { + \times 2/7 { c8-[ c c c c c c] } + \times 2/7 { c-[ c c c c c c] } + } + \context Staff = eight \context Voice { + \times 2/8 { c8-[ c c c c c c c] } + \times 2/8 { c-[ c c c c c c c] } + } + \context Staff = nine \context Voice { + \times 2/9 { c8-[ c c c c c c c c] } + \times 2/9 { c-[ c c c c c c c c] } + } + \context Staff = ten \context Voice { + \times 2/10 { c8-[ c c c c c c c c c] } + \times 2/10 { c-[ c c c c c c c c c] } + } + \context Staff = eleven \context Voice { + \times 2/11 { c8-[ c c c c c c c c c c] } + \times 2/11 { c-[ c c c c c c c c c c] } + } + > + } + +\score{ + \notes { + \multipart + } + +% with raggedright it tests the natural distances, without the +% stretching distances. + +% \paper { raggedright = ##t } + +} + +%% new-chords-done %% diff --git a/input/test/scripts.ly b/input/test/scripts.ly deleted file mode 100644 index e1ff1fb51e..0000000000 --- a/input/test/scripts.ly +++ /dev/null @@ -1,70 +0,0 @@ -\version "1.7.18" - - - - -blah = \notes{ \transpose c c' { - - c,4 ->-.-\fermata-"text" - c ->-.-\fermata-"text" - c' ->-.-\fermata-"text" - c'' ->-.-\fermata-"text" - - d, ->-.-\fermata-"text" - d ->-.-\fermata-"text" - d' ->-.-\fermata-"text" - d'' ->-.-\fermata-"text" - - c, ^>^.^\fermata^"text" - c ^>^.^\fermata^"text" - c' ^>^.^\fermata^"text" - c'' ^>^.^\fermata^"text" - - d, ^>^.^\fermata^"text" - d ^>^.^\fermata^"text" - d' ^>^.^\fermata^"text" - d'' ^>^.^\fermata ^"text" - - c, _>_._\fermata _"text" - c _>_._\fermata _"text" - c' _>_._\fermata _"text" - c'' _>_._\fermata _"text" - - d, _>_._\fermata _"text" - d _>_._\fermata _"text" - d' _>_._\fermata _"text" - d'' _>_._\fermata _"text" - - \stemUp - b,-. c-. d-. e-. f-. g-. a-. b-. c'-. - \stemDown - a-. b-. c'-. d'-. e'-. f'-. g'-. a'-. b'-. - \stemUp - b,-> c-> d-> e-> f-> g-> a-> b-> c'-> - \stemUp - b,---. c---. d---. e---. f---. g---. a---. b---. c'---. - \stemBoth - \time 4/4 - c8-[ \< d e \! f] d'-[ \> e' f' \! g'] - c-[-> \< d-> e-> \! f->] d'-[-> \> e'-> f'-> \! g'->] - c-[-^ \< d-^ e-^ \! f-^] d'-[-^ \> e'-^ f'-^ \! g'-^] - c-[-. \< d-. e-. \! f-.] d'-[-. \> e'-. f'-. \! g'-.] - c-[-- \< d-- e-- \! f--] d'-[-- \> e'-- f'-- \! g'--] - c-[-\tenuto \< d-\tenuto e-\tenuto \! f-\tenuto] - d'-[-\tenuto \> e'-\tenuto f'-\tenuto \! g'-\tenuto] - c-[-\upbow \< d-\upbow e-\upbow \! f-\upbow] - d'-[-\upbow \> e'-\upbow f'-\upbow \! g'-\upbow] - c-[-| \< d-| e-| \! f-|] d'-[-| \> e'-| f'-| \! g'-|] - c-[-\fermata \< d-\fermata e-\fermata \! f-\fermata] - d'-[-\fermata \> e'-\fermata f'-\fermata \! g'-\fermata] - c-[-\lheel \< d-\lheel e-\lheel \! f-\lheel] - d'-[-\lheel \> e'-\lheel f'-\lheel \! g'-\lheel] - -}} - - -\score{ - \blah - -} -%% new-chords-done %% diff --git a/input/test/sleur.ly b/input/test/sleur.ly deleted file mode 100644 index 05885595e8..0000000000 --- a/input/test/sleur.ly +++ /dev/null @@ -1,192 +0,0 @@ -\version "1.7.18" - - -\header{ - - texidoc = "This file tests slurs" - - % Feta embedded slurs - -%this is too old. Junkme? --hwn -} - - - -shortlong = \notes{ - c4(c-)( c c | - c c c c | - c c c c | - \break - c c c c-) | -} - -dirs = \notes\transpose c c { - - c'1(g'-) (c-) (g-) (c-) | -} -over = \notes\transpose c c{ - - - e( g' g' e-) - e( a' a' e-) - e( b' b' e-) - e( c'' c'' e-) - \stemUp - e( c' c' e-) - e( d' d' e-) - e( e' e' e-) - e( c'' c'' e-) - \stemBoth - e( f' b' e-) - e( b' f' e-) - e( e'' g' e-) - e( g' e'' e-) - \stemUp - e( d' b e-) - e( b d' e-) - e( f' c'' e-) - e( c'' f e-) -} - -under = \notes\transpose c c{ - \stemDown - f'( \stemBoth d d \stemDown f'-) - f'( \stemBoth c c \stemDown f'-) - f'( \stemBoth b, b, \stemDown f'-) - f'( \stemBoth a, a, \stemDown f'-) - \stemDown - f'( a a f'-) - f'( g g f'-) - f'( f f f'-) - f'( a, a, f'-) - - \stemDown - f'( \stemBoth d b, \stemDown f'-) - f'( \stemBoth b, d \stemDown f'-) - f'( \stemBoth d, b, \stemDown f'-) - f'( \stemBoth b, d, \stemDown f'-) - \stemDown - f'( f a f'-) - f'( a f f'-) - f'( f e, f'-) - f'( e, f f'-) -} - -eccentric = \notes\transpose c c{ - \stemUp - \times 4/7 { f( a' f f f f f-) } | - \times 4/7 { f( f f f f a' f-) } | - \stemDown - \times 4/7 { e'( c e' e' e' e' e'-) } | - \times 4/7 { e'( e' e' e' e' c e'-) } | -} - -tiltup = \notes\transpose c c{ - e( c'' c'' e'-) - \stemUp - e( c'' c'' e'-) - \stemBoth - e( g' e'' e'-) - \stemUp - e( c'' f e'-) - \stemDown - f'( \stemBoth a, a, \stemDown f''-) - \stemDown - f'( a, a, f''-) -} - -tiltdown = \notes\transpose c c{ - e'( c'' c'' e-) - \stemUp - e'( c'' c'' e-) - \stemBoth - e'( g' e'' e-) - \stemUp - e'( c'' f e-) - \stemDown - f''( \stemBoth a, a, \stemDown f'-) - \stemDown - f''( a, a, f'-) -} - -broken = \notes\transpose c c'{ - c c c c() - c c c c( - c c-) c c( - c c c-) c( - a'-) a' a' a'() - a' a' a' a'() - c( c c c-) - c( c c f,-) - f,( c c c-) - f,( c c f,-) -} - -blend = \notes\transpose c c{ - e( c'' c'' e-) - \stemUp - f'( c'' c'' f'-) - e( c'' c'' e-) - \stemDown - f'( \stemBoth a, a, \stemDown f'-) - f'( a, a, f'-) - - \stemBoth - e( c'' c'' e'-) - e'( c'' c'' e-) - d( d d d-) - - \stemDown - e( c'' c'' e'-) - e'( c'' c'' e-) - d( d d d-) -} - - -bug = \notes\transpose c c{ - - a(g-)( f e-) - b'(a'-)( g' f'-) - g( f' e' d'-) - f f( g a-) - c' (b-) (c'-) c' -} - -clipping = \notes\transpose c c{ - \stemBoth - c( c''' c'''c-) - c( c''' c c''-) - c''( c c''' c-) - \stemDown - c( \stemUp c,,, c,,, \stemDown c-) - c( \stemUp c,,, c \stemDown c,,-) - c,,( \stemUp c c,,, \stemDown c-) -} - -\score{ - \context Staff \notes{ -% \property Voice.pletvisibility = 0 - % use blend for fast check - \blend -% { - \shortlong - \dirs - \over - \under - \eccentric - \tiltup - \tiltdown - \bug -% } - \clipping - % use broken with small linewidth - %\broken - } - \paper{ - indent = 0.0\pt - %for broken! - % linewidth= 30.\mm - } -} - -%% new-chords-done %% diff --git a/input/test/spacing.ly b/input/test/spacing.ly deleted file mode 100644 index 124796c8aa..0000000000 --- a/input/test/spacing.ly +++ /dev/null @@ -1,95 +0,0 @@ -\version "1.7.18" -\header{ -texidoc = "Concurrent tuplets should be spaced equidistantly on -all staffs" -} - - - -multipart = \notes \relative c'{ - \context StaffGroup < - \context Staff = one \context Voice { - c4 - c - c c - } - \context Staff = two \context Voice { - c8-[ c] - c-[ c] - c-[ c] c-[ c] - } - \context Staff = three \context Voice { - \times 2/3 { c8-[ c c] } - \times 2/3 { c-[ c c] } - \times 2/3 { c-[ c c] } - \times 2/3 { c-[ c c] } - } - \context Staff = four \context Voice { - \times 2/4 { c8-[ c c c] } - \times 2/4 { c-[ c c c] } - \times 2/4 { c-[ c c c] } \times 2/4 { c-[ c c c] } - } - \context Staff = five \context Voice { - \times 2/5 { c8-[ c c c c] } - \times 2/5 { c-[ c c c c] } - \times 2/5 { c-[ c c c c] } \times 2/5 { c-[ c c c c] } - } - \context Staff = six \context Voice { - \times 2/6 { c8-[ c c c c c] } - \times 2/6 { c-[ c c c c c] } - \times 2/6 { c-[ c c c c c] } \times 2/6 { c-[ c c c c c] } - } - \context Staff = seven \context Voice { - \times 2/7 { c8-[ c c c c c c] } - \times 2/7 { c-[ c c c c c c] } - \times 2/7 { c-[ c c c c c c] } - \times 2/7 { c-[ c c c c c c] } - } - \context Staff = eight \context Voice { - \times 2/8 { c8-[ c c c c c c c] } - \times 2/8 { c-[ c c c c c c c] } - \times 2/8 { c-[ c c c c c c c] } - \times 2/8 { c-[ c c c c c c c] } - } - \context Staff = nine \context Voice { - \times 2/9 { c8-[ c c c c c c c c] } - \times 2/9 { c-[ c c c c c c c c] } - \times 2/9 { c-[ c c c c c c c c] } - \times 2/9 { c-[ c c c c c c c c] } - } - \context Staff = ten \context Voice { - \times 2/10 { c8-[ c c c c c c c c c] } - \times 2/10 { c-[ c c c c c c c c c] } - \times 2/10 { c-[ c c c c c c c c c] } - \times 2/10 { c-[ c c c c c c c c c] } - } - \context Staff = eleven \context Voice { - \times 2/11 { c8-[ c c c c c c c c c c] } - \times 2/11 { c-[ c c c c c c c c c c] } - \times 2/11 { c-[ c c c c c c c c c c] } - \times 2/11 { c-[ c c c c c c c c c c] } - } - > - } - -singlepart = \notes{ - c4 d e f - c4 d e f8-[ f] - c4 d e f8 f16-[ f] - c4 d e f8 f16 f32-[ f] - c4 d e f8 f16 f32 f64-[ f] - c4 c4 c4 c4 - - } - - \score{ - \notes { -% \singlepart - \multipart - } - \paper { - indent = 0.0 \cm - linewidth= 20.0\cm - } -} -%% new-chords-done %% diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly index d3bdfa67f6..da3282f4b1 100644 --- a/input/test/stem-cross-staff.ly +++ b/input/test/stem-cross-staff.ly @@ -1,9 +1,9 @@ \version "1.7.18" \header { - texidoc = "Cross staff stems + texidoc = " -Unfortunately, there is no support for putting chords across staves. +There is no support for putting chords across staves. You can get this result by increasing the length of the stem in the lower stave so it reaches the stem in the upper stave, or vice versa. diff --git a/input/test/volta-start.ly b/input/test/volta-start.ly deleted file mode 100644 index 8f474d7dde..0000000000 --- a/input/test/volta-start.ly +++ /dev/null @@ -1,109 +0,0 @@ -\version "1.7.18" - -\header{ - -texidoc = " Volta braces are hung on barlines. At the start of the -line, they should always start after the prefatory matter. " - -} - - - -voiceB = \notes { - \clef bass - \property Staff.instrument = "Bass" - \property Staff.instr = "B" - \key f \minor - \time 4/4 - f,2 ( f,8-) r8 f8 e8 - \repeat volta 2 - { - d8. d16 e8. f16 f8 c8 c16 c8. \break - } - \alternative - { - { - f,2 ( f,8-) r8 f8 e8 - f,2 ( f,8-) r8 f8 e8 - g1 \break - f,2 ( f,8-) r8 f8 e8 - f,2 ( f,8-) r8 f8 e8 - g1 \break - } - { - f,2. r8 c16 c16 | - } - } -} -voiceC = \notes { - \repeat volta 2 - { - bes8 bes8 c'8 c'8 a4 r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | - \break - } - \alternative - { - { a2 ( a8-) r8 a8 bes8 } - { a2. r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | - } - } -} -voiceD = \notes { - \repeat volta 2 - { - bes8 bes8 c'8 c'8 a4 r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | - \break - } - \alternative - { - { a2 \> a8 r8 a8 \! bes8 - } - { a2. r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | \break - d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | - } - } -} -voiceE = \notes { - \repeat volta 2 - { - bes8 bes8 c'8 c'8 a4 r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 f16 g8. | \break - } - \alternative - { - { - a2 a8 r8 a8 bes8 - - } - { - a2. r8 g16 f16 | - d'8. c'16 c'8. d'16 c'8 c'8 c'16 c'8. | - } - } -} -\score{ - \notes < - - - \context Staff="4" - { - \voiceB - \voiceC - \break - \voiceD - \voiceE - } - - > - \paper { - \translator { - \StaffContext - \consists Instrument_name_engraver - } - } -} -%% new-chords-done %%