From b7dab8894e4bf130908d2f5cd1a9ec6f12b133cb Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:30:21 +0000 Subject: [PATCH] lilypond-0.0.27 --- NEWS | 26 ++++++++++ Variables.make | 14 ++++-- input/cadenza.ly | 29 +++++------ input/kortjakje.ly | 4 +- input/maartje.ly | 4 +- input/martien.ly | 110 +++++++++++++++++++++++++++++++++++++++++ input/pavane.ly | 6 +-- input/standchen.ly | 75 ++++++++++++++++++---------- input/twinkle.ly | 8 ++- input/wohltemperirt.ly | 65 ++++++++++++++++++++++++ 10 files changed, 281 insertions(+), 60 deletions(-) create mode 100644 input/martien.ly create mode 100644 input/wohltemperirt.ly diff --git a/NEWS b/NEWS index 1ed9d91e5f..3362d4ffa6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,29 @@ +pl 27 + - preliminary WIN32 support (JN) +Features + - errors converted to warnings (JN) + - context errors (JN) + - As vs. as notename. + - WARNING: "melodic" stafftype will create the new Complex_staff! +Examples + - Lohman's Viola Quartet (JN) + - JS Bach Solo Cello suite II menuet (JN) + + +pl pre27 + +Features + - option --init + - last_duration_mode: default_duration is last duration entered + (\duration{\last}) + - syntax: grouping 2*4 3*8 + - preliminary multivoice support +Examples + - JS Bach's WTK example added. + +Internal: + - Text_reg and Script_reg + pl 26 - Documentation/lelie_logo.png - 8-bit chars for input (see ltest.tex) (MB) diff --git a/Variables.make b/Variables.make index e71edf9753..39719441bf 100644 --- a/Variables.make +++ b/Variables.make @@ -6,6 +6,9 @@ OPTIFLAG=-DNDEBUG -DNPRINT -O2 DEBUGFLAG=-g +# uncomment for windhoos +# CXX=g++ + # turn off -pipe if linker doesn't support it EXTRACXXFLAGS=-pipe -Wall -W -Wmissing-prototypes @@ -37,7 +40,7 @@ endif # version info MAJVER=0 MINVER=0 -PATCHLEVEL=26 +PATCHLEVEL=27 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL) CXXVER=`$(CXX) --version` @@ -59,14 +62,15 @@ INPUTDIR=input # # include Sources.make -progdocs=$(hdr) $(mycc) gencc=parser.cc lexer.cc cc=$(mycc) $(gencc) CCSOURCE=$(addprefix $(CCDIR)/, $(cc)) obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) ALLDEPS=$(addprefix $(DEPDIR)/,$(cc:.cc=.dep)) - +STABLEOBS=$(addprefix $(OBJECTDIR)/,$(stablecc:.cc=.o)) +HEADERS=$(addprefix $(HEADERDIR)/,$(hdr)) +progdocs=$(HEADERS) $(addprefix $(CCDIR)/, $(mycc)) #dist .EXPORT_ALL_VARIABLES: @@ -81,12 +85,12 @@ SCRIPTS=make_version make_patch genheader clearlily MAKFILES=Makefile Variables.make Sources.make Initial.make Generate.make \ configure OFILES=COPYING README NEWS TODO -IFILES= standchen.tex titledefs.tex pavane.tex lilyponddefs.tex \ +IFILES= titledefs.tex lilyponddefs.tex \ ltest.tex test.tex .dstreamrc dimen.tex DFILES=$(MAKFILES) $(OFILES) $(IFILES) $(SCRIPTS) #compiling -LOADLIBES=-L$(FLOWERDIR) -lflower $(EXTRALIB) +LOADLIBES=-L$(FLOWERDIR) -lflower $(EXTRALIB) -lg++ FLOWERDIR=../flower CXXFLAGS=$(DEFINES) -I$(HEADERDIR) -I$(FLOWERDIR) $(EXTRACXXFLAGS) diff --git a/input/cadenza.ly b/input/cadenza.ly index 1ca8ba54a5..3f32d19de3 100644 --- a/input/cadenza.ly +++ b/input/cadenza.ly @@ -6,26 +6,28 @@ cad = music { $ \duration { 8} - \textstyle "italic" + \textstyle "italic" + \command { \clef \violin } 'c4._"f" g8 \textstyle "roman" - ['e^"accel" ()'d 'c b] + + ['e^"accel" ()'d 'c b] [b()'c] g-\fermata - \mark"br1" + \command { \bar \empty } c [c_"rubato" e g 'c] \octave{'} e4. e [g ()f_"rit" e d] \duration{16} dis4()e4 - \mark"br2" + \command { \bar \empty } r8 [c d] [e f g gis] \duration{4} a-> `f()`e g f-> `d()`cis e \duration{8} d4^\fermata - \mark"br3" + \command { \bar \empty } r8 `a [`b cis] \duration{16} [d cis d e] @@ -34,10 +36,10 @@ cad = music { $ \octave{} \plet{2/3} ['d8 'c8 a8] \plet{1/1} g2 - \mark "br4" + \command { \bar \empty } [g c e g] ['c e g 'c]\octave{'} [e `g c e] g4^\fermata %()% BUG! - \mark "br5" + \command { \bar \empty } [g8.(_"a tempo" e g8. )e] a4. g8 [f8 e8 d8 c8] `g2 d2^"tr" @@ -47,20 +49,11 @@ cad = music { $ score { staff { melodic music { cad } + } commands { meter 4*4 cadenza 1 - grouping 1 - goto "br1" - bar "empty" - goto "br2" - bar "empty" - goto "br3" - bar "empty" - goto "br4" - bar "empty" - goto "br5" - bar "empty" + grouping 1*4 } } diff --git a/input/kortjakje.ly b/input/kortjakje.ly index bfcfebaeb0..ba78402109 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -4,7 +4,9 @@ % for lyrics, see twinkle.ly % the % is a comment. - +% +% copyright: None +% % declare music (which will be in *one* staff ) for the lead voice melodie = music { diff --git a/input/maartje.ly b/input/maartje.ly index 1a7925955f..aad85a0fc6 100644 --- a/input/maartje.ly +++ b/input/maartje.ly @@ -23,8 +23,8 @@ ritme = staff { } melody= -staff { melodic -% complex +staff { + melodic music{$ c8 |r4 r4 r4 r4 diff --git a/input/martien.ly b/input/martien.ly new file mode 100644 index 0000000000..b299340b3a --- /dev/null +++ b/input/martien.ly @@ -0,0 +1,110 @@ +% martien.ly +% +% Viola Quartet +% Martien Lohman (194x-????) +% +% quite alive at the time of writing; +% copyright by ml +% +% lilypond: src/stem.cc:42: void Stem::set_stemend(double): Assertion `(dir > 0 && se >= maxnote) || (se <= minnote && dir <0)' failed. +% +% The purpose of this file is to demonstrate features of LilyPond; +% respect the copyright. +% +% \barnumbering5 +% \barnumberstyle\boxed + +include "mlalt.ly" +include "mlvio1.ly" +include "mlvio2.ly" +include "mlcello.ly" + +score { + staff { + melodic + music { alto } + commands { +% meter 2*4 + clef "alto" + key $fis$ + skip 56:0 + key $bes es as$ + skip 8:0 +% meter 6*8 + skip 8:0 +% meter 2*4 + skip 16:0 + key $fis$ + } + } + staff { + melodic + music { violin1 } + commands { +% meter 2*4 + clef "violin" + key $fis$ + skip 56:0 + key $bes es as$ + skip 8:0 +% meter 6*8 + skip 8:0 +% meter 2*4 + skip 16:0 + key $fis$ + } + } + staff { + melodic + music { violin2 } + commands { +% meter 2*4 + clef "violin" + key $fis$ + skip 56:0 + key $bes es as$ + skip 8:0 +% meter 6*8 + skip 8:0 +% meter 2*4 + skip 16:0 + key $fis$ + } + } + staff { + melodic + music { cello } + commands { +% meter 2*4 + clef "bass" + key $fis$ + skip 56:0 + key $bes es as$ + skip 8:0 +% meter 6*8 + skip 8:0 +% meter 2*4 + skip 16:0 + key $fis$ + } + } + commands { + meter 2*4 + skip 56:0 + bar "||" + skip 8:0 + meter 6*8 + bar "||" + skip 8:0 + meter 2*4 + bar "||" + skip 16:0 + bar "||" + } + paper { +% unitspace 16mm + unitspace 24mm + width 195mm + output "martien.out" + } +} diff --git a/input/pavane.ly b/input/pavane.ly index 01d6545e64..e3b1e50e06 100644 --- a/input/pavane.ly +++ b/input/pavane.ly @@ -12,11 +12,10 @@ horn = staff { -% melodic - complex + melodic music{ $ \octave { ' } - \duration { 8} + \duration { 8 } % 1 d2(( [)d e cis `b] | @@ -118,7 +117,6 @@ score { bar "|:" skip 10:0 bar ":|" - meter 4* 4 skip 13:0 bar "||" } diff --git a/input/standchen.ly b/input/standchen.ly index 81ef61d6b6..87c317b403 100644 --- a/input/standchen.ly +++ b/input/standchen.ly @@ -1,5 +1,13 @@ -% st\"andchen.lily -% Franz Schubert (? - ?) +% standchen.ly +% +% St\"andchen (Serenade) "Leise flehen meine Lieder" D.957 No.4 +% Franz Schubert (1797-1828) +% Text by Ludwig Rellstab (1799-1860) +% +% Copyright (c) 1995,1996,1997 Jan Nieuwenhuizen +% +% The purpose of this file is to demonstrate features of LilyPond. +% (there is an accompanying LaTeX file, standchen.tex) % % comments with # note missing stuff % heu, make that %#% @@ -8,16 +16,15 @@ %% LilyPond's naive idealspacing calc. %% -% %#%% %#%\title{St\"andchen} %#%\subtitle{Serenade} %#%% -%#%\composer{`franz Schubert} +%#%\composer{Franz Schubert} %#%\tempo{M\"a\ss ig} %#%% %#%\meter{3/4} -%#%\key\`f +%#%\key\F %#%\clef\treble %#%% %#%\barnumbering5 @@ -30,11 +37,14 @@ %%1 melodie = music { $ \duration{ 8 } - r_"pp" { [ d `a-| } f-| { d `a-| } f-| { d `a-| ] } +% r_"\pp" { [ d `a-| } f-| { d `a-| } f-| { d `a-| ] } + r { [ d `a-|_"\pp" } f-| { d `a-| } f-| { d `a-| ] } %%2 r { [ d `bes-| } f-| { d `bes-| } f-| { d `bes-| ] } %%3 + \textstyle "italic" r_"simile" { [ d `bes } e { d `bes } e { d `bes ] } + \textstyle "roman" %%4 r { [ `a cis } e { `a cis } e { `a cis ] } %#%:| @@ -51,18 +61,18 @@ melodie = music { $ %%9 %#% { 'a4.( 'cis4.\stemdown_p } { ) 'g 'e_{dolce} } %#% { 'g( 'e } 'f ) 'e - 'a4.( )g \plet{ 2/3 } { 'g 'e } { 'f } { 'e } \plet{ 1/1 } + 'a4.( )'g \plet{ 2/3 } { 'g 'e } { 'f } { 'e } \plet{ 1/1 } %%10 { 'f2. 'd2. } %%11 - \plet { 2/3 } [ a_"pp"( )bes a ] \plet { 1/1 } 'f4. a + \plet { 2/3 } [ a_"\pp"( )bes a ] \plet { 1/1 } 'f4. a %%12 \plet { 2/3 } [ g( ) a g ] \plet { 1/1 } 'e4. 'd %%13 'c4. bes \plet { 2/3 } [ bes( ) a g ] \plet { 1/1 } %%14 %#% a2 r { 'd(^ f_p(v } - a2 r { 'd f_"p" } + a2 r { 'd f_"\p" } %%15 %#% { ) e4. ) 'c4.\stemup_{dolce} } { bes g } { e4. 'c4._"dolce" } { bes g } @@ -70,12 +80,14 @@ melodie = music { $ %%16 { a2. f2. } %%17 + \textstyle "italic" [ a8._"cresc." 'cis16 ] 'f4. 'e + \textstyle "roman" %%18 [ 'd8. a16 ] f4. d %%19 %#% 'c\grace\stemup - \plet { 2/3 } [ bes_"pp"( ) a bes ] \plet { 1/1 } 'd4. bes + \plet { 2/3 } [ bes_"\pp"( ) a bes ] \plet { 1/1 } 'd4. bes %%20 a2. %%21 @@ -85,23 +97,23 @@ melodie = music { $ %#% =f2. f2. %%23 - [ a8._"mf" 'cis16 ] 'f4. 'e + [ a8._"\mf" 'cis16 ] 'f4. 'e %%24 [ 'd8. a16 ] fis4. d %%25 %#% 'cis\grace\stemup - \plet { 2/3 } [ b_"mf"( ) ais b ] \plet { 1/1 } 'd4. b + \plet { 2/3 } [ b_"\mf"( ) ais b ] \plet { 1/1 } 'd4. b %%26 { a2. fis2. } %#%\tighten\newline %%27 - \plet { 2/3 } [ 'e_"f"( )'dis 'e ] \plet { 1/1 } 'g4. 'cis + \plet { 2/3 } [ 'e_"\f"( )'dis 'e ] \plet { 1/1 } 'g4. 'cis %%28 { 'd2. fis2. } %#%\volta1 %%29 %#% { bes2(^++++ g2_{mf} } - { bes2 g2_"mf" } + { bes2 g2_"\mf" } %#% [v { 'd8.( bes8. } { bes16 ) )++ g16 } ] { [ 'd8. bes8. } { bes16 g16 ] } %%30 @@ -113,7 +125,7 @@ melodie = music { $ %#% [ { a cis_.( } { a e_. } { a )- g_. } ] { [ a cis_. } { a e_. } { a g_. ] } %%32 - { a2 fis2_"pp" } { a4 fis4 } + { a2 fis2_"\pp" } { a4 fis4 } %%33 %#% { b2(^ g2 } [v { 'd8.( b8. } { b16 ) ) g16 } ] { b2( g2 } { [ 'd8. b8. } { b16 g16 ] } @@ -138,36 +150,37 @@ melodie = music { $ 'cis2 r4 %%41 %#% { > 'fis4. 'cis4._f } 'e [ 'e( ) 'd >! 'cis ] \plet { 1/1 } - { 'fis4. 'cis4._"f" } 'e \plet { 2/3 } [ 'e( )'d 'cis ] \plet { 1/1 } + { 'fis4. 'cis4._"\f" } 'e \plet { 2/3 } [ 'e( )'d 'cis ] \plet { 1/1 } %%42 [ b8. 'cis16 ] 'd4^> b r %%43 %#% [^ { b8._{ }_{ }_{ }_{ }_{ }_f g2. } 'cis16 ] 'd4^> b r - [ b8._"f" 'cis16 ] 'd4^> b r + [ b8._"\f" 'cis16 ] 'd4^> b r %%44 %#% [^ { > b8. fis2 } 'cis16 ] 'd4^> b >! r -% typo? [ b8. 'cis16 ] 'd4^> b r %%45 %#% 'cis\grace\stemup - \plet { 2/3 } [ b_"p"( )ais b ] \plet { 1/1 } 'd4. b + \plet { 2/3 } [ b_"\p"( )ais b ] \plet { 1/1 } 'd4. b %%46 %#% { =a2. fis2. } { a2. fis2. } %%47 - \plet { 2/3 } [ 'e_"f"( )'dis 'e ] \plet { 1/1 } 'g4.^> 'cis + \plet { 2/3 } [ 'e_"\f"( )'dis 'e ] \plet { 1/1 } 'g4.^> 'cis %%48 %#% { fis2.(v ='d2.\stemup(^ } { fis2. 'd2. } %%49 %#% { ) 'd4 ) =f2._> } { r4 s4_{decr} } 'd4\stemup + \textstyle "italic" 'd4 r4_"decresc." 'd4 + \textstyle "roman" %%50 { bes2. e2. } %%51 { a2. cis2. } %%52 - { fis2 d2 } { a4 f4_"pp" } + { fis2 d2 } { a4 f4_"\pp" } %%53 %#% { bes2 g2 } [ { 'd8.^>( bes8. } { ) bes16 g16 } ] { bes2 g2 } { [ 'd8.^> bes8. } { bes16 g16 ] } @@ -178,7 +191,9 @@ melodie = music { $ %#% { a4. g4. } [ { a cis_.( } { a e_. } { a )- g_. } ] { a4. g4. } { [ a cis_. } { a e_. } { a g_. ] } %%56 + \textstyle "italic" { a2. fis2._"dim." } + \textstyle "roman" %%57 { a2. fis2. } %%58 @@ -482,10 +497,11 @@ score { output "standchen.uit" unitspace 2.4 cm % unitspace 4.0 cm % leaves all text stand free -geometric 1.4 + geometric 1.4 } staff { - melodic music { melodie } + melodic + music { melodie } commands { key $bes$ clef "violin" @@ -497,7 +513,8 @@ geometric 1.4 music { tekst2 } } staff { - melodic music { begeleiding } + melodic + music { begeleiding } commands { key $bes$ clef "bass" @@ -510,6 +527,14 @@ geometric 1.4 skip 32:0 bar ":|" skip 22:0 - bar "||" + bar "||" + } + paper { + symboltables { table_sixteen } + width 195mm + unitspace 20mm +% unitspace 4.0 cm % leaves all text stand free +% geometric 1.4 + output "standchen.out" } } diff --git a/input/twinkle.ly b/input/twinkle.ly index 8664faed17..80b8be6eee 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -2,7 +2,7 @@ % "Altijd is Kortjakje ziek" % "Twinkle twinkle little star" % - +% Copyright: none melodie = music { $ @@ -104,15 +104,13 @@ text3 = music { } mstaf = staff { -% melodic - complex + melodic music { melodie } commands { clef "violin" } } bass_staf = staff { -% melodic - complex + melodic music { begeleiding } commands { clef "bass" } } diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly new file mode 100644 index 0000000000..aac7654458 --- /dev/null +++ b/input/wohltemperirt.ly @@ -0,0 +1,65 @@ +% JS Bach, Das Wohltemperirtes Clavier I, Fuga II (c-minor) +% +% a 7 bar fragment +% +% Public Domain -- by HWN +% + +dux = music { $ + \duration { \last } + \stem{-1} r8 ['c16 b] ['c8 g] [as 'c16 b] ['c8 'd] | + [g 'c16 b] ['c8 'd] [f16 g] as4 [g16 f] | + [es 'c b a] [ g f es d] [c8 'es 'd 'c] | + [bes a bes 'c] [fis g a fis] | + g4 r16 [c d es] [f g as8(] [)as16 d es f ]| + [g a bes8(] [)bes16 es f g ] [as g f es] [d8 'c16 b]| + 'c4 r4 r8 ['f 'es 'd] | + r8 [as g f] [g f16 es] [f8 d] | +$} + +comes = music { $ + r1 r1 + \stem{1} + \octave {'} + r8 [g16 fis] [g8 c] [es g16 f] [g8 a]| + [d8 g16 fis] [g8 a] [c16 d] es4 [d16 c] | + [`bes8 es16 d] [es8 `g8] [`as f16 es] [f8 `a] | + [`bes8 g16 f] [g8 `b] [c8 d16 es] f4( | + [) f8 es16 d] [c16 `bes `as `g] [`f8 as g f] | + [es d es f] [`b c d `b] | + +$} + +bassdux = music { $ + r1 r1 r1 r1 r1 r1 + \stem{1} \octave { } + r8 [c16 B] [c8 G] [As c16 Bes] [c8 d] | + [G c16 B] [c8 d] [F16 G] As4 [G16 F] | $ +} + +% will make it look even uglier +basstaf = staff { melodic + music { bassdux } + commands { + clef bass + key $bes es as$ + } +} + +score { + staff { melodic + music { dux } + music { comes } + + commands { + key $bes es as$ + } + } + commands { + meter 4*4 + skip 8:0 + } + paper { unitspace 2.5cm + geometric 1.1 + } +} \ No newline at end of file -- 2.39.5