From: fred <fred>
Date: Sun, 24 Mar 2002 19:42:01 +0000 (+0000)
Subject: lilypond-0.0.58
X-Git-Tag: release/1.5.59~4802
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4a611b90c1b2b5eaf77ab3642b81203a0fdac7ce;p=lilypond.git

lilypond-0.0.58
---

diff --git a/input/cadenza.ly b/input/cadenza.ly
index 52b306746e..98e1f4ad48 100644
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -7,7 +7,7 @@
 % Tested Features: cadenza mode
 
 
-\version "0.0.54";
+\version "0.0.56";
 
 
 cad = \melodic  {
diff --git a/input/collisions.ly b/input/collisions.ly
index 333fd67e40..a202789ca4 100644
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -1,5 +1,5 @@
 % test the Collision resolution 
-\version "0.0.54";
+\version "0.0.56";
 
 two_voice_steminvert = \melodic { 
 	< \multivoice 
diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index 8e5d3b568e..1fb5e8b0e3 100644
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -10,7 +10,7 @@
 % when lily can handle this, i-ll type the other 304 bars 
 % (maybe even sooner :-)
 %
-\version "0.0.54";
+\version "0.0.56";
 
 alto = \melodic{ 
 	
diff --git a/input/error.ly b/input/error.ly
index 9eeada0ea9..4e05238f4c 100644
--- a/input/error.ly
+++ b/input/error.ly
@@ -1,4 +1,4 @@
-\version "0.0.54";
+\version "0.0.56";
 
 \include "this-is-hopefully-a-nonexisting-file"
 
@@ -15,7 +15,7 @@ mwa = \melodic{
 	a b ) ] 	% ok; error
 %        a.........	% fatal error -- assert
 	a b c
-	|||		% 
+	|.|		% 
 	abc		% ok; print error, no \output
 	\bla 		%  STRING, reduced to lyric_elt.
 	a [ b 		% warning, still \output
diff --git a/input/header.ly b/input/header.ly
index 24104197fd..aa80f614bd 100644
--- a/input/header.ly
+++ b/input/header.ly
@@ -8,4 +8,4 @@
 % Tested Features:
 %%End
 
-\version "0.0.54";
+\version "0.0.56";
diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index ff94f49290..6765c8f7f0 100644
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -7,7 +7,7 @@
 %
 % copyright: None
 %
-\version "0.0.54";
+\version "0.0.56";
 
 % declare melody (which will be in *one* staff ) for the lead voice
 melodie = \melodic {
diff --git a/input/pedal.ly b/input/pedal.ly
new file mode 100644
index 0000000000..abebc0fccc
--- /dev/null
+++ b/input/pedal.ly
@@ -0,0 +1,51 @@
+% pedal.ly
+% 
+% Johann Sebastian Bach
+% preludium en fuga in D
+% bwv 532
+%
+% fuga --- two bar excerpt of pedal part
+%
+% example for pedal studies
+
+% ugh, front and back priority are the same...
+% one must use (ugh):
+%     left front:
+%         -\front-\l{toe,heel}
+%     left back:
+%         -\l{toe,heel}-\back
+%     rigth front:
+%         -\r{toe,heel}-\front
+%     right back:
+%         -\back-\r{toe,heel}
+
+% therefore: 
+% \lheel \ltoe \rheel \rtoe
+% \lbheel \lbheel \lfheel \lftoe
+% \rbheel \rbtoe \rfheel \rftoe
+
+\version "0.0.56";
+
+\score{
+	\staff{ melodicregs
+		\melodic {
+			\meter 4/4;
+			\key fis cis;
+			\clef bass;
+			\octave c;
+			% silly chord testing...
+% these should be stacked...
+%			< 'c-\ltoe 'e-\lheel > < c'-\rtoe e'-\rheel>
+%			< 'c-\lheel 'e-\ltoe > < c'-\rheel e'-\rtoe> |
+			< 'c-\ltoe-\lheel 'e > < c'-\rtoe-\rheel e' >
+			< 'c-\lheel-\ltoe 'e > < c'-\rheel-\rtoe e' > |
+			% 46
+			\duration 16; 
+			[d-\lfheel e-\rbtoe fis-\ltoe e-\rbtoe]
+			[d-\lfheel e-\rbtoe fis-\lheel e] [d e fis e] [d e fis e] |
+			d4 r4 r4 [b-\rtoe a-\ltoe b-\rtoe fis-\ltoe] |
+		}
+	}
+	\paper{}
+}
+
diff --git a/input/rhythm.ly b/input/rhythm.ly
index c76a1ee0cd..2447023f81 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -3,6 +3,8 @@
 %
 % add any impressive examples here, please
 
+\version "0.0.56";
+
 ritme = \staff {
 	melodicregs
 	\melodic{ %\octave ;
diff --git a/input/scales.ly b/input/scales.ly
index 54cb531859..f819c24026 100644
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -2,6 +2,7 @@
 % scales with accents.
 %
 
+\version "0.0.56";
 blah = \staff{  melodicregs
 	\melodic {
 		\meter 6/8;	
diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index b665c77a7c..3f8f11436c 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -1,7 +1,8 @@
 % scsii-menuetto.ly
 %
 % Solo Cello Suites
-% J. S. Bach
+% Johann Sebastian Bach (1685-1750)
+% bwv 000
 %
 % Suite II part v
 % Menuetto I
@@ -11,7 +12,7 @@
 % The purpose of this file is to demonstrate features of LilyPond.
 % (there is an accompanying LaTeX file, scsii-menuetto.tex)
 %
-\version "0.0.54";
+\version "0.0.56";
 %% Stuff from MPP version
 % \lefttitle{Menuetto}
 % \tempo{Moderato}
diff --git a/input/standchen.ly b/input/standchen.ly
index 7d9d9c7378..91b21fb94b 100644
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -9,7 +9,7 @@
 % The purpose of this file is to demonstrate features of LilyPond.
 % (there is an accompanying LaTeX file, standchen.tex)
 %
-\version "0.0.54";
+\version "0.0.56";
 
 commands = \melodic{
 	\skip 2.*4;
@@ -20,7 +20,7 @@ commands = \melodic{
 %	volta2
 	\bar ":|";
 	\skip 2.*22;
-	\bar "||"; 
+	\bar "|."; 
 	}
 
 melodie = \melodic{ 
diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
new file mode 100644
index 0000000000..0220b0f89d
--- /dev/null
+++ b/input/toccata-fuga-E.ly
@@ -0,0 +1,151 @@
+% toccata-fuga-E.ly
+% 
+% toccata and fuga in E-major
+% Johann Sebastian Bach (1685-1750)
+% bwv 566
+%
+% toccata: 3 bar excerpt
+% 2nd fuga: transposed subject --- 4 bar except
+%
+% purpose of this file is testing: 
+%     * real-life collisions
+%     * multi-voice input --- splitting?
+%     * organ staff...
+%
+
+\version "0.0.56";
+
+toccata_commands = \melodic{
+	\meter 4/4;
+	\key fis cis gis dis; % E-major
+}
+
+%toccata_right = \melodic \$toccata_commands { 
+toccata_right = \melodic{ 
+	\$toccata_commands ++
+	% 13 -- how to type -- where to split -- this more neatly ?
+	\octave c';
+	<\multivoice 
+	 	{ \stem 1; \hshift 1; r4 dis'4 e'4.-. e'8( | )e'4 [d'8 fis'8] gis'4 [gis'8 fis'16 e'16] | fis'4( )[fis'8 e'16 dis'16] e'4 r8 e'8 }
+		{ \stem 1; r4 bis4 cis'4-. cis'4 | ais'4( )[ais'16 gis'16 ais'16 b'16] dis'4 cis'4( | )[cis'8 dis'16 ais16] bis4 cis'4 r8 b8 }
+		{ \stem -1; r4 < gis4 fis4 dis4 > gis4-. gis4 | ais4. cis'8 gis2 | fis4 gis4 gis4 r8 e8 }
+	> |
+	% 16
+}
+
+toccata_left = \melodic{ 
+	\$toccata_commands ++
+	\octave c;
+	\clef bass;
+	% 13
+	<\multivoice
+		{ \stem 1; bis2 cis'4-. cis'4( | )[cis'8 ais'8 d'8 cis'8] [bis8 gis8] cis'4 | dis'2 cis'4 r8 cis'8 }
+		{ \stem 1; \hshift 1; r4 gis4. gis8( )gis4 | \stem -1; \hshift 0; ais4. fis8 gis4. ais8( | )ais4 gis4-. gis4 r8 gis8 }
+		{ \stem -1; r4 < dis4 fis4 > < cis4 e4 > }
+	> |
+	% 16
+}
+
+toccata_pedal = \melodic{
+	\$toccata_commands ++
+	\octave c;
+	\clef bass;
+	% 13
+	r4 'fis4-\ltoe 'e4.-\lheel e8-\rheel | 
+	% 14
+	fis4.-\rtoe fis8-.-\rtoe fis4-\rtoe [e8-\ltoe ais8-\rtoe] | 
+	% 15
+	dis4-\ltoe gis4-\rtoe [cis8-\ltoe 'b8-\lheel 'ais8-\rtoe 'gis8-\ltoe] |
+	% 16
+}
+
+fuga2_commands = \melodic{
+	\meter 3/4;
+	\key fis cis gis dis; % E-major
+}
+
+fuga2_right = \melodic{
+	\$fuga2_commands ++
+	% 15
+	\octave c';
+	<\multivoice
+		{ \stem 1; b8 fis8 b4 }
+		{ \stem -1; fis2 }
+	>
+	<% \multivoice % heu?
+		{ e'4 }
+		{ cis'4 }
+		{ ais4 }
+		{ fis4 }
+	> |
+	% 16
+	<\multivoice
+		{ \stem 1; dis'2 dis'4 | cis'2 cis'4 | b4( )[b8 cis'8 dis'8 e'8] }
+		{ \stem 1; \hshift 1; b8 fis8 b2( | )[b8 a16 g16] a2 | a4 gis2 }
+		{ \stem -1; fis2.( | )fis2.( | )fis4 e2 }
+	> |
+	% 19
+}
+
+fuga2_left = \melodic{
+	\$fuga2_commands ++
+	\octave c;
+	\clef bass;
+	% 15
+	b2 
+	<\multivoice 
+		{ \stem 1; ais4 | bes2. }
+		{ \stem -1; e4  | fis2 fis4 }
+	>
+	% 17
+	cis'2 e'4 |
+	% 18
+	b4. b8 b4 |
+}
+
+fuga2_pedal = \melodic{
+	\$fuga2_commands ++
+	\octave c;
+	\clef bass;
+	% 15
+	dis4.-\ltoe e8-\rtoe cis4 |
+	% 16
+	'b4.-\lheel [c8-\ltoe dis8-\rtoe e8-\rheel] |
+	% 17
+	fis4.-\rtoe [e8-\rheel dis8-\rtoe cis8-\ltoe] |
+	% 18
+	dis4-\rtoe e4-\rheel 'e4-\ltoe |
+}
+
+break = \melodic{ \meter 4/4; r1 }
+
+% these should be two separate scores...
+\score{
+	\staff{ melodicregs 
+		% why the extra "\melodic" (silly)
+		% let "[ x ]" be "dimension of x":
+		%     [ melodic ++ melodic ] == [ simple-mudela ]
+		%     [ \melodic{ melodic ++ melodic } ] == [ melodic ]
+		% ?
+		\melodic{ 
+			\$toccata_right ++ \break ++ \$fuga2_right 
+		}
+	}
+	\staff{ melodicregs 
+		\melodic{ 
+			\$toccata_left ++ \break ++ \$fuga2_left 
+		}
+	}
+	\staff{ melodicregs 
+		\melodic{ 
+			\$toccata_pedal 
+			++ \break 
+			++ \$fuga2_pedal 
+		}
+	}
+	\paper{}
+	\midi{
+		\tempo 4:96
+	}
+}
+
diff --git a/input/twinkle.ly b/input/twinkle.ly
index 3bbbaf2d92..26795ef17a 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -3,6 +3,9 @@
 %  "Twinkle twinkle little star"
 % 
 % Copyright: none
+\version "0.0.56";
+
+\version "0.0.55";
 
 melody = \melodic{
 	\clef\violin;
@@ -36,7 +39,7 @@ accompany = \melodic {
 global = \melodic {
 		\meter 2 / 4;
 		\skip 2*24;
-%		\bar "||";
+%		\bar "|.";
 	}
 
 tekst = \lyric{ 
diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index f78af4da03..7d5a7d72b8 100644
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -8,7 +8,7 @@
 % Tested Features:stem direction, multivoice.
 %
 
-\version "0.0.54";
+\version "0.0.56";
 
 global = \melodic{
  	\meter 4/4 ;