From 8c6a58780bc655df8aaae671e7927e9f98288b6e Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:03:55 +0000 Subject: [PATCH] lilypond-1.5.19 --- CHANGES | 37 ++++++ input/bugs/RondoAllaTurca.ly | 225 +++++++++++++++++++++++++++++++++++ input/paddy.abc | 59 +++------ make/mutopia-targets.make | 4 +- make/mutopia-vars.make | 7 +- scripts/lilypond-book.py | 2 +- 6 files changed, 282 insertions(+), 52 deletions(-) create mode 100644 input/bugs/RondoAllaTurca.ly diff --git a/CHANGES b/CHANGES index 032bb58916..e9710f65b3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,40 @@ +1.5.18.jcn1 +=========== + +* Moved python modules to ./python. + +* Better python module stepmake support. + +* Bugfix ly2dvi etc: LILYPONDPREFIX should override datadir. + +1.5.18.hwn2 +=========== + +* Put lilylib back into ly2dvi + +* Cache symbols for {get,set}_{grob,music}_property and +{get,set}_property. Speedup: about 20 percent. + +* Remove C++ version of midi2ly + +* Inline Grob::parent_l (Axis), String::String() speedup 2 % + +* First try at Sketch (sketch.sourceforge.net) output. + + +1.5.18.rz1 +========== + +* subdivideBeams fix - setting property right after beam definition no + longer affects that beam. + +* Minor docu updates, accidental cleanups and example updates + +* Added Accidental grob properties paren-cautionaries and + cautionary-size controlling the appearance of cautionary accidentals + +1.5.18 +====== 1.5.17.jcn6 - aka: `pgwit! Ah, dacht dat-i zo wel aardig was.' =========== diff --git a/input/bugs/RondoAllaTurca.ly b/input/bugs/RondoAllaTurca.ly new file mode 100644 index 0000000000..2e0299e49d --- /dev/null +++ b/input/bugs/RondoAllaTurca.ly @@ -0,0 +1,225 @@ +\include "paper20.ly" +\version "1.4.7" +\header { + title = "Rondo Alla Turca" + subtitle = "Turkish March" + composer = "W. A. Mozart" + piece = "\\quad \\quad \\quad \\quad \\quad Allegretto" + mutopiatitle = "Rondo Alla Turca" + mutopiacomposer = "W. A. Mozart (1756-1791)" + mutopiainstrument = "Piano" + style = "classical" + copyright = "Public Domain" + maintainer = "Rune Zedeler" + maintainerEmail = "rz@daimi.au.dk" + lastupdated = "2001/sep/15" + tagline = "\\parbox{\hsize}{\\thefooter\\quad\\small \\\\This music is part of the Mutopia project, \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset and placed in the public domain by " + \maintainer + " (" + \maintainerEmail + ").\\\\Unrestricted modification and redistribution is permitted and encouraged---copy this music and share it!}" +} + +volta = "volta" + +\include "deutsch.ly"; + +#(define (remove-scripts music) + (let* ((es (ly-get-mus-property music 'elements)) + (e (ly-get-mus-property music 'element)) + (body (ly-get-mus-property music 'body)) + (alts (ly-get-mus-property music 'alternatives))) + + (if (pair? es) + (begin + (ly-set-mus-property + music 'elements + (map (lambda (x) (remove-scripts x)) es)) + (let recurse ((elts (ly-get-mus-property music 'elements))) + (if (and (pair? elts) (pair? (cdr elts))) + (let ((name (ly-music-name (cadr elts)))) + (if (or (equal? name "Articulation_req") (equal? name "Text_script_req")) + (begin + (set-cdr! elts (cddr elts)) + (recurse elts)) + (recurse (cdr elts)))))))) + + (if (music? alts) + (ly-set-mus-property + music 'alternatives + (remove-scripts alts))) + + (if (music? body) + (ly-set-mus-property + music 'body + (remove-scripts body))) + + (if (music? e) + (ly-set-mus-property + music 'element + (remove-scripts e))) + music)) + +righta = \notes \transpose c''' { + \scriptUp + \property Staff.Fingering \override #'direction = #1 + \partial 4 h,16-4-\p( a, gis, a,-1 | )c8-3 r d16-4( c h, c-1 | )e8-3 r f16-4( e dis e-1 | h-4 a gis a h a gis a | )c'4-\accent + a8-.-3 c'-.-5 | \grace {[g!32( )a]} h8-.-5-\sfz | \grace {[g32( )a]} h8-.-\sfz | \grace {[g32( )a]} h8-.-\sfz e4-- +} +rightaa = \notes \transpose c''' { + \partial 4 h,16-4-\p( a, gis, a,-1 | )c8-3 r d16-4( c h, c-1 | )e8-3 r f16-4( e dis e-1 | h-4 a gis a h \< a gis a | \! )c'4-\accent + a8-.-3 h-. | c'-.-\accent \> h-. a-.-1 \! gis-.-2 a-. e-. f-.-4 d-.-2 | c4-- h,8.-2-\trill( a,32 h, | )a,4-- +} + +rightb = \notes \transpose c''' { + [ ] | a16-4( g f )e | \stemUp \stemBoth + | a16-4( g f )e | + | f16-4( e d )c | \stemUp \stemBoth + | f16( e d )c | +} + +rightca = \notes \context Voice = voicea \relative c''' { a8-.-\f h-. | cis4-\accent a8-. h-. cis-.-\accent h-. a-. gis-. | fis-. gis-. a-. h-. gis-4( )e-. +a8-. h-. | cis4-\accent a8-. h cis-.-\accent h-. a-. gis-. | fis-. h-. gis-. e-. a4 +} +rightc = \notes < \apply #remove-scripts \rightca \transpose c \rightca > +rightco = \notes \relative c'' +{ \stemDown + a16-\f( a' h, h' | cis,-\accent )cis' r8 a,16( a' h, h' cis, cis' h, h' a, a' gis, )gis' | fis,( fis' gis, gis' a, a' h, h' gis, gis' e, )e' + a,16( a' h, h' | cis,-\accent )cis' r8 a,16( a' h, h' cis, cis' h, h' a, a' gis, )gis' | fis,( fis' h, h' gis, gis' e, e' +} +rightcoa = \notes \context Voice < )a'4 a'' > + +rightd = \notes \relative c''' { + cis16-3-\p( d cis h a h a gis-3 fis-2 a gis fis | eis fis gis eis cis-2 dis eis cis-1 | fis-4 eis-1 fis gis a gis a-1 h | cis his cis his + cis d cis )h | a( h a gis-3 fis a gis fis | e fis gis e cis-2 dis e cis | dis-3 e fis dis his-1 cis dis his | )cis4 +} +righte = \notes \relative c''' { + e,16-5(-\f d! cis h! | a h cis d-1 e fis gis a | )a-\accent-4( gis fis )e e-5( d cis h | )a-1( h cis d-1 e fis gis a ais8-\accent-3 )h-.-4 + e,16-5( d cis h | a h cis d-1 e fis gis a | )a-\accent-4( gis fis )e e-5( d cis h | cis-3 e a,-1 cis-4 h d gis,-2 h | )a4-- + cis'16-3-\p( d cis h a h a gis-3 fis-2 a gis fis | eis fis gis eis cis-2 dis eis )cis-1 | fis-4( \< eis-1 fis gis a gis a-1 \! h | cis his cis his + cis his cis ais-2 | )d-4( \> cis d cis d cis d cis | d cis h a gis-2 a h \! gis | a-\p h cis fis,-2 eis fis gis eis )fis4-- +} + +strum = \notes \transpose c' { < + \context Voice = strumUp {\stemUp cis'2-\arpeggio-\accent} + \context Voice = strumDown {\stemDown < cis4-\arpeggio e a> } +> +\stemBoth +} + +rightf = \notes \transpose c''' { + < {\stemUp cis'8. cis'16} \context Voice = another {\stemDown cis4} > + \strum \strum d'16-4( )cis'-. h-. cis'-. d'( )cis'-. h-. cis' + \repeat unfold 4 { \grace{d'8( } < )cis'8-. a e> } | < {\stemUp \slurUp h4.-3()e'8-. \stemBoth} \context Voice = another > + \strum \strum d'16-4( )cis'-. h-. cis'-. d'( )cis'-. h-. cis' \grace{d'8( } < )cis'2-. a e> + \repeat unfold 4 { \grace{cis'8( } < )h8-. gis e> } + + a4-\p-- \grace {[e32()a]} cis'8.-.-4 cis'16 \repeat unfold 2 { \grace {[e32()a]} cis'2-\accent } | + d'16-4( )cis'-. h-. cis'-. d'( )cis'-. h-. cis' | d'2-\accent | \repeat unfold 4 { \grace{d'8( } ) cis'8-. } h4.-2()e'8-. + <\strum s2-\f> \strum d'16-4( )cis'-. h-. cis'-. d'( )cis'-. h-. cis' \grace{d'8( } < )cis'2-. a e> + \repeat unfold 4 { \grace{cis'8( } < )h8-. gis e> } + + <) a,4-. cis e a-. > r4 +} + + +lefta = \notes { + \partial 4 r4 | a8-5( <)c' e'-.> | a8( <)c' e'-.> | a8-. a8-. | a8( <)c' e'-.> | + e-. | e-. | e-. h, h | e4-- +} +leftaa = \notes { \partial 4 + r4 | a8-5( <)c' e'-.> | a8( <)c' e'-.> | a8-. a8-. | f8( <)a dis'-.> | + e-. d!-. c-. d-. +} +leftb = \notes { \partial 4 + \repeat unfold 2 {r4 | c8-. c'-. e-. e'-. | g4 } + \repeat unfold 2 {r4 | a,8-. a-. c-. c'-. | e4 } +} + +stra = \notes { \grace {[a,32( cis )e]} a8-. a-. } +strd = \notes { \grace {[d,32( fis, )a,]} d8-. d-. } +strdis = \notes { \grace {[dis,32( fis, )a,]} dis8-. dis-. } +stre = \notes { \grace {[e,32( gis, )h,]} e8-. e-. } +stral = \notes { \stra a8-. a-. } +strdl = \notes { \strd d8-. d-. } +strel = \notes { \stre e8-. e-. } + +leftc = \notes { \partial 4 + r4 \stral \stral \strd \strdis \strel \stral \stral \strd \stre +} + +leftd = \notes \relative c { \partial 4 + r4 | fis8-5( <)a cis-.> | + gis8-4( <)h cis-.> | + fis8( <)a cis-.> | + eis8( <)gis cis-.> | + fis8( <)a cis-.> | + gis8( <)cis e-.> | + gis8( <)dis' fis-.> | + +} + +lefte = \notes \relative c' { \partial 4 + r4 | a8( <)cis e-.> | + h-. gis,-. | + a8( <)cis e-.> | + e,8( <)gis d'-.> | + a8( <)cis e-.> | + h-. gis,-. | + a-. fis-. d-. e-. a,-. a'-. r4 | + + fis8( <)a cis-.> | + gis8( <)h cis-.> | + fis8( <)a cis-.> | + cis,( <)gis' cis-.> | + h,8( <)fis' h-.> | + h,8( <)gis'! h-.> | + cis,-. cis-. +} + +leftf = \notes { + a8-. a8-. \stral \stral \stral \strdl \stral \strel \stral \stral \stral \strdl \stral \strel + a16( e' cis' e' a e' cis' )e' \repeat unfold 6 { a16 e' cis' e' } \repeat unfold 2 { a16 fis' d' fis' } \repeat unfold 2 { a16 e' cis' e' } \repeat unfold 2 { e16 e' gis e' } + \stral \stral \stral \strdl \stral \strel \stral \stral \stral \stra \stra a,4-. < )a, cis e a-. > r4 +} + +global = \notes {\time 2/4 } + +right = \notes { + \global \clef G \repeat \volta 2 \righta \repeat \volta 2 {\rightb \rightaa } \key a \major \repeat \volta 2 \rightc + \repeat \volta 2 \rightd \repeat \volta 2 \righte \repeat \volta 2 \rightc + \key a \minor \repeat \volta 2 \righta \repeat \volta 2 {\rightb \rightaa } \key a \major \repeat \volta 2 \rightco \alternative { \rightcoa {\partial 4 \rightcoa } } + \rightf \bar "|." +} + +left = \notes { + \global \clef F \repeat \volta 2 \lefta \repeat \volta 2 { \leftb \leftaa } \key a \major \repeat \volta 2 { \leftc a,4 } + \repeat \volta 2 \leftd \repeat \volta 2 \lefte \repeat \volta 2 { \leftc a,4 } + \key a \minor \repeat \volta 2 \lefta \repeat \volta 2 { \leftb \leftaa } \key a \major \repeat \volta 2 \leftc \alternative { a,4 {\partial 2 \stra} } + \leftf \bar "|." +} + + +\score { \notes + \context GrandStaff < + \property GrandStaff.connectArpeggios = ##t + \context Staff = up { + \right + } + \context Staff = down { + \property Staff.VoltaBracket = \turnOff + \left + } + > + \paper { + \translator { + \GraceContext + Slur \override #'direction = #-1 + } + \translator { + \ScoreContext + SpacingSpanner \override #'arithmetic-basicspace = #1.8 + GraceAlignment \override #'horizontal-space = #-0.4 + PaperColumn \override #'before-grace-spacing-factor = #1.0 + + } + interscoreline = 6.0 \pt + + } +} diff --git a/input/paddy.abc b/input/paddy.abc index 1492ea2089..0aadebc63c 100644 --- a/input/paddy.abc +++ b/input/paddy.abc @@ -1,47 +1,16 @@ -\header { - composer = "Trad." - crossRefNumber = "1" - footnotes = "" - tagline = "Lily was here (unknown version) -- automatically converted from ABC" - title = "Paddy O'Rafferty" -} -voicedefault = \notes { -\property Score.defaultBarType="empty" +% +% This is NOT a lilypond input file. It is an ABC file, see +% http://www.gre.ac.uk/~c.walshaw/abc/ +% +% LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX +% +X:1 +T:Paddy O'Rafferty +C:Trad. +M:6/8 +K:D +dff cee|def gfe|dff cee|dfe dBA|dff cee|def gfe|faf gfe|1 dfe dBA:|2 dfe dcB|| +~A3 B3|gfe fdB|AFA B2c|dfe dcB|~A3 ~B3|efe efg|faf gfe|1 dfe dcB:|2 dfe dBA|| +fAA eAA|def gfe|fAA eAA|dfe dBA|fAA eAA|def gfe|faf gfe|dfe dBA:| -% This is NOT a lilypond input file. It is an ABC file, see - % http://www.gre.ac.uk/~c.walshaw/abc/ - % - % LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX - \time 6/8 \key d \major d''8 fis''8 fis''8 cis''8 e''8 e''8 -\bar "|" d''8 e''8 fis''8 g''8 fis''8 e''8 \bar "|" d''8 -fis''8 fis''8 cis''8 e''8 e''8 \bar "|" d''8 fis''8 e''8 - d''8 b'8 a'8 \bar "|" d''8 fis''8 fis''8 cis''8 e''8 -e''8 \bar "|" d''8 e''8 fis''8 g''8 fis''8 e''8 \bar "|" -fis''8 a''8 fis''8 g''8 fis''8 e''8 \bar "|" d''8 fis''8 - e''8 d''8 b'8 a'8 \bar ":|" d''8 fis''8 e''8 d''8 -cis''8 b'8 \bar "||" a'4. ^"~" b'4. \bar "|" g''8 fis''8 -e''8 fis''8 d''8 b'8 \bar "|" a'8 fis'8 a'8 b'4 cis''8 -\bar "|" d''8 fis''8 e''8 d''8 cis''8 b'8 \bar "|" a'4. -^"~" b'4. ^"~" \bar "|" e''8 fis''8 e''8 e''8 fis''8 g''8 -\bar "|" fis''8 a''8 fis''8 g''8 fis''8 e''8 \bar "|" d''8 - fis''8 e''8 d''8 cis''8 b'8 \bar ":|" d''8 fis''8 e''8 - d''8 b'8 a'8 \bar "||" fis''8 a'8 a'8 e''8 a'8 a'8 -\bar "|" d''8 e''8 fis''8 g''8 fis''8 e''8 \bar "|" fis''8 - a'8 a'8 e''8 a'8 a'8 \bar "|" d''8 fis''8 e''8 d''8 - b'8 a'8 \bar "|" fis''8 a'8 a'8 e''8 a'8 a'8 \bar "|" -d''8 e''8 fis''8 g''8 fis''8 e''8 \bar "|" fis''8 a''8 -fis''8 g''8 fis''8 e''8 \bar "|" d''8 fis''8 e''8 d''8 -b'8 a'8 \bar ":|" -}\score{ - \notes < - \context Staff="default" - { - \voicedefault - } - - > - \paper { - } - \midi {} -} diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 09168cb9cd..3504259fb5 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -10,7 +10,9 @@ include $(stepdir)/www-targets.make all: $(OUT_FILES) -local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples) +# we want dvi_examples as well, because they get thrown away otherwise +# incurring another costly lilypond run. +local-WWW: $(ly_examples) $(dvi_examples) $(ps_examples) $(png_examples) tar: mkdir -p $(outdir)/$(tarball) diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make index 0eb68b09db..2132fab757 100644 --- a/make/mutopia-vars.make +++ b/make/mutopia-vars.make @@ -11,11 +11,8 @@ LYM4_FILES = $(wildcard *.lym4) EXTRA_DIST_FILES += $(M4_FILES) $(LYM4_FILES) ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples))) -fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples))) -sly_examples=$(addprefix $(outdir)/, $(addsuffix .sly.txt, $(slexamples))) - -all_examples=$(flexamples) $(slexamples) $(examples) - +all_examples=$(examples) +dvi_examples=$(addprefix $(outdir)/, $(addsuffix .dvi, $(all_examples))) ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples))) gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples))) png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples))) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index fd5386915b..4163ec4ed2 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -43,7 +43,7 @@ import operator program_version = '@TOPLEVEL_VERSION@' if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.4pre' + program_version = '1.5.18' # # Try to cater for bad installations of LilyPond, that have -- 2.39.5