From: fred Date: Sun, 24 Mar 2002 20:11:43 +0000 (+0000) Subject: lilypond-0.1.64 X-Git-Tag: release/1.5.59~3101 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6e41b1a75ac2e32fef529153e78c33f937165197;p=lilypond.git lilypond-0.1.64 --- diff --git a/TODO b/TODO index 51b540901c..290ea68f84 100644 --- a/TODO +++ b/TODO @@ -13,7 +13,7 @@ grep for TODO and ugh/ugr/urg * notes almost touch barline: whitespace at the begin of the bar should be at fixed at at least (about) one interline. - hack at spring-spacer.cc:662 doen't work anymore + hack at spring-spacer.cc:662 doesn't work anymore * do rest-collisions for Multi_measure_rests as well. @@ -24,6 +24,8 @@ grep for TODO and ugh/ugr/urg * deps for ly2dvi + * fix .txt rules / make dist from freshly configured tar-ball + * document use of ly2dvi more prominently * deprecate \duration @@ -39,8 +41,6 @@ grep for TODO and ugh/ugr/urg * multibar rest - symbol(s) - * latex mutopia/los-toros-oboe-16.tex: max memsize - * move all hard-coded constants and staffheight dependent to runtime, i.e. init/params.ly. e.g.: stem length params, beam positions @@ -52,6 +52,10 @@ grep for TODO and ugh/ugr/urg * fix title/instrument placements; see input/test/title.ly + * <\voiceone c4. \voicetwo c4> + + * add full cello suites to web site (kom op, Maarten!) + * rename - plet -> tuplet - grav -> engraver diff --git a/make/Targets.make b/make/Targets.make index 037a6981ab..ce3ecb34e8 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -130,19 +130,22 @@ dist: # ugh. should generate in out/ dozedist: doosdist -doosdist: +doosdist: check-mf-deps + rm -rf $(distdir) -mkdir $(distdir) -# nogo, SUBDIRS is handed down to subdir... -# $(MAKE) SUBDIRS="Documentation init input tex" localdist $(MAKE) localdist chmod -Rf a+rX $(distdir) # ugh, the ugly way, then + rm -f $(distdir)/mf/$(outdir)/*.log + # urg + (cd $(distdir)/init; ln -s ../../../mf/out/*.ly .) + (cd $(distdir)/tex; ln -s ../../../mf/out/*.tex .) (cd $(distdir); rm -rf $(NO_DOOS_DIST)) ln $(lilyout)/lilypond $(distdir)/bin/lilypond.exe - strip -s $(distdir)/bin/lilypond.exe + -strip -s $(distdir)/bin/lilypond.exe ln $(mi2muout)/mi2mu $(distdir)/bin/mi2mu.exe - strip -s $(distdir)/bin/mi2mu.exe - (cd ./$(depth); $(ZIP) $(outdir)/$(DIST_NAME).exe.zip $(distdir)) + -strip -s $(distdir)/bin/mi2mu.exe + (cd ./$(depth)/$(outdir); $(ZIP) $(DIST_NAME).exe.zip $(DIST_NAME)) # should be trapped rm -rf $(distdir)/ diff --git a/mutopia/J.S.Bach/menuetto-alto.ly b/mutopia/J.S.Bach/menuetto-alto.ly index e18f00eec0..0cc2d45773 100644 --- a/mutopia/J.S.Bach/menuetto-alto.ly +++ b/mutopia/J.S.Bach/menuetto-alto.ly @@ -5,7 +5,8 @@ subtitle = "Suite II"; piece = "Menuetto I"; description = "Transcribed for Alto"; source = "?"; -opus = "BWV 1008 no. 5"; +% opus = "BWV 1008 no. 5"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/menuetto-cello.ly b/mutopia/J.S.Bach/menuetto-cello.ly index 17cc7c3f16..4252960470 100644 --- a/mutopia/J.S.Bach/menuetto-cello.ly +++ b/mutopia/J.S.Bach/menuetto-cello.ly @@ -5,6 +5,7 @@ subtitle = "Suite II"; piece = "Menuetto I"; source = "?"; % opus = "BWV 1008 no. 5"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/sarabande-alto.ly b/mutopia/J.S.Bach/sarabande-alto.ly index 7d11a7b436..f81fdbfdfa 100644 --- a/mutopia/J.S.Bach/sarabande-alto.ly +++ b/mutopia/J.S.Bach/sarabande-alto.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Sarabande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/sarabande-cello.ly b/mutopia/J.S.Bach/sarabande-cello.ly index 7532301b65..47489be30c 100644 --- a/mutopia/J.S.Bach/sarabande-cello.ly +++ b/mutopia/J.S.Bach/sarabande-cello.ly @@ -4,6 +4,7 @@ title = "Solo Cello Suites"; subtitle = "Suite II"; piece = "Sarabande"; % opus = "BWV 1008"; +opus = ""; composer = "Johann Sebastian Bach(1685-1750)"; enteredby = "JCN"; copyright = "public domain"; diff --git a/mutopia/J.S.Bach/scsii-alto.ly b/mutopia/J.S.Bach/scsii-alto.ly index e1fdc23753..e0ba58142c 100644 --- a/mutopia/J.S.Bach/scsii-alto.ly +++ b/mutopia/J.S.Bach/scsii-alto.ly @@ -5,5 +5,3 @@ instrument="Alto"; instrument="alto"; \include "solo-cello-suite-ii.ly" - -\version "0.1.14"; diff --git a/mutopia/J.S.Bach/scsii-cello.ly b/mutopia/J.S.Bach/scsii-cello.ly index eb2a23bcc1..8434573408 100644 --- a/mutopia/J.S.Bach/scsii-cello.ly +++ b/mutopia/J.S.Bach/scsii-cello.ly @@ -5,5 +5,3 @@ instrument="Cello"; instrument="cello"; \include "solo-cello-suite-ii.ly" - -\version "0.1.14"; diff --git a/mutopia/J.S.Bach/solo-cello-suite-ii.ly b/mutopia/J.S.Bach/solo-cello-suite-ii.ly index 61e6e375a3..f251d595c2 100644 --- a/mutopia/J.S.Bach/solo-cello-suite-ii.ly +++ b/mutopia/J.S.Bach/solo-cello-suite-ii.ly @@ -8,7 +8,6 @@ composer = "Johann Sebastian Bach(1685-1750)"; % urg -\version "0.1.14"; % \include "prelude-" + \instrument + ".ly"; i = "prelude-" + \instrument + ".ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 4c020f6e4d..1fab56068f 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -27,7 +27,7 @@ tenor = \stemdown r8 [c8 d e] [f. g32 f] [e8 a] | [d g] ~ [g16 a g f] [e f e d] [c d c b,] | - ['a8 fis] g4 ~ [g8 fis16 e] [f8 d] | + [a,8 fis] g4 ~ [g8 fis16 e] [f8 d] | [g f! e d] c r r g ~ | %% 5 [g f16 e] f4 ~ [f16 f e8] d4 | @@ -78,25 +78,25 @@ soprane = f2 [e8. fis16] g4 ~ %% 10 g4 fis [g16 f! e d] [c d c b,] | - ['a16 c b, a,] g,8 r8 r16 [c16 b, a,] ['gis8 e] | - [d c16 b,16] ['a gis, a, b,] [c fis, a, gis,] ['b8 a,16 b,] - [c8 f e d] ~ [d c16 b,] ['b8. a,16] | + [a,16 c b, a,] g,8 r8 r16 [c16 b, a,] [gis,8 e] | + [d c16 b,16] [a, gis, a, b,] [c fis, a, gis,] [b,8 a,16 b,] + [c8 f e d] ~ [d c16 b,] [b,8. a,16] | a,4 r4 r2 | %% 15 - r2 r8 ['g8 a, b,] | - [c8. d32 c] ['b8 c] [d e] [f!. g32 f!] | + r2 r8 [g,8 a, b,] | + [c8. d32 c] [b,8 c] [d e] [f!. g32 f!] | [e8 a d g] ~ [g16 a g f] [e8 a] | [d8 bes] [a g16 f] [g f g e] [f g g f32 g] | [a16 cis d g] [e8. d16] d8 r8 r4 | %% 20 r2 r4 r8 g, | - ['a b,] [c. d32 c] ['b8 e a, d] ~ | - [e16 e d c] ['b c d e] [f g a g] [f e d c] | + [a, b,] [c. d32 c] [b,8 e a, d] ~ | + [e16 e d c] [b, c d e] [f g a g] [f e d c] | b,4 [c8 d] g, c4 b,8 | - c4 ['b8 bes,8] a, d4 c8 | + c4 [b,8 bes,8] a, d4 c8 | %% 25 [d8 e] f4 ~ [f16 a g f] [e f e d] | - c2 r16 ['g32 a, b,!16 c] [d e f8] ~ | + c2 r16 [g,32 a, b,!16 c] [d e f8] ~ | [f32 c d e f16 g] [a8. b16] | } @@ -153,23 +153,23 @@ bass = %% 5 r2 r8 [c8 d e] | [f. g32 f] [e8 a] [d g] ~ [g16 a g f] | - [e f e d] [c d c b,] ['a8 d a fis] | + [e f e d] [c d c b,] [a,8 d a fis] | [g16 a bes g] [cis8 d] a4 e4 | [a16 b c' d'] [c' b a g] c'8 r8 r4 | %% 10 - r2 r8 ['g8 a, b,] | - [c. d32 c] ['b8 e] ['a d] ~ [d16 e d c] | + r2 r8 [g,8 a, b,] | + [c. d32 c] [b,8 e] [a, d] ~ [d16 e d c] | b,8 e4 d8 c f!4 e8 ~ | e d4 e8 [f! e16 d] e4 | a,4 r4 r2 | %% 15 - r8 ['g8 a, b,] [c. d32 c] ['b8 e] | - ['a8 d] ~ [d16 e d c] ['b8 bes, a, g'] | - ['a8 fis g e] d4 [e8 f!] | + r8 [g,8 a, b,] [c. d32 c] [b,8 e] | + [a,8 d] ~ [d16 e d c] [b,8 bes, a, g'] | + [a,8 fis g e] d4 [e8 f!] | [g8. a32 g] [f8 bes] [e a] ~ [a16 bes a g] | [f e f d] [g8 a] d2 ~ | %% 20 - [d16 e d c] ['b a, g, fis,] ['e8 e fis g] ~ | + [d16 e d c] [b, a, g, fis,] [e,8 e fis g] ~ | [g a16 g16] [fis8 d] g2 ~ | g2 a4 [b8 c'] | [f16 a g f] [e d c b,] [c d e f] [g8 g,] | diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 1de5aa24cd..368602e9f7 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -53,27 +53,27 @@ soprane = r8 [d16 a] [d' d a d'] r8 [d16 a] [d' d a d'] | r8 [d16 f] [b d f b] r8 [d16 f] [b d f b] | r8 [c16 g] [c' c g c'] r8 [c16 g] [c' c g c'] | - r8 ['a16 c] [f a, c f] r8 ['a16 c] [f a, c f] | - r8 ['a16 c] [f a, c f] r8 ['a16 c] [f a, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['g16 c] [e g, c e] r8 ['g16 c] [e g, c e] | + r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] | + r8 [a,16 c] [f a, c f] r8 [a,16 c] [f a, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] | %% 20 - r8 ['bes16 c] [e bes, c e] r8 ['bes16 c] [e bes, c e] | - r8 ['a16 c] [e a, c e] r8 ['a16 c] [e a, c e] | - r8 ['a16 c] [ees a, c ees] r8 ['a16 c] [ees a, c ees] | - r8 ['b16 c] [d b, c d] r8 ['b16 c] [d b, c d] | - r8 ['g16 b,] [d g, b, d] r8 ['g16 b,] [d g, b, d] | - r8 ['g16 c] [e g, c e] r8 ['g16 c] [e g, c e] | - r8 ['g16 c] [f g, c f] r8 ['g16 c] [f g, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['a16 c] [fis a, c fis] r8 ['a16 c] [fis a, c fis] | - r8 ['g16 c] [g g, c g] r8 ['g16 c] [g g, c g] | + r8 [bes,16 c] [e bes, c e] r8 [bes,16 c] [e bes, c e] | + r8 [a,16 c] [e a, c e] r8 [a,16 c] [e a, c e] | + r8 [a,16 c] [ees a, c ees] r8 [a,16 c] [ees a, c ees] | + r8 [b,16 c] [d b, c d] r8 [b,16 c] [d b, c d] | + r8 [g,16 b,] [d g, b, d] r8 [g,16 b,] [d g, b, d] | + r8 [g,16 c] [e g, c e] r8 [g,16 c] [e g, c e] | + r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [a,16 c] [fis a, c fis] r8 [a,16 c] [fis a, c fis] | + r8 [g,16 c] [g g, c g] r8 [g,16 c] [g g, c g] | %% 30 - r8 ['g16 c] [f g, c f] r8 ['g16 c] [f g, c f] | - r8 ['g16 b,] [f g, b, f] r8 ['g16 b,] [f g, b, f] | - r8 ['g16 bes,] [e g, bes, e] r8 ['g16 bes,] [e g, bes, e] | + r8 [g,16 c] [f g, c f] r8 [g,16 c] [f g, c f] | + r8 [g,16 b,] [f g, b, f] r8 [g,16 b,] [f g, b, f] | + r8 [g,16 bes,] [e g, bes, e] r8 [g,16 bes,] [e g, bes, e] | - r8 ['f16 a,] [c f c a,] [c a, f, a,] ['f d, f, d,] | + r8 [f,16 a,] [c f c a,] [c a, f, a,] [f, d, f, d,] | r8 [g16 b] [d' f' d' b] [d' b g b] [d f e d] | || }