From: fred <fred>
Date: Sun, 24 Mar 2002 20:05:24 +0000 (+0000)
Subject: lilypond-0.1.44
X-Git-Tag: release/1.5.59~3457
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e481f9379ff7d1c096738f178fda47bf5eeb5c14;p=lilypond.git

lilypond-0.1.44
---

diff --git a/VERSION b/VERSION
index 901ee9191c..d0da0ec0d1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 43
+TOPLEVEL_PATCH_LEVEL = 44
 TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:
diff --git a/bin/conflily.sh b/bin/conflily.sh
index 520af8b24c..a89f9e7711 100644
--- a/bin/conflily.sh
+++ b/bin/conflily.sh
@@ -27,7 +27,7 @@ ln -sf $lelie/current/mi2mu/out/mi2mu bin/out/mi2mu
 
 if [ "x$LILYINCLUDE" = "x" ]; then
 	echo you should make add the following to your login script
-	echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/input:$lelie/current/mutopia:$lelie/current/mutopia/j.s.bach"
+	echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/input:$lelie/current/mutopia:$lelie/current/mutopia/out:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:$lelie/current/mutopia/J.S.Bach/out"
 	echo "export PATH=$PATH:$lelie/current/bin/out/"
 	echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf"
 fi
diff --git a/input/Makefile b/input/Makefile
index 894dba5c00..45c1320de0 100644
--- a/input/Makefile
+++ b/input/Makefile
@@ -16,6 +16,10 @@ include ./$(depth)/make/Include.make
 # 
 LYFILES = $(wildcard *.ly)
 TEXFILES = $(wildcard *.tex)
+M4FILES = $(wildcard *.m4)
 DISTFILES = Makefile TODO $(LYFILES) $(TEXFILES) $(wildcard *.m4)
 #
 
+OUTFILES = $(addprefix $(outdir)/,$(M4FILES:%.m4=%))
+
+all: $(OUTFILES)
diff --git a/make/Variables.make b/make/Variables.make
index 0d2d6795b5..884f2ffb2c 100644
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -156,6 +156,11 @@ LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(dep
 LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES) -lg++ # need lg++ for win32, really!
 #
 
+# macro compiler:
+#
+M4 = m4
+# 
+
 # librarian:
 #
 AR = ar
diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
new file mode 100644
index 0000000000..1fd3aad026
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -0,0 +1,113 @@
+\header{
+filename =	 "preludes-1.ly";
+title =	 "1";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+rh = \melodic{
+	\octave c'';
+	\textstyle "italic";
+	r16\p_"legato"\< ['g-1( c-3 )e-5] r ['g-1( c )e]
+	r [g( c )d] r ['b-1( d-2 \!)g-5] |
+	r\mf ['a( d-2 ) g-5] r ['a(\< d )f-4]
+	r ['a( d )e-3] r [c-1( e-2 \!)a-5] |
+	r\f ['b e a-5] r ['b e-3 g-5] 
+	r [c-1 e-3 f-4] r ['g d-3 f-5] |
+	r ['g-"poco a poco dim." d-4 e] r ['g c-2 e]
+	r ['a-1 c-3 d-4] r ['e 'b-3 d-5] |
+	r ['e 'b c-4] r ['e 'a-2 c]
+	r ['f-1 'a-3 'bes-4] r ['c 'g-3 'bes-5] |
+	r ['c 'g 'a-4] r ['c 'f-2 'a] 
+	r ['d 'f-2 'b-5] r ['e 'g-2 c-5] |
+	r\p ['d 'g c-5] r ['d 'g 'b-4]
+	r ['c 'g-3 'b-5] r ['c 'fis-2 'a-4] |
+	r [''b 'd 'a-5] r [''b 'd 'g-4]
+	r [''a 'c 'g-5] r [''a 'c 'f!-4] |
+	% ugh, arpeggio
+	\multi 2 <
+		{ \stemup; 'f4 r s }
+		{ \stemdown; <''g4 'd> r s }
+	>
+	\stemboth;
+	% ugh beam across staffs, slur starts at lower staff
+	r16 [''g-1( ''b 'd] |
+	\stemup;
+	)''b s4 ['g16-1( 'b-2 d] )'b s s s [f-2 g-3 b-5 f-2] |
+	\stemboth;
+	[e-1\f c'-5( g-3 f-2] [e-1 c'-5 g-3 e-2] 
+	[)d c'-5( f-3 e-2] [d-1 b-5 f-3 d-2] |
+	[)c b-5( e-3 d-2] [c-1 a-5 e-3 c-2] 
+	[)'b-1 a-5( d-3 c-2] ['b-1 g-5 d-3 'b-2] |
+	[)'a g-5 c-4 'b] ['a-"poco a poco dim." fis-5 c-2 'a-1]
+	['b-2 f d-4 c] ['b f d-4 'b-2] |
+	['g e c-3 'b] ['a e-5 c-3 'a-1]
+	['fis-2 d 'b-3 'a] ['g-1 d-5 'b-4 'g-2] |
+	['e c-5 'a-4 'g-3] ['fis-2 c-5 'a-4 'fis-2] 
+	['d c-5 'b-4 'a] ['b-4 'g-2 d-5 'f-1] |
+	['g-4 'e-2 'f-1 d-5] [c-4 'b 'a 'g]
+	[f-5 d-3 es-4 c-2] ['fis-1 es-4 d-3 c-2] |
+	['b-1 d-5 'b-3 'g-1] ['as-4-"cresc. e rall." 'f-2 'g-3 'd-1]
+	['es-2 'fis-3 'a-4 c-5] 
+	\multi 2 < 
+		{ \stemup; r [c8 'b16] }
+		{ \stemdown; ['d8 'f-2] }
+	>
+	\stemboth; |
+	<c1\mf 'g 'e>
+	\bar "|.";
+}
+
+lh = \melodic{
+	\octave c;
+	\clef bass;
+	\textstyle "roman";
+	c4-5 e-3 [g32-1 fis-2 g8.-1] 'g4 |
+	d-5 f-3 [a32-1 gis a8.] 'a4 |
+	% ugh grouping32: 4..4
+	e-5 e'-1 a-4 [e32-3 b c' b] [c' b a b] |
+	c'4 e-4 fis [a32-1 gis fis gis] [ ais gis fis gis] |
+	a4 c-4 d [d32 e f e] [f e d e] |
+	% ugh tril sign
+	% f4-1 e d-3\tr c |
+	f4-1 e d-3 c |
+	% g( )'g g\pr-"(#)"( )'g |
+	g( )'g g-"(\\textsharp)"( )'g |
+	% g\pr-"(\\textsharp)"( )'g g\pr-"(\\textsharp)"( )'g |
+	g-"(\\textsharp)"( )'g g-"(\\textsharp)"( )'g |
+	% ugh, f should be at upper staff
+	g r r16 ['g-5( 'b-4 d] )f-1 s s s |
+	s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] 
+	s s s s \clef bass; |
+	\multi 2 <
+		{ \stemup; g1 ~ g ~ g ~ g ~ g ~ g ~ g }
+		{ \stemdown; 'g1 ~ 'g ~ 'g ~ 'g ~ 'g ~ 'g ~ 'g }
+	>
+	<c1 'c>
+	\bar "|.";
+}
+
+global  = \melodic{
+	\meter 4/4;
+}
+
+\score{
+	% Moderato
+	% it would be nice to shut-off fingering...
+	\melodic \type Grandstaff < 
+		<
+			\global 
+			\rh
+		>
+		<
+			\global 
+			\lh
+		>
+	>
+	\paper{
+	}
+	\midi{
+		\tempo 4 = 70;
+	}
+}
diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
new file mode 100644
index 0000000000..98c4b5936b
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -0,0 +1,118 @@
+\header{
+filename =	 "preludes-2.ly";
+title =	 "2";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+rh = \melodic{
+	\octave c'';
+	\textstyle "italic";
+	r8\mf ['c-1( 'e-2 'g-4] ['e-2 'c-1 'bes-5 'g-3] |
+	[)'a-4\< 'c-1( 'f-2 'a-4] ['f 'c c-5 'a-3] |
+	[)'b-4 'g-1( 'b-2 d-4] ['b-2 'g f-5 \!d-3] |
+	\multi 2 <
+		{\stemup; )e2-4\f r4 e-5 }
+		{\stemdown; <c2 'g> r4 <c 'g> }
+	>
+	\stemboth; |
+	\multi 2 < 
+		 { \stemup; d2-4 r4 d-4 }
+		 { \stemdown; <c2 'a> r4 <c 'a> }
+	>
+	\stemboth; |
+	\multi 2 < 
+		 { \stemup; d8 }
+		 { \stemdown; <'b8 'g> }
+	>
+	\stemboth;
+	['g8-1\mf( 'b-2 d-4] 
+	\multi 2 <
+		{ \stemup; )'b4 e-5 }
+		{ \stemdown; 'g4 'b }
+	>
+	\stemboth; |
+	\multi 2 <
+		{ \stemup; c2 r4 < {c-5 ~ c8} {'a4 ~ 'a8} > }
+		{ \stemdown; c2 r4 'e4 ~ 'e8 }
+	>
+	['d-1\p( 'fis-2 'a-4] ['fis-2 'd-1 c-5 'a-3] |
+	[)'b-4\< 'g-1( 'b-2 d-4] [ 'b-2 'g-1 f!-5 d-3] |
+	[)e-4 'g-1( c-2 e-4] [c-2 'g g-5 e-3] |
+	[)fis-4 'a-1( c-2 fis-4] [c 'a a-5 \!fis-3] |
+	\multi 2 <
+		{ \stemup; )g2-5\f }
+		{ \stemdown; <d2 'b> }
+	>
+	\stemboth;
+	r4 b4-2( |
+	[c8-1 e-2 g c'] [g-2 e-1 bes-4 g-2] |
+	[)a16->-3 g-2 f-1 e-3] [d c 'b!-3 'a-2] 
+	['b-3\< 'g-1 'a 'b] [c-1 d e \!f] |
+	g4-5\ff
+	\multi 2 <
+		{ \stemup; c2-5 'b4-4 }
+		{ \stemdown; 'g2 'd4 }
+	>
+	\stemboth;
+	\multi 2 <
+		{ \stemup;  c1^5 }
+		{ \stemdown; 'e1_1}
+	>
+	\stemboth;
+	\bar "|.";
+}
+
+lh = \melodic{
+	\octave c;
+	\clef bass;
+	\multi 2 <
+		{ \stemup; c1 ~ c ~ c }
+		{ \stemdown; 'c1 ~ 'c ~ 'c }
+	>
+	\stemboth; |
+	r8 [c-5( e-3 f-1] [e-3 c-5 c' e-4] |
+	[)fis-3 d-5( fis-3 a-1] [fis-3 d-5 d' fis-4] |
+	)g2-3 r4 g-2( |
+	[)a8 'a-5( c-4 e-2] [c-4 'a-5 g e-3] |
+	)fis2 r4 d-4 |
+	% [g32-1( fis-2 g8.-1] ) 'g4 g( )'g\mr |
+	
+	% my edition has  mordents on every g here
+	[g32-1( fis-2 g8.-1] ) 'g4 g( )'g |
+	% 'g( )g\mr 'g( )g\mr |
+	g( )'g g( )'g |
+	g( )'g g( )'g |
+	[g8 'g-5( 'b-4 d-2] ['b-4 'g-5 f!-1 d-3] |
+	[)e-2 c-4 e-2 g-1] [e-3 c-5 c' e-4] |
+	\textstyle "finger";
+	f1^"3\\_1" ~ |
+	[f8 d-3 e-2 c-4] g4-1 'g^"5\\_2" |
+	<c1 'c1>
+	\bar "|.";
+}
+
+global  = \melodic{
+	\meter 4/4;
+}
+
+\score{
+	% Moderato
+	% it would be nice to shut-off fingering...
+	\melodic \type Grandstaff < 
+		<
+			\global 
+			\rh
+		>
+		<
+			\global 
+			\lh
+		>
+	>
+	\paper{
+	}
+	\midi{
+		\tempo 4 = 110;
+	}
+}
diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4
new file mode 100644
index 0000000000..3b99653102
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-3.ly.m4
@@ -0,0 +1,153 @@
+\header{
+filename =	 "preludes-3.ly";
+title =	 "3";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+define(comma, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
+define(s, `comma(translit($*,` ', `,'))')
+define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
+
+rh = \melodic{
+	\octave c';
+	\textstyle "italic";
+%#	s(`c' `es' `g' `\p(\<' `\!' `)\!' `\>')
+	t(c,es,g,`\p(\<',\!,`)\!',\>)
+%#	s(c es g `(' `' `)')
+	t(c,es,g,`(',`',`)')
+%#	s(c f as `(' `' `)')
+	t(c,f,as,`(',`',`)')
+	s(c f as)
+	s('b d f \< \!)
+	s('b d f)
+	s('g c es \> \!)
+	s('g c es)
+	s('g c es \< \!)
+	s('g c es)
+	s('a c es)
+	s('a c es)
+	s('a 'bes d \> \!)
+	s('g 'bes d)
+	s('bes d g)
+	s('a es g \mf)
+	s('a c fis)
+	s('a c fis)
+	s('bes d g)
+	s(c fis a -"poco\\_a\\_poco\\_cresc.")
+	s(d g bes)
+	s(d fis c')
+	s(cis g bes)
+	s(c es a !-"dim.")
+	s('bes e g)
+	s('a c g)
+	s('a c fis)
+	s('g 'bes e)
+	s('fis a es)
+	s('g 'bes d -"dim.")
+	s('g 'a c)
+	s('fis a c)
+	s('fis a c)
+	r16\p ['g 'a c] ['b 'g 'b 'g] r 'g r 'g
+	s('a c fis -"poco\\_cresc.")
+	s(c fis a)
+	s('b d g)
+	s('b d f -"dim.")
+	s('g c es)
+	s('fis c es)
+	s('fis c es)
+	r16 ['g(\< 'b d] ['b 'g 'b d] [es c 'a )\!fis] |
+	\multi 2 <
+		{\stemup; g2.-\fermata\mf}
+		{\stemdown; <'b2. d>}
+	>
+	\stemboth;
+	\bar "|.";
+}
+
+lh = \melodic{
+	\octave c;
+	\clef bass;
+	% c4 r [g8-.(\ped )es-.\*] |
+	c4 r [g8-.( )es-.] |
+	c4 r [g8-.( )es-.] |
+	c4 r [as8-.( )f-.] |
+
+	c4 r [as8-.( )f-.] |
+	c4 r [as8-.( )f-.] |
+	c4 r [as8-.( )f-.] |
+
+	c4-- r [es8 c] |
+	'bes!4-- r [es8 c] |
+	'as!4-- r [es8 c] |
+
+	'g4-- r [es8 c] |
+	'fis4-- r [es8 c] |
+	'fis4 r [fis8 d] |
+
+	'g4 r [d8 'bes] |
+	'g4 r ['bes8 'g] |
+	'es4 r [g8 es] |
+
+	c4 r [c8 'a] |
+	'd4 r [d8 'a] |
+	'd4 r [d8 'a] |
+	'd4 r [d8 'bes] |
+
+	'd4 r [es8 c] |
+	'd4 r [es8 d] |
+	'd4 r [a8 fis] |
+
+	'd4 r [g8 es] |
+	'd4 r [fis8 d] |
+	'd4 r [e8 cis] |
+	'd4 r [es8 c] |
+
+	'd4 r [d8 'a] |
+	'd4 r [cis8 'bes] |
+	'd4 r [c!8 'a] |
+
+	'd4 r ['bes8 g] |
+	'd4 r [es8 c] |
+	'd4 r [d8 c] |
+
+	'g4 r [es8 c] |
+	'g4 r [d8 'b] |
+	'g4 r [es8 c] |
+	
+	'g4 r [es8 c] |
+	'g4 r [g8 d] |
+	'g4 r [as8 f] |
+	'g4 r [es8 c] |
+
+	'g4 r [es8 c] |
+	'g4 r [es8 c] |
+	'g4 r r |
+	'g2.-\fermata 
+	\bar "|.";
+}
+
+global  = \melodic{
+	\meter 3/4;
+	\key bes es as;
+}
+
+\score{
+	% Semplice e non troppo legato
+	\melodic \type Grandstaff < 
+		<
+			\global 
+			\rh
+		>
+		<
+			\global
+			\lh
+		>
+	>
+	\paper{
+	}
+	\midi{
+		\tempo 4 = 90;
+	}
+}
diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly
new file mode 100644
index 0000000000..2d28e33f2a
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-4.ly
@@ -0,0 +1,72 @@
+\header{
+filename =	 "preludes-4.ly";
+title =	 "4";
+composer =	 "Johann Sebastian Bach (1685-1750)";
+enteredby =	 "jcn";
+copyright =	 "public domain";
+}
+
+rh = \melodic{
+	\octave c'';
+	\textstyle "italic";
+	% ugh, start in multi, because of slurring an tieing over bars
+	\multi 2 < 
+		{ 
+			r16\p_"legato" 
+			['d-1( 'fis-3 'd-1] ['a-2 'b-3 cis-4 'a-3]
+			[d-3 cis-2 d-1 e-2] [d-1 fis-3 e-2 d-1] |
+			\textstyle "finger";
+			\stemup; 
+			)cis4-2 fis-5 ~ [fis8 fis-4] e4-3 ~ | 
+			e( )d8-2 s s4 s4 |
+			r8 d4-> cis8-1 ~ cis 'b4-1 'b8 |
+		}
+		{ 
+%			s1
+			\stemdown; 
+			r8 'a4 'a8 'b4.-"2\\_1" cis8 ~ | 
+			cis16\< ['a( cis 'a] [d-2 e fis d-1]
+			[g-3 fis g a-4] [a-3 b a \!g] |
+			)fis4-"2\\_3" [e8-2 a-5] <fis4-4 d-2> <gis-5 e-3> |
+		} 
+	>
+	\stemboth;
+	\bar "|.";
+}
+
+lh = \melodic{
+	\octave c;
+	\clef bass;
+	s1 | s1 | s1 | s1
+%	\multi 2 <
+%		{ \stemup; }
+%		{ \stemdown; }
+%	>
+%	\stemboth; |
+	\bar "|.";
+}
+
+global  = \melodic{
+	\meter 4/4;
+	\key fis cis;
+}
+
+\score{
+	% Allegretto
+	% it would be nice to shut-off fingering...
+	\melodic \type Grandstaff < 
+		<
+			\global 
+			\rh
+		>
+		<
+			\global 
+			\lh
+		>
+	>
+	\paper{
+	}
+	\midi{
+		\tempo 4 = 110;
+	}
+}
diff --git a/mutopia/Makefile b/mutopia/Makefile
index 7c3cb7d7e7..d9bffc37b0 100644
--- a/mutopia/Makefile
+++ b/mutopia/Makefile
@@ -16,6 +16,10 @@ include ./$(depth)/make/Include.make
 # 
 LYFILES = $(wildcard *.ly)
 TEXFILES = $(wildcard *.tex)
+M4FILES = $(wildcard *.m4)
 DISTFILES = Makefile TODO $(LYFILES) $(TEXFILES) $(wildcard *.m4)
 #
 
+OUTFILES = $(addprefix $(outdir)/,$(M4FILES:%.m4=%))
+
+all: $(OUTFILES)