From: hanwen Date: Tue, 15 Jul 2003 13:19:55 +0000 (+0000) Subject: * input/test/script-stack.ly: change name from stacked-scripts X-Git-Tag: release/1.7.25~24 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=32ec4235eb1894397d7fbc72c8c313bd9085bfb2;p=lilypond.git * 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 --- 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/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly new file mode 100644 index 0000000000..dd2d0e2bde --- /dev/null +++ b/input/no-notation/midi-tuplets.ly @@ -0,0 +1,35 @@ +\version "1.7.18" +\header { +texidoc = " + +Midi2ly tuplet test. + +@example + python scripts/midi2ly.py --duration-quant=32 \ + --allow-tuplet=4*2/3 \ + --allow-tuplet=8*2/3 \ + --allow-tuplet=4*3/5 \ + --allow-tuplet=8*3/5 \ + tu.midi +@end example +" +} + + +\score { + \context Voice \notes \relative c' { + + a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64 + + \times 2/3 { b4 b4 b4 } + \times 3/5 { b4 b4 b4 b4 b4 } + + \times 2/3 { c8 c8 c8 } + \times 3/5 { c8 c8 c8 c8 c8 } + + } + \paper { } + \midi { } +} + + diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly new file mode 100644 index 0000000000..87f1ff2a55 --- /dev/null +++ b/input/no-notation/midi-volume-equaliser.ly @@ -0,0 +1,143 @@ +\version "1.7.19" +\header { texidoc = "@cindex Midi Volume Equaliser +The full orchestra plays a notes, where groups stop one after +another. U se this to tune equalizer settings. " } + +flauti = \notes \relative c' { + \property Staff.midiInstrument = #"flute" + \property Staff.instrument = #"2 Flauti" + \property Staff.instr = #"Fl." + + c1 R1*10 +} + +oboi = \notes \relative c' { + \property Staff.midiInstrument = #"oboe" + \property Staff.instrument = #"2 Oboi" + \property Staff.instr = #"Ob." + + R1*1 c1 R1*9 +} + +clarinetti = \notes \relative c' { + \property Staff.midiInstrument = #"clarinet" + \property Staff.instrument = #"Clarinetti" + \property Staff.instr = #"Cl" + + R1*2 c1 R1*8 +} + +fagotti = \notes \relative c' { + \property Staff.midiInstrument = #"bassoon" + \property Staff.instrument = #"2 Fagotti" + \property Staff.instr = #"Fg." + + \clef bass + R1*3 c1 R1*7 +} + +corni = \notes \relative c' { + \property Staff.midiInstrument = #"french horn" + \property Staff.instrument = #"Corni" + \property Staff.instr = #"Cor" + + R1*4 c1 R1*6 +} + +trombe = \notes \relative c' { + \property Staff.midiInstrument = #"trumpet" + \property Staff.instrument = #"Trombe" + \property Staff.instr = #"Tp." + + \clef bass + R1*5 c1 R1*5 +} + +timpani = \notes \relative c' { + \property Staff.midiInstrument = #"timpani" + \property Staff.instrument = #"Timpani" + \property Staff.instr = #"Timp." + + R1*6 c1 R1*4 +} + +violinoI = \notes \relative c' { + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = #"Violino I " + \property Staff.instr = #"Vl. I " + + R1*7 c1 R1*3 +} + +violinoII = \notes \relative c' { + \property Staff.midiInstrument = #"violin" + \property Staff.instrument = #"Violino II " + \property Staff.instr = #"Vl. II " + + R1*8 c1 R1*2 +} + +viola = \notes \relative c' { + \property Staff.midiInstrument = #"viola" + \property Staff.instrument = #"Viola" + \property Staff.instr = #"Vla." + + \clef alto + R1*9 c1 R1*1 +} + +violoncello = \notes \relative c' { + \property Staff.midiInstrument = #"cello" + %\property Staff.midiInstrument = #"contrabass" + \property Staff.instrument = #"Violoncello" + \property Staff.instr = #"Vc." + + \clef bass + R1*10 c1 +} + + +\score { + < + \context StaffGroup ="legni" < + \context Staff ="flauti" \flauti + \context Staff ="oboi" \oboi + \context Staff ="clarinetti" \clarinetti + \context Staff ="fagotti" \fagotti + > + \context StaffGroup ="ottoni" < + \context Staff ="corni" \corni + \context Staff ="trombe" \trombe + > + \context StaffGroup ="timpani" < + \context Staff ="timpani" \timpani + { + \skip 1 + % Hmm: this forces a staff-bracket, that's good! + % However, I can't find where is decided on staff-bracket yes/no + } + > + \context StaffGroup ="archi" < + \context GrandStaff ="violini" < + \context Staff ="violino1" \violinoI + \context Staff ="violino2" \violinoII + > + \context Staff ="viola" \viola + \context Staff ="violoncello" \violoncello + > + > + + \paper { + \paperSixteen + indent=100.0\mm + linewidth=150.0\mm + \translator { + \RemoveEmptyStaffContext + } + } + \midi { + \tempo 1 = 60 + } +} + + diff --git a/input/test/midi-tuplets.ly b/input/test/midi-tuplets.ly deleted file mode 100644 index 852ac62488..0000000000 --- a/input/test/midi-tuplets.ly +++ /dev/null @@ -1,36 +0,0 @@ -\version "1.7.18" -% candidate for regression. -gp -\header { -texidoc = " - -Midi2ly tuplet test. - -@example - python scripts/midi2ly.py --duration-quant=32 \ - --allow-tuplet=4*2/3 \ - --allow-tuplet=8*2/3 \ - --allow-tuplet=4*3/5 \ - --allow-tuplet=8*3/5 \ - tu.midi -@end example -" -} - - -\score { - \context Voice \notes { - - a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64 - - \times 2/3 { b4 b4 b4 } - \times 3/5 { b4 b4 b4 b4 b4 } - - \times 2/3 { c8 c8 c8 } - \times 3/5 { c8 c8 c8 c8 c8 } - - } - \paper { } - \midi { } -} - - diff --git a/input/test/midi-volume-equaliser.ly b/input/test/midi-volume-equaliser.ly deleted file mode 100644 index 87f1ff2a55..0000000000 --- a/input/test/midi-volume-equaliser.ly +++ /dev/null @@ -1,143 +0,0 @@ -\version "1.7.19" -\header { texidoc = "@cindex Midi Volume Equaliser -The full orchestra plays a notes, where groups stop one after -another. U se this to tune equalizer settings. " } - -flauti = \notes \relative c' { - \property Staff.midiInstrument = #"flute" - \property Staff.instrument = #"2 Flauti" - \property Staff.instr = #"Fl." - - c1 R1*10 -} - -oboi = \notes \relative c' { - \property Staff.midiInstrument = #"oboe" - \property Staff.instrument = #"2 Oboi" - \property Staff.instr = #"Ob." - - R1*1 c1 R1*9 -} - -clarinetti = \notes \relative c' { - \property Staff.midiInstrument = #"clarinet" - \property Staff.instrument = #"Clarinetti" - \property Staff.instr = #"Cl" - - R1*2 c1 R1*8 -} - -fagotti = \notes \relative c' { - \property Staff.midiInstrument = #"bassoon" - \property Staff.instrument = #"2 Fagotti" - \property Staff.instr = #"Fg." - - \clef bass - R1*3 c1 R1*7 -} - -corni = \notes \relative c' { - \property Staff.midiInstrument = #"french horn" - \property Staff.instrument = #"Corni" - \property Staff.instr = #"Cor" - - R1*4 c1 R1*6 -} - -trombe = \notes \relative c' { - \property Staff.midiInstrument = #"trumpet" - \property Staff.instrument = #"Trombe" - \property Staff.instr = #"Tp." - - \clef bass - R1*5 c1 R1*5 -} - -timpani = \notes \relative c' { - \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #"Timpani" - \property Staff.instr = #"Timp." - - R1*6 c1 R1*4 -} - -violinoI = \notes \relative c' { - \property Staff.midiInstrument = #"violin" - \property Staff.instrument = #"Violino I " - \property Staff.instr = #"Vl. I " - - R1*7 c1 R1*3 -} - -violinoII = \notes \relative c' { - \property Staff.midiInstrument = #"violin" - \property Staff.instrument = #"Violino II " - \property Staff.instr = #"Vl. II " - - R1*8 c1 R1*2 -} - -viola = \notes \relative c' { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \clef alto - R1*9 c1 R1*1 -} - -violoncello = \notes \relative c' { - \property Staff.midiInstrument = #"cello" - %\property Staff.midiInstrument = #"contrabass" - \property Staff.instrument = #"Violoncello" - \property Staff.instr = #"Vc." - - \clef bass - R1*10 c1 -} - - -\score { - < - \context StaffGroup ="legni" < - \context Staff ="flauti" \flauti - \context Staff ="oboi" \oboi - \context Staff ="clarinetti" \clarinetti - \context Staff ="fagotti" \fagotti - > - \context StaffGroup ="ottoni" < - \context Staff ="corni" \corni - \context Staff ="trombe" \trombe - > - \context StaffGroup ="timpani" < - \context Staff ="timpani" \timpani - { - \skip 1 - % Hmm: this forces a staff-bracket, that's good! - % However, I can't find where is decided on staff-bracket yes/no - } - > - \context StaffGroup ="archi" < - \context GrandStaff ="violini" < - \context Staff ="violino1" \violinoI - \context Staff ="violino2" \violinoII - > - \context Staff ="viola" \viola - \context Staff ="violoncello" \violoncello - > - > - - \paper { - \paperSixteen - indent=100.0\mm - linewidth=150.0\mm - \translator { - \RemoveEmptyStaffContext - } - } - \midi { - \tempo 1 = 60 - } -} - - 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/script-stack.ly b/input/test/script-stack.ly new file mode 100644 index 0000000000..485f8238d9 --- /dev/null +++ b/input/test/script-stack.ly @@ -0,0 +1,14 @@ +\version "1.7.18" + +\header { texidoc = "@cindex Stacked Text Articulation +You can stack text and articulations. " +} + +\score { + \notes\relative c' { + c2_"geen gedonder"_"jij gaat onder" + c2^^^.^|^"down"^"up" + } + \paper { raggedright = ##t} +} + 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/input/test/stacked-scripts.ly b/input/test/stacked-scripts.ly deleted file mode 100644 index 074d5d84e9..0000000000 --- a/input/test/stacked-scripts.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "1.7.18" - -\header { texidoc = "@cindex Stacked Text Articulation -You can stack text and articulations. " -} - -\score { - \notes { - c2_"geen gedonder"_"jij gaat onder" - c2^^^.^|^"down"^"up" - } - \paper { raggedright = ##t} -} - 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