From 7d5e0bb65dd299f607212975d47efdc800057a05 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 21 Jul 2002 19:27:41 +0000 Subject: [PATCH] * Documentation/index.texi: Add pointers to new regression and test documents. * Documentation/user/converters.itely: Documentation/user/invoking.itexi: Some small fixes for uniform usage example. * input/font20.ly, font-body.ly: New files, moved from input/test. * input/test/different-time-signatures.ly: Add FIXME marker; comment-out broken code. * Documentation/regression-test.tely: Comment-out, add obsolete-marker and url to regression-test-dir. * input/test/GNUmakefile: * input/regression/GNUmakefile: Add rule for lys-to-tely.py. * input/regression/+.ly: * input/test/+.ly: New file. --- ChangeLog | 28 +++++++++++++++++++++++++ Documentation/index.texi | 15 +++++++------ Documentation/regression-test.tely | 11 +++++++++- Documentation/user/converters.itely | 2 +- Documentation/user/invoking.itexi | 2 +- buildscripts/lys-to-tely.py | 11 ++++++++++ input/GNUmakefile | 3 ++- input/{regression => }/allfontstyle.ly | 0 input/bugs/+.ly | 9 ++++++-- input/bugs/GNUmakefile | 5 +++-- input/{test => }/font-body.ly | 1 + input/{test => }/font20.ly | 0 input/regression/+.ly | 28 +++++++++++++++++++++++++ input/regression/GNUmakefile | 5 ++++- input/regression/collision-2.ly | 12 ++++++----- input/{regression => }/size11.ly | 0 input/{regression => }/size13.ly | 0 input/{regression => }/size16.ly | 0 input/{regression => }/size20.ly | 0 input/{regression => }/size23.ly | 0 input/{regression => }/size26.ly | 0 input/test/+.ly | 25 ++++++++++++++++++++++ input/test/GNUmakefile | 12 ++++++++--- input/test/add-staccato.ly | 8 +++---- input/test/chord-table.ly | 2 ++ input/test/different-time-signatures.ly | 6 ++++-- input/test/figured-bass.ly | 2 +- input/test/font11.ly | 24 --------------------- input/test/font13.ly | 17 --------------- input/test/font16.ly | 19 ----------------- input/test/font26.ly | 20 ------------------ input/test/improv.ly | 6 +++--- input/test/keys2.ly | 4 ---- input/test/mark.ly | 2 +- input/test/slurs.ly | 1 - input/test/test-german-chords.ly | 2 +- input/test/unfold-all-repeats.ly | 2 +- input/test/voicify-chords.ly | 6 +++--- input/test/warnings.ly | 1 + 39 files changed, 167 insertions(+), 124 deletions(-) rename input/{regression => }/allfontstyle.ly (100%) rename input/{test => }/font-body.ly (99%) rename input/{test => }/font20.ly (100%) create mode 100644 input/regression/+.ly rename input/{regression => }/size11.ly (100%) rename input/{regression => }/size13.ly (100%) rename input/{regression => }/size16.ly (100%) rename input/{regression => }/size20.ly (100%) rename input/{regression => }/size23.ly (100%) rename input/{regression => }/size26.ly (100%) create mode 100644 input/test/+.ly delete mode 100644 input/test/font11.ly delete mode 100644 input/test/font13.ly delete mode 100644 input/test/font16.ly delete mode 100644 input/test/font26.ly delete mode 100644 input/test/keys2.ly delete mode 100644 input/test/slurs.ly diff --git a/ChangeLog b/ChangeLog index 7bf607b5b0..85e443528f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,33 @@ 2002-07-21 Jan Nieuwenhuizen + * Documentation/index.texi: Add pointers to new regression and + test documents. + + * Documentation/user/converters.itely: + Documentation/user/invoking.itexi: Some small fixes for uniform + usage example. + + * input/allfontsize.ly, size*.ly: New files, moved from + input/regression. + + * input/font20.ly, font-body.ly: New files, moved from input/test. + + * input/font*.ly: New files, moved from input/test. + + * input/test/*.ly: Remove empty files, fix broken ones. + + * input/test/different-time-signatures.ly: Add FIXME marker; + comment-out broken code. + + * Documentation/regression-test.tely: Comment-out, add + obsolete-marker and url to regression-test-dir. + + * input/test/GNUmakefile: + * input/regression/GNUmakefile: Add rule for lys-to-tely.py. + + * input/regression/+.ly: + * input/test/+.ly: New file. + * input/test/cue-notes.ly: better example * Documentation/user/refman.itely (Font selection): font size doco diff --git a/Documentation/index.texi b/Documentation/index.texi index 6bdfede5f9..5a4a0d1606 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -124,13 +124,16 @@ want to fine-tune output, you need the information in this document. @c Jan's site? @itemize @bullet -@item @uref{../out-www/regression-test.html,Regression Test} -A large document that tests all kinds of features (also as -@uref{../out-www/regression-test.ps.gz,Postscript} -and -@uref{../out-www/regression-test.pdf,PDF}). +@item @uref{../../input/regression/out-www/regression.html,Regression Tests} +A large document that tests all kinds of features. +@c (also as +@c @uref{../out-www/regression-test.ps.gz,Postscript} +@c and +@c @uref{../out-www/regression-test.pdf,PDF}). +@item @uref{../../input/test/out-www/test.html,Feature Tests} +A large document that tests all kinds of features. @item @uref{../../input/bugs/out-www/bugs.html,Bugs} -A document that shows bugs +A document that shows bugs. @c (also as diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 6f57737a4b..05516dccc9 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -1,7 +1,9 @@ -\input texinfo @c -*-texinfo-*- vim:tw=72 +\input texinfo @c -*-texinfo-*- + @setfilename regression-test.info @settitle LilyPond Regression test + @html @end html @@ -14,6 +16,12 @@ @node Top, , , (dir) +This file has moved. + +See @uref{../../input/regression/out-www/regression.html,Regression Tests}. + +@ignore + @section Introduction This document presents a brief overview of LilyPond features. When the @@ -401,5 +409,6 @@ Grace note do weird things with timing. Fragile. @lilypondfile[printfilename]{molecule-hacking.ly} +@end ignore @bye diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely index 1bfe2a1e0f..a7cca30d2f 100644 --- a/Documentation/user/converters.itely +++ b/Documentation/user/converters.itely @@ -27,7 +27,7 @@ files in the current directory and its subdirectories, use The program is invoked as follows: @example - convert-ly [@var{options}] @var{files} + convert-ly [@var{option}]@dots{} @var{file}@dots{} @end example diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 3b87a41261..a7662b419e 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -15,7 +15,7 @@ Usage: @example - lilypond [@var{options}] @var{file}@dots{} + lilypond [@var{option}]@dots{} @var{file}@dots{} @end example diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py index 57b0f90796..90001203cb 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -1,5 +1,16 @@ #!@PYTHON@ + +''' +TODO: + + * Add @nodes, plit at sections? + * Less kludged first introduction file + * include *.texi files for text at start of section? + +''' + + import sys import os import string diff --git a/input/GNUmakefile b/input/GNUmakefile index 02c8a454d3..f2b0a2bb16 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -3,7 +3,8 @@ depth = .. SUBDIRS=bugs test regression tutorial no-notation ascii-art template mutopia # nereides is tweaked a lot, can't do (read webpage) -examples=trip star-spangled-banner paddy twinkle +examples=trip star-spangled-banner paddy twinkle font20 +examples+=size11 size13 size16 size20 size23 size26 LOCALSTEPMAKE_TEMPLATES=ly mutopia EXTRA_DIST_FILES=paddy.abc diff --git a/input/regression/allfontstyle.ly b/input/allfontstyle.ly similarity index 100% rename from input/regression/allfontstyle.ly rename to input/allfontstyle.ly diff --git a/input/bugs/+.ly b/input/bugs/+.ly index a7b9a9c88b..acbabf4c1e 100644 --- a/input/bugs/+.ly +++ b/input/bugs/+.ly @@ -1,3 +1,8 @@ +%% +.ly: Be the first .ly file for lys-to-tely.py. +%% Better to make lys-to-tely.py include "introduction.texi" or +%% other .texi documents too? + + \header{ texidoc = " @section Introduction @@ -15,6 +20,6 @@ foollilypondbook = " " } -\score { - \context Lyrics \lyrics { "." } +\score{ +\context Lyrics \lyrics { "." } } diff --git a/input/bugs/GNUmakefile b/input/bugs/GNUmakefile index 4b14cadb54..8157e1c8ef 100644 --- a/input/bugs/GNUmakefile +++ b/input/bugs/GNUmakefile @@ -4,6 +4,7 @@ STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc EXTRA_DIST_FILES=README -include $(depth)/make/stepmake.make +include $(depth)/make/stepmake.make + +TITLE=LilyPond Assorted Possible Bugs -TITLE=Assorted Possible Bugs diff --git a/input/test/font-body.ly b/input/font-body.ly similarity index 99% rename from input/test/font-body.ly rename to input/font-body.ly index d11e5e3e33..a6fe2b9522 100644 --- a/input/test/font-body.ly +++ b/input/font-body.ly @@ -68,6 +68,7 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 c2\sustainDown c\sustainUp | } } + \score { \FontBody } diff --git a/input/test/font20.ly b/input/font20.ly similarity index 100% rename from input/test/font20.ly rename to input/font20.ly diff --git a/input/regression/+.ly b/input/regression/+.ly new file mode 100644 index 0000000000..29cd1dc7cd --- /dev/null +++ b/input/regression/+.ly @@ -0,0 +1,28 @@ +%% +.ly: Be the first .ly file for lys-to-tely.py. +%% Better to make lys-to-tely.py include "introduction.texi" or +%% other .texi documents too? + + +\header{ +texidoc = " +@section Introduction + +This document presents a brief overview of LilyPond features. When the +text correspond with the shown notation, we consider LilyPond Officially +BugFree (tm). This document is intended for finding bugs, and +documenting bugfixes. + +TODO: order of tests (file names!), test only one feature per test. +Smaller and neater tests. + + +" + +foollilypondbook = " +\score +" +} + +\score{ +\context Lyrics \lyrics { "." } +} diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 5d1d790f83..99c4d8d71d 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -1,6 +1,9 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=ly mutopia +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + include $(depth)/make/stepmake.make +TITLE=LilyPond Regression Tests diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 04b9f80c94..f2edf9595d 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -1,9 +1,11 @@ -\score { \notes +\score { + \notes \context Staff \notes < - % the f and g on 4th beat are exceptionally ugh. - \context Voice=i { \stemUp c4 d e f g2 g4 a | } - \context Voice=ii { \stemDown g4 f e g g2 g2 } ->} + %% the f and g on 4th beat are exceptionally ugh. + \context Voice=i { \stemUp c4 d e f g2 g4 a | } + \context Voice=ii { \stemDown g4 f e g g2 g2 } + > } + diff --git a/input/regression/size11.ly b/input/size11.ly similarity index 100% rename from input/regression/size11.ly rename to input/size11.ly diff --git a/input/regression/size13.ly b/input/size13.ly similarity index 100% rename from input/regression/size13.ly rename to input/size13.ly diff --git a/input/regression/size16.ly b/input/size16.ly similarity index 100% rename from input/regression/size16.ly rename to input/size16.ly diff --git a/input/regression/size20.ly b/input/size20.ly similarity index 100% rename from input/regression/size20.ly rename to input/size20.ly diff --git a/input/regression/size23.ly b/input/size23.ly similarity index 100% rename from input/regression/size23.ly rename to input/size23.ly diff --git a/input/regression/size26.ly b/input/size26.ly similarity index 100% rename from input/regression/size26.ly rename to input/size26.ly diff --git a/input/test/+.ly b/input/test/+.ly new file mode 100644 index 0000000000..d42b34fd7d --- /dev/null +++ b/input/test/+.ly @@ -0,0 +1,25 @@ +%% +.ly: Be the first .ly file for lys-to-tely.py. +%% Better to make lys-to-tely.py include "introduction.texi" or +%% other .texi documents too? + +\header{ +texidoc = " +@section Introduction + +This document tests all kinds of features, from simple to advanced, +that are not really suited for the reference manual, and are not +needed as a regression test. + +Here you may also find dirty tricks, or very the very latest features +that have not been documented or fully implemented yet. + +" + +foollilypondbook = " +\score +" +} + +\score{ +\context Lyrics \lyrics { "." } +} diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index bb53247dda..b742267c7b 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -1,10 +1,16 @@ -# input/test/Makefile depth = ../.. -examples= font20 ancient-font -LOCALSTEPMAKE_TEMPLATES=ly mutopia + +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc + +## Hmm, would this work? No -- if we really want examples, move +## to other dir (input/) comes to mind. +## examples = font20 ancient-font +## LOCALSTEPMAKE_TEMPLATES += ly mutopia EXTRA_DISTFILES=features.abc include $(depth)/make/stepmake.make +TITLE=LilyPond Feature Tests diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index cebb441105..141d908e34 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -8,15 +8,15 @@ one would not use scm constructs. See separate-staccato.ly first." #(define (make-script x) (let ((m (ly-make-music "Articulation_req"))) - ;;(ly-set-mus-property m 'articulation-type 'staccato) + ;;(ly-set-mus-property! m 'articulation-type 'staccato) ;; urg - (ly-set-mus-property m 'articulation-type x) - (ly-set-mus-property m 'script x) + (ly-set-mus-property! m 'articulation-type x) + (ly-set-mus-property! m 'script x) m)) #(define (add-script m x) (if (equal? (ly-music-name m) "Request_chord") - (ly-set-mus-property m 'elements + (ly-set-mus-property! m 'elements (cons (make-script x) (ly-get-mus-property m 'elements))) diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 4544792045..3aaf72cf7d 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -23,6 +23,7 @@ tab = \notes\transpose c'''\chords{ \context ChordNames=es \notes\transpose es\tab \context Staff=e \notes\transpose e\tab \context ChordNames=e \notes\transpose e\tab +%{ FIXME: remove some, gs barfs \context Staff=fis \notes\transpose fis\tab \context ChordNames=fis \notes\transpose fis\tab \context Staff=g \notes\transpose g\tab @@ -35,6 +36,7 @@ tab = \notes\transpose c'''\chords{ \context ChordNames=bes \notes\transpose bes,\tab \context Staff=b \notes\transpose b,\tab \context ChordNames=b \notes\transpose b,\tab +%} > \paper{ textheight = \vsize - 4.0 * \staffheight diff --git a/input/test/different-time-signatures.ly b/input/test/different-time-signatures.ly index 3e6be76b5b..ecce89104d 100644 --- a/input/test/different-time-signatures.ly +++ b/input/test/different-time-signatures.ly @@ -3,7 +3,9 @@ % barline spacing disrupts visual rhythm. -#(define nbal (acons '("Staff_bar" "begin-of-note") '(minimum_space 0.0) default-break-align-space-alist)) +%%FIXME + +%% #(define nbal (acons '("Staff_bar" "begin-of-note") '(minimum_space 0.0) default-break-align-space-alist)) %% FIXME \score{ \notes \relative c' < @@ -26,7 +28,7 @@ linewidth = -1.0\cm \translator{ \ScoreContext - BreakAlignment \override #'space-alist = #nbal +%%FIXME BreakAlignment \override #'space-alist = #nbal \remove Timing_engraver } \translator{ diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly index daaf2ea6d5..e8859ad9ce 100644 --- a/input/test/figured-bass.ly +++ b/input/test/figured-bass.ly @@ -3,7 +3,7 @@ texidoc = "Test figured bass. Figured bass is created by the FiguredBass context which eats note-requests and rest-requests. You can enter these either using -standard @code{< >} notation, or using the special @code{\figures { }} +standard @code{< >} notation, or using the special @code{\figures @{ @}} mode, which allows you to type numbers, like @code{<4 6+>}. " } diff --git a/input/test/font11.ly b/input/test/font11.ly deleted file mode 100644 index b418f82713..0000000000 --- a/input/test/font11.ly +++ /dev/null @@ -1,24 +0,0 @@ -\version "1.5.68" - - -\header{ -title= "The Feta Font" -subtitle = "proofsheet" -enteredby = "jcn & hwn" -copyright = "public domain" -description = "This file tests the Feta music font, 11pt" -% "(Feta definitively is not an abbreviation of Font-En-TjA)" -} - - -\include "paper11.ly" -\include "font-body.ly" -\score{ - \FontBody - \paper{ - \paperEleven - linewidth = 17.5 \cm - - } -} - diff --git a/input/test/font13.ly b/input/test/font13.ly deleted file mode 100644 index 9d86891ae7..0000000000 --- a/input/test/font13.ly +++ /dev/null @@ -1,17 +0,0 @@ -\version "1.5.68" -\header{ -title= "The Feta Font" -subtitle = "proofsheet" -enteredby = "jcn & hwn" -copyright = "public domain" -description = "This file tests the Feta music font, 11pt" -% "(Feta definitively is not an abbreviation of Font-En-TjA)" -} - - -\include "paper13.ly" -\paper{ -linewidth = 17.5 \cm -} -\include "font-body.ly" - diff --git a/input/test/font16.ly b/input/test/font16.ly deleted file mode 100644 index 4d26a93507..0000000000 --- a/input/test/font16.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "1.5.68" -\header{ -title= "The Feta Font" -subtitle = "proofsheet" -enteredby = "jcn & hwn" -copyright = "public domain" -description = "This file tests the Feta music font" -% "(Feta definitively is not an abbreviation of Font-En-TjA)" -} - - -\include "paper16.ly" - \paper{ - % don't change this. - % otherwise 16pt and 20pt layouts differ. - - linewidth = 12.5 \cm} - - \include "font-body.ly" diff --git a/input/test/font26.ly b/input/test/font26.ly deleted file mode 100644 index c93759d5eb..0000000000 --- a/input/test/font26.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "1.5.68" - -\header{ -title= "The Feta Font" -subtitle = "proofsheet" -enteredby = "jcn & hwn" -copyright = "public domain" -description = "This file tests the Feta music font" -% "(Feta definitively is not an abbreviation of Font-En-TjA)" -} - -\include "paper26.ly" - \paper{ - - linewidth = 17.5 \cm - - } - - \include "font-body.ly" - diff --git a/input/test/improv.ly b/input/test/improv.ly index a582e8cf69..c85f08e983 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -31,7 +31,7 @@ global = \notes { s1*3 \bar "|." } \name SquashVoice \alias Voice \consists Pitch_squash_engraver - \consists Local_key_engraver + \consists "Accidental_engraver" squashedPosition = #0 NoteHead \override #'style = #'slash Accidentals \override #'transparent = ##t @@ -39,7 +39,7 @@ global = \notes { s1*3 \bar "|." } \translator { \VoiceContext \alias SquashVoice - \consists Local_key_engraver + \consists "Accidental_engraver" } \translator { \ScoreContext @@ -47,7 +47,7 @@ global = \notes { s1*3 \bar "|." } } \translator { \StaffContext - \remove Local_key_engraver + \remove "Accidental_engraver" \accepts SquashVoice } linewidth = -1 diff --git a/input/test/keys2.ly b/input/test/keys2.ly deleted file mode 100644 index 325b7e9c4b..0000000000 --- a/input/test/keys2.ly +++ /dev/null @@ -1,4 +0,0 @@ -\version "1.5.68" - - - diff --git a/input/test/mark.ly b/input/test/mark.ly index ee0fddc045..722394b297 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -8,7 +8,7 @@ global = \notes { s1 | \mark "12" s1 | \mark \default s1 | \mark "A2" - s1 | \mark #'(music "scripts-segno") +%% FIXME s1 | \mark #'(music "scripts-segno") s1 } diff --git a/input/test/slurs.ly b/input/test/slurs.ly deleted file mode 100644 index 2502a238d0..0000000000 --- a/input/test/slurs.ly +++ /dev/null @@ -1 +0,0 @@ -\version "1.5.68" diff --git a/input/test/test-german-chords.ly b/input/test/test-german-chords.ly index 4a4cc06f11..b138863abd 100644 --- a/input/test/test-german-chords.ly +++ b/input/test/test-german-chords.ly @@ -1,5 +1,5 @@ \version "1.5.68" -\include "german-chords.ly" +\include "german-chords-init.ly" % #(set! german-Bb #t) diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly index 6d35bbc565..006fcc144a 100644 --- a/input/test/unfold-all-repeats.ly +++ b/input/test/unfold-all-repeats.ly @@ -18,7 +18,7 @@ mel = \notes \context Staff { \score { \notes { \mel \break - \apply #unfold-repeats \mel +%% \apply #unfold-repeats \mel FIXME } } diff --git a/input/test/voicify-chords.ly b/input/test/voicify-chords.ly index f0592545b4..f472e04f7c 100644 --- a/input/test/voicify-chords.ly +++ b/input/test/voicify-chords.ly @@ -23,7 +23,7 @@ (let* ((es (ly-get-mus-property ch 'elements))) - (ly-set-mus-property ch 'elements + (ly-set-mus-property! ch 'elements (voicify-list (split-list es music-separator?) 0)) ch )) @@ -46,9 +46,9 @@ (voicify-chord m) (begin (if (pair? es) - (ly-set-mus-property m 'elements (map voicify-music es))) + (ly-set-mus-property! m 'elements (map voicify-music es))) (if (music? e) - (ly-set-mus-property m 'element (voicify-music e))) + (ly-set-mus-property! m 'element (voicify-music e))) m) diff --git a/input/test/warnings.ly b/input/test/warnings.ly index 41fc1af0d2..54d5bb267f 100644 --- a/input/test/warnings.ly +++ b/input/test/warnings.ly @@ -9,6 +9,7 @@ linebreak = \penalty #-1000 \score { \notes { + c'' \property Voice.Stem \set #'length = #"foo" \property Voice.Stem \set #'longth = #2 \property Staff.clefStyle = #"foo" -- 2.39.5