From 7676032db43db167644929d77d29140db4a86218 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sat, 28 Jun 2003 22:48:28 +0000 Subject: [PATCH] input/test/key-clefs.ly: moved to regression input/test/perform-grace.ly: moved to to no-notation/midi-grace.ly input/no-notation/README: added note about midi-*.ly files input/test/two-key.ly: moved to no-notation/parse5.ly input/test/ short-part-combine.ly sketch.ly system-start-brace.ly system-start-bracket.ly two-slurs.ly voice-switch.ly : deleted input/test/ {various}: modified comments, marked some files for deletion --- ChangeLog | 15 ++++++++++ input/no-notation/README | 6 +++- .../midi-grace.ly} | 3 +- input/no-notation/parse5.ly | 11 +++++++ input/{test => regression}/key-clefs.ly | 3 +- input/test/script-abbreviations.ly | 5 ++-- input/test/script-chart.ly | 6 ++-- input/test/short-part-combine.ly | 18 ------------ input/test/sketch.ly | 18 ------------ input/test/slur-dash.ly | 12 ++++---- input/test/slur-follow-music.ly | 1 + input/test/slur-proof.ly | 1 + input/test/slur-symmetry-2.ly | 7 +++-- input/test/slur-symmetry-3.ly | 13 ++++----- input/test/solo-a2.ly | 8 ++++- input/test/span-bars.ly | 3 +- input/test/system-start-brace.ly | 8 ----- input/test/system-start-bracket.ly | 8 ----- input/test/tablature-hammer.ly | 5 +++- input/test/tie-broken.ly | 2 ++ input/test/two-key.ly | 19 ------------ input/test/two-slurs.ly | 29 ------------------- input/test/voice-switch.ly | 27 ----------------- 23 files changed, 71 insertions(+), 157 deletions(-) rename input/{test/perform-grace.ly => no-notation/midi-grace.ly} (73%) create mode 100644 input/no-notation/parse5.ly rename input/{test => regression}/key-clefs.ly (87%) delete mode 100644 input/test/short-part-combine.ly delete mode 100644 input/test/sketch.ly delete mode 100644 input/test/system-start-brace.ly delete mode 100644 input/test/system-start-bracket.ly delete mode 100644 input/test/two-key.ly delete mode 100644 input/test/two-slurs.ly delete mode 100644 input/test/voice-switch.ly diff --git a/ChangeLog b/ChangeLog index 1a7714b317..e04179b940 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-06-28 Graham Percival + + * input/test/key-clefs.ly: moved to regression. + + * input/test/perform-grace.ly: moved to to no-notation/midi-grace.ly + + * input/no-notation/README: added note about midi-*.ly files. + + * input/test/two-key.ly: moved to no-notation/parse5.ly + + * input/test/ short-part-combine.ly sketch.ly system-start-brace.ly + system-start-bracket.ly two-slurs.ly voice-switch.ly : deleted + + * input/test/ {various}: modified comments, marked some for deletion. + 2003-06-28 Han-Wen Nienhuys * scm/chord-name.scm (note-name->markup): don't superscript root diff --git a/input/no-notation/README b/input/no-notation/README index 357b67355d..b832c119ca 100644 --- a/input/no-notation/README +++ b/input/no-notation/README @@ -4,4 +4,8 @@ Some are bugs that should be fixed to generate output, andd then moved to ../bugs or ../regression. Some (notably parse*.ly) are just error/warning generation tests -and should remain here. \ No newline at end of file +and should remain here. + +Some (notably midi-*.ly) test midi output, which does not usually +get tested in ../regression files. + diff --git a/input/test/perform-grace.ly b/input/no-notation/midi-grace.ly similarity index 73% rename from input/test/perform-grace.ly rename to input/no-notation/midi-grace.ly index 7529b09940..75665a801c 100644 --- a/input/test/perform-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -1,6 +1,5 @@ \version "1.7.18" -% regression or delete. -gp -\header{ texidoc = "DELETE or REGRESSION." } +\header{ texidoc = "Tests MIDI output with grace notes. " } \score { \context Voice \notes\relative c { diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly new file mode 100644 index 0000000000..9347c82b14 --- /dev/null +++ b/input/no-notation/parse5.ly @@ -0,0 +1,11 @@ +\version "1.7.18" +%If you specify two different key sigs at one point, a +%warning is printed. + +\score { \notes +\context Voice < + { \key cis \major cis4 \key bes \major bes4 } + { \key cis \major fis4 \key es \major g4 } +> +} +%% new-chords-done %% diff --git a/input/test/key-clefs.ly b/input/regression/key-clefs.ly similarity index 87% rename from input/test/key-clefs.ly rename to input/regression/key-clefs.ly index 4bbc64718e..6a19e0d3b9 100644 --- a/input/test/key-clefs.ly +++ b/input/regression/key-clefs.ly @@ -1,6 +1,5 @@ \version "1.7.18" -% candidate for regression -gp -\header { texidoc = "REGRESSION or DELETE " } +\header { texidoc = "Tests placement of accidentals in every clef. " } \score { \notes \relative cis' { diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly index 5159046c32..7e114bcbe0 100644 --- a/input/test/script-abbreviations.ly +++ b/input/test/script-abbreviations.ly @@ -1,7 +1,6 @@ \version "1.7.18" -% covered by refman. delete. -gp -\header { texidoc = "DELETE; covered by refman. -@cindex Script Abbreviations +% FIXMEsoon: check if test/ is the right place. +\header { texidoc = "@cindex Script Abbreviations Some scripts may be entered using an abbreviation. " } diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 9d78191eb8..79da0bc424 100644 --- a/input/test/script-chart.ly +++ b/input/test/script-chart.ly @@ -1,8 +1,8 @@ \version "1.7.18" -% covered in refman. delete, or move to an appendix. -gp +% FIXMEsoon: check if test/ is the best place. \header { - texidoc ="Covered in refman; DELETE or move to an appendix. Or maybe REGRESSION. -A chart showing all feta scripts" + texidoc ="@cindex Feta scripts +A chart showing all feta scripts. " } \score { diff --git a/input/test/short-part-combine.ly b/input/test/short-part-combine.ly deleted file mode 100644 index 7eaa31930e..0000000000 --- a/input/test/short-part-combine.ly +++ /dev/null @@ -1,18 +0,0 @@ -\version "1.7.18" -\header {texidoc=" -covered by part-combine.ly. DELETE. "} - -\score{ - \context Staff < - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' - { - d e f - } - \context Thread=two \notes\relative c'' - { - d d d - } - > -} -%% new-chords-done %% diff --git a/input/test/sketch.ly b/input/test/sketch.ly deleted file mode 100644 index 01722aad92..0000000000 --- a/input/test/sketch.ly +++ /dev/null @@ -1,18 +0,0 @@ -\version "1.7.18" -% looks like a really old file. delete. -gp -\header { -texidoc="DELETE. -sketch output supported features" -} -\score { - \notes\relative c''' { -% doesn't work yet -% \time 3/4 - a4( a a a a-) - \stemDown - a,8( b c d-) - \stemUp - \slurDown d16( c b a-) - } -} -%% new-chords-done %% diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index b5422f329b..fba9e2ed10 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,6 +1,7 @@ \version "1.7.18" -% regression or delete. -gp -\header {texidoc = "REGRESSION or DELETE. "} +\header {texidoc = "@cindex Slur, dotted +You can print different kinds of slurs (dotted, dashed, etc). " +} \score{ \notes{ c( d e c-) | @@ -13,12 +14,11 @@ \slurSolid c( d e c-) | } - \paper{ - indent = 0.0\pt + \paper{ raggedright=##t } +% indent = 0.0\pt %for broken! % linewidth= 30.\mm - - } +% } } diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index a36300f061..303162520c 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,5 +1,6 @@ \version "1.7.18" % more fodder for regression. -gp +\header {texidoc = "DELETE or REGRESSION"} \score { \context Voice \notes\relative c { diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly index d88ff40cb8..58be644ea4 100644 --- a/input/test/slur-proof.ly +++ b/input/test/slur-proof.ly @@ -1,5 +1,6 @@ \version "1.7.18" % looks pretty, but it's for regression. -gp +\header { texidoc = "REGRESSION? or DELETE. "} x = { \outputproperty #(make-type-checker 'note-head-interface) diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly index 1af46ea4a4..916a63ebfe 100644 --- a/input/test/slur-symmetry-2.ly +++ b/input/test/slur-symmetry-2.ly @@ -1,9 +1,10 @@ \version "1.7.18" % another regression. -gp -\header{ +\header { texidoc = "REGRESSION or DELETE. "} +%\header{ % should look the same -title="symmetry" -} +%title="symmetry" +%} \score{ \notes\relative c'{ g'8-[( e c'-) g,] diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly index 177f4916c5..abdaea5d5c 100644 --- a/input/test/slur-symmetry-3.ly +++ b/input/test/slur-symmetry-3.ly @@ -1,12 +1,11 @@ \version "1.7.18" % regression, and should be merged with -2. -\header{ -title="symmetry. - -Both slurs should look the same. - -" -} +\header { texidoc = "REGRESSION or DELETE. "} +%\header{ +%title="symmetry. +% +%Both slurs should look the same. " +%} \score{ \notes\relative c'{ diff --git a/input/test/solo-a2.ly b/input/test/solo-a2.ly index 092a98ee80..79378eb94d 100644 --- a/input/test/solo-a2.ly +++ b/input/test/solo-a2.ly @@ -1,4 +1,10 @@ \version "1.7.18" +%rename to partcobine- something. -gp + +\header {texidoc = "@cindex Partcombine something. " + +% FIXMEsoon. +} \score{ \context Staff = one < @@ -16,7 +22,7 @@ } > \paper{ - linewidth = 100.\mm +% linewidth = 100.\mm raggedright=##t } } diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index f3bd836de9..9f562c1ba1 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,6 @@ \version "1.7.18" -% regression again? *sigh* :) -gp + +\header { texidoc = "I really don't understand this one. DELETE or REGRESSION? -gp " } nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < diff --git a/input/test/system-start-brace.ly b/input/test/system-start-brace.ly deleted file mode 100644 index 966eacdc8f..0000000000 --- a/input/test/system-start-brace.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "1.7.18" -\header {texidoc = "DELETE. "} - -\score { - \notes \context PianoStaff < \context Staff = SA { s1 } - \context Staff = SB { s1 }> -} -%% new-chords-done %% diff --git a/input/test/system-start-bracket.ly b/input/test/system-start-bracket.ly deleted file mode 100644 index 589fb85bb3..0000000000 --- a/input/test/system-start-bracket.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "1.7.18" -\header {texidoc = "DELETE. "} - -\score { - \notes \context StaffGroup < \context Staff = SA { s1 } - \context Staff = SB { s1 }> -} -%% new-chords-done %% diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly index a2c14babdb..edebb53082 100644 --- a/input/test/tablature-hammer.ly +++ b/input/test/tablature-hammer.ly @@ -1,5 +1,7 @@ \version "1.7.18" -\header {texidoc = "DELETE. "} +\header {texidoc = "@cindex Tablature hammer +You can fake a hammer in tablature with slurs. " +} \score{ \context TabStaff < @@ -9,5 +11,6 @@ d(c-) } > + \paper{ raggedright = ##t} } %% new-chords-done %% diff --git a/input/test/tie-broken.ly b/input/test/tie-broken.ly index 20e1f46e66..07597c00c1 100644 --- a/input/test/tie-broken.ly +++ b/input/test/tie-broken.ly @@ -1,5 +1,7 @@ \version "1.7.18" % regression stuff. -gp +\header {texidoc = "REGRESSION or DELETE. " +} \score{ \notes \relative c''{ diff --git a/input/test/two-key.ly b/input/test/two-key.ly deleted file mode 100644 index 273b6c6ec0..0000000000 --- a/input/test/two-key.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "1.7.18" - -\header { texidoc = "If you specify two different key sigs at one point, a - warning is printed. DELETE. - -regression? -gp - -no, it doesn't test notation. Perhaps no-notation, but -delete is also fine with me. -hwn -" -} - -\score { \notes -\context Voice < - { \key cis \major cis4 \key bes \major bes4 } - { \key cis \major fis4 \key es \major g4 } -> -} -%% new-chords-done %% diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly deleted file mode 100644 index 0466be9f03..0000000000 --- a/input/test/two-slurs.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "1.7.18" - -\header{ texidoc = "@cindex Two Slurs -You can print a slur in each voice. DELETE? -remove? -hwn -" -} - -% We'd want to combine the stems, but have two slurs too... -% Looks like the a-due engraver - - - -\score{ - \context Staff < - \context Voice=v \notes\relative c''{ - \stemUp - a4 c4.(g8-) a4 - } - \context Voice=u \notes\relative c''{ - \stemDown - g4 e4.(d8-) c4 - } - > - \paper{ - linewidth=60.\mm - } -} -%% new-chords-done %% diff --git a/input/test/voice-switch.ly b/input/test/voice-switch.ly deleted file mode 100644 index 30da167010..0000000000 --- a/input/test/voice-switch.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "1.7.18" -\header{texidoc = "DELETE. -We have other partcombine examples -- if that's -what this is. -gp "} - -\score{ - \context Staff < - \context Voice=one\skip 1 - \context Voice=two\skip 1 - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - c2 c2 - c2 c2 - } - \context Thread=two \notes\relative c'' { - b2 a4 (a-) - a2 a4 (a-) - - } - > - \paper{ - linewidth=140.\mm - } -} - - -%% new-chords-done %% -- 2.39.5