From 62707146a153a10c93009060e72481e7815f2a35 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 15 Jul 2003 13:19:55 +0000 Subject: [PATCH] * input/test/script-stack.ly: change name from stacked-scripts * input/test/ossia.ly: octave errors. * input/no-notation/midi-tuplets.ly: move from input/test/, idem for midi-volume-equaliser --- ChangeLog | 11 ++++++++ VERSION | 2 +- config.make.in | 5 +--- input/{test => no-notation}/midi-tuplets.ly | 3 +-- .../midi-volume-equaliser.ly | 0 input/test/ossia.ly | 2 +- input/test/poly-metric.ly | 2 +- .../{stacked-scripts.ly => script-stack.ly} | 2 +- input/test/span-bars.ly | 26 ------------------- input/test/spanner-after-break-tweak.ly | 2 +- stepmake/aclocal.m4 | 2 +- 11 files changed, 19 insertions(+), 38 deletions(-) rename input/{test => no-notation}/midi-tuplets.ly (89%) rename input/{test => no-notation}/midi-volume-equaliser.ly (100%) rename input/test/{stacked-scripts.ly => script-stack.ly} (91%) delete mode 100644 input/test/span-bars.ly diff --git a/ChangeLog b/ChangeLog index 441f3667e9..5870e8ba80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2003-07-15 Han-Wen Nienhuys + * input/test/script-stack.ly: change name from stacked-scripts + + * input/test/ossia.ly: octave errors. + + * input/no-notation/midi-tuplets.ly: move from input/test/, idem + for midi-volume-equaliser + + * + +m2003-07-15 Han-Wen Nienhuys + * scm/output-ps.scm (lily-traced-cm-fonts): substitution for lily cm fonts. diff --git a/VERSION b/VERSION index b572217b9c..2b2b72de36 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=7 -PATCH_LEVEL=24 +PATCH_LEVEL=25 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/config.make.in b/config.make.in index 35f1fad435..c13d6e9160 100644 --- a/config.make.in +++ b/config.make.in @@ -74,8 +74,6 @@ DEFINES = @DEFS@ @DEFINES@ DOTEXE = @DOTEXE@ INSTALL = @INSTALL@ BASH = @BASH@ -BIBTEX2HTML=@BIBTEX2HTML@ -BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ @@ -97,6 +95,5 @@ MFTRACE = @MFTRACE@ PYTHON = @PYTHON@ SHELL = @SHELL@ TAR = @TAR@ -TBL = @TBL@ -TROFF = @TROFF@ +YACC = @YACC@ ZIP = @ZIP@ diff --git a/input/test/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly similarity index 89% rename from input/test/midi-tuplets.ly rename to input/no-notation/midi-tuplets.ly index 852ac62488..dd2d0e2bde 100644 --- a/input/test/midi-tuplets.ly +++ b/input/no-notation/midi-tuplets.ly @@ -1,5 +1,4 @@ \version "1.7.18" -% candidate for regression. -gp \header { texidoc = " @@ -18,7 +17,7 @@ Midi2ly tuplet test. \score { - \context Voice \notes { + \context Voice \notes \relative c' { a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64 diff --git a/input/test/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly similarity index 100% rename from input/test/midi-volume-equaliser.ly rename to input/no-notation/midi-volume-equaliser.ly diff --git a/input/test/ossia.ly b/input/test/ossia.ly index dc42a5288e..9af2e55631 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -7,7 +7,7 @@ really supported, but can be somewhat faked in lily. " } \score { -\notes { c1 c1 < +\notes\relative c'' { c1 c1 < {\clef "treble" c1 c1 } \context Staff = stb { c1 c1 } > diff --git a/input/test/poly-metric.ly b/input/test/poly-metric.ly index 234f809f14..0b4124a792 100644 --- a/input/test/poly-metric.ly +++ b/input/test/poly-metric.ly @@ -6,7 +6,7 @@ by moving the timing engraver to staff context. " \score { - \notes + \notes\relative c' < \context Staff = SA { diff --git a/input/test/stacked-scripts.ly b/input/test/script-stack.ly similarity index 91% rename from input/test/stacked-scripts.ly rename to input/test/script-stack.ly index 074d5d84e9..485f8238d9 100644 --- a/input/test/stacked-scripts.ly +++ b/input/test/script-stack.ly @@ -5,7 +5,7 @@ You can stack text and articulations. " } \score { - \notes { + \notes\relative c' { c2_"geen gedonder"_"jij gaat onder" c2^^^.^|^"down"^"up" } diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly deleted file mode 100644 index b63bbe41a3..0000000000 --- a/input/test/span-bars.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "1.7.18" - -\header { texidoc = "I really don't understand this one. DELETE or REGRESSION? -gp " } - -nt = \notes { c1 \break c1 c1 } -stuff = \notes \relative c'' < - \context Staff = stone { \nt } - \context Staff = sttwo { \nt } -> - -\score{ - \context StaffGroup \stuff -} - -\score{ - \context StaffGroup < \context GrandStaff \stuff - \context Staff = stthree \nt - > -} - -\score{ - \context ChoirStaff \stuff -} - - - diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly index 742acc3bf1..b19d37faee 100644 --- a/input/test/spanner-after-break-tweak.ly +++ b/input/test/spanner-after-break-tweak.ly @@ -24,7 +24,7 @@ after the line break is moved around. " #(debug-enable 'backtrace) -\score {\notes { +\score {\notes \relative c'' { \property Voice.Tie \override #'after-line-breaking-callback = #my-callback c1\break ~ c2 ~ c diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 4f568bb8e0..fe8d1a9f8c 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -24,6 +24,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) ## ## Assume, and hunt for, dotted version multiplet. + changequote(<<, >>)dnl "$1" --version 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \ sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' @@ -386,7 +387,6 @@ AC_DEFUN(STEPMAKE_GCC, [ fi ]) - AC_DEFUN(STEPMAKE_GETTEXT, [ presome=${prefix} if test "$prefix" = "NONE"; then -- 2.39.2