From: fred <fred>
Date: Sun, 24 Mar 2002 20:05:55 +0000 (+0000)
Subject: lilypond-0.1.46
X-Git-Tag: release/1.5.59~3428
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3d0cbe239d1b0408677187d1cb322f238590561a;p=lilypond.git
lilypond-0.1.46
---
diff --git a/VERSION b/VERSION
index 1a990573ab..4bdb5e8521 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
TOPLEVEL_MAJOR_VERSION = 0
TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 45
+TOPLEVEL_PATCH_LEVEL = 46
TOPLEVEL_MY_PATCH_LEVEL =
# use the above to send patches, always empty for released version:
diff --git a/input/denneboom.ly b/input/denneboom.ly
index 4eef4dbf42..98944aba31 100644
--- a/input/denneboom.ly
+++ b/input/denneboom.ly
@@ -5,23 +5,27 @@ copyright = "public domain";
TestedFeatures = "This file tests silly line shapes";
}
-\include "paper13.ly"
+\include "paper20.ly"
\version "0.1.9";
oden = \lyric{
- _8 O8 den-8. ne-16 boom,4 _8 o8 den-8. ne-16 boom.4.
- Wat8 zijn uw tak-4 ken won-8. der-16 schoon4.
+ _8 O8 |
+ den-8. ne-16 boom,4 _8 o8 |
+ den-8. ne-16 boom.4. Wat8 zijn uw |
+ tak-4 ken won-8. der-16 schoon4
}
ikheb = \lyric{
- Ik8 heb u laatst4. in_'t8 bos8. zien16 staan4.
- toen8 zat- en er4. geen8 kaars-8. jes16 aan.4
+ _8 Ik8 heb u |
+ laatst4. in_'t8 bos8. zien16 staan4. toen8 zat- en |
+ er4. geen8 kaars-8. jes16 aan.4
}
ugloeit = \lyric{
- U8 gloeit in bar-4. re8 win-8. ter-16 tijd,4.
- als8 sneeuw op aar-4. de8 licht8. ge-16 spreid.4
+ _8 U8 gloeit in |
+ bar-4. re8 win-8. ter-16 tijd,4. als8 sneeuw op |
+ aar-4. de8 licht8. ge-16 spreid.4
}
oboom = \melodic{
@@ -39,15 +43,13 @@ bos = \melodic{
g4 r8 f8 f8. e16 e4
}
-global = \melodic{
+global = \melodic{
\meter 3/4;
\partial 4;
\skip 4*1;
\skip 4*3;
\meter 4/4;
\skip 4*4;
- \meter 6/4;
- \skip 4*12;
\meter 5/4;
\skip 4*5;
\meter 3/4;
@@ -55,50 +57,45 @@ global = \melodic{
\meter 4/4;
\skip 4*4;
\meter 6/4;
+ \skip 4*6;
+ \skip 4*6;
+ \meter 5/4;
\skip 4*5;
-
+ \meter 3/4;
+ \skip 4*3;
+ \meter 4/4;
+ \skip 4*8;
\bar "|.";
}
\score{
<
-% {
\lyric \type Lyrics <
\multi 2 <
% huh?
% \global
{
+ \oden
\oden
\ikheb
\oden
-
-% _4
-% \oden
-% \ugloeit
-% \oden
}
- \global
>
>
-% }
\melodic \type Staff <
\multi 2 <
\global
{
+ \oboom
\oboom
\bos
\oboom
-
-% r4
-% \oboom
-% \bos
-% \oboom
}
>
>
>
\paper{
-% \paper_thirteen
+ \paper_twenty
indent = 20. \mm;
\shape = 70. \mm 20. \mm
65. \mm 30. \mm
@@ -109,43 +106,67 @@ global = \melodic{
27.5 \mm 105. \mm
20. \mm 120. \mm
10. \mm 140. \mm
-% 0. \mm 160. \mm
65. \mm 30. \mm
;
+ gourlay_maxmeasures = 30.;
+% uhuh, loop if you comment these in
+% arithmetic_basicspace = 3.8;
+% arithmetic_multiplier = 8.\pt;
+ }
+ \midi{
+ \tempo 4 = 90;
+ }
+}
+
%{
- \shape = % 72.5 \mm 15. \mm
- % 50. \mm 60. \mm
- 70. \mm 30. \mm
- 60. \mm 60. \mm
- 50. \mm 80. \mm
- 70. \mm 40. \mm
- 50. \mm 80. \mm
- 30. \mm 120. \mm
- 60. \mm 60. \mm
- 30. \mm 120. \mm
- 20. \mm 140. \mm
- 0. \mm 180. \mm
- 70. \mm 30. \mm
- 70. \mm 30. \mm
- 70. \mm 30. \mm
+\score{
+ <
+ \lyric \type Lyrics <
+ \multi 2 <
+% huh?
+% \global
+ {
+ \oden
+ \oden
+ \ugloeit
+ \oden
+ }
+ >
+ >
+ \melodic \type Staff <
+ \multi 2 <
+ \global
+ {
+ \oboom
+ \oboom
+ \bos
+ \oboom
+ }
+ >
+ >
+ >
+ \paper{
+ \paper_twenty
+ indent = 20. \mm;
+ \shape = 70. \mm 20. \mm
+ 65. \mm 30. \mm
+ 57.5 \mm 45. \mm
+ 50. \mm 60. \mm
+ 42.5 \mm 75. \mm
+ 35. \mm 90. \mm
+ 27.5 \mm 105. \mm
+ 20. \mm 120. \mm
+ 10. \mm 140. \mm
+% 0. \mm 160. \mm
+ 65. \mm 30. \mm
;
- \shape = 80. \mm 20. \mm
- 70. \mm 40. \mm
- 60. \mm 60. \mm
- 50. \mm 80. \mm
- 40. \mm 100. \mm
- 30. \mm 120. \mm
- 20. \mm 140. \mm
- 10. \mm 160. \mm
-% 00. \mm 180. \mm
- 75. \mm 30. \mm
- ;
-%}
gourlay_maxmeasures = 30.;
-% arithmetic_basicspace = 1.2;
-% arithmetic_multiplier = 2.8\pt;
+% uhuh, loop if you comment these in
+% arithmetic_basicspace = 3.8;
+% arithmetic_multiplier = 8.\pt;
}
\midi{
\tempo 4 = 90;
}
}
+%}
diff --git a/mutopia/J.S.Bach/preludes-3.ly.m4 b/mutopia/J.S.Bach/preludes-3.ly.m4
index 0a85331b05..88f575edd3 100644
--- a/mutopia/J.S.Bach/preludes-3.ly.m4
+++ b/mutopia/J.S.Bach/preludes-3.ly.m4
@@ -39,7 +39,7 @@ rh = \melodic{
s('bes d g)
- s(c fis a -"poco\\_a\\_poco\\_cresc.")
+ s(c fis a -"poco a poco cresc.")
s(d g bes)
s(d fis c')
@@ -57,7 +57,7 @@ rh = \melodic{
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('a c fis -"poco cresc.")
s(c fis a)
s('b d g)
s('b d f -"dim.")
diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly
index 6086842e71..9b54a623dc 100644
--- a/mutopia/J.S.Bach/preludes-4.ly
+++ b/mutopia/J.S.Bach/preludes-4.ly
@@ -33,12 +33,28 @@ one = \melodic{
['a-4_"dim." 'g-1 'a 'b] ['a-2 c-4 'b 'a]
['g-1 'fis-2 'g-3 'a] ['g-3 'b 'a 'g] |
\stemup
- )'fis4\p r16 [''b-1\< d-2 ''b~] <'g4-5 'e-3 ''b>
- r16 ['cis-1 'e-2 \!cis] | % cis wants ~
-
+ )'fis4\p
+ \skip 4*7; |
+ d4.\mf cis8-"4\\_5" ~ cis 'b4-5 'a8-"4\\_5" ~ |
+ \textstyle "italic";
+ 'a 'g4-5 'fis8-4 ~ ['fis16 'fis-4-"dim." 'e-3 'd-2]
+ \textstyle "finger";
+ 'e4-"3\\_5" ~ |
+ ['e16 'e-5 'd 'cis] 'd4-5 ~ ['d16 'd-5 'cis ''b] 'cis4-5 |
+ \stemboth
+ [''fis16-1\p ''a-2 'd-5\< 'c-4] [''b-1 'd-2 'g-5 'fis-4]
+ ['d-1 'b-5 'a 'g] ['fis-2 'e-1 'd-4 \!'c!-3] |
+ [''b-2 'd-1 'g 'a] ['fis32 'g 'fis16] ['e16-4 'd-3]
+ ['d8. 'e16~] ['e 'd8 'cis16] |
+ \stemup
+ r16 ['d-1\< 'fis 'd] ['g 'a 'b 'g-1] [c-3 'b c d] [c e d-4 \!c] |
+ 'b4-5 'a ~ ['a8 'g-5 ~] ['g16 'fis8-4 'e'16-3] |
+ ['fis8-4 'e-5~] ['e 'd-5~] 'd4 'cis-4 |
+ 'd2\p-"rall." ~ ['d16 ''a-2( ''b-3 'cis-4] )'d4-5 |
}
two = \melodic{
+ \octave c;
\textstyle "finger";
% ugh: koor
% \translator Staff=bass \octave c; \stemup
@@ -58,18 +74,53 @@ two = \melodic{
e'4 d' ~ [d'16 d-1 cis'-2 g-1] cis'4-2 ~ |
[c'8 a-3] d'4.-1 d'4-> cis'8-2 |
\translator Staff=treble \octave c''; \stemdown
- 'd4 \skip 4*3; |
+ 'd4
+ \stemboth
+ r16 [''b-1\< d-2 ''b~] <'g4-5 'e-3 ''b>
+ r16 ['cis-1 'e-2 \!'cis~] |
+ <'a4-5 'f-3 'cis> r16 ['d-1 'fis-2 'd~] <'b4-5 'g-3 'd>
+ r16 ['fis-1 'a 'fis~] |
+ \stemdown
+ 'fis4 'e 'd 'cis |
+ ''b ''a ''b4. ''b8 |
+ ''a4
+ \translator Staff=bass \octave c; \stemup
+ r16 [b-3 fis-1 a-2] g4-1 r16 [a-3 e-1 g-2] |
+ \skip 4*4; \skip 16*1;
+ \translator Staff=treble \octave c''; \stemdown
+ 'd8.-1 ~ ['d8 'c] 'd4 [''a8 ''g] |
+ \translator Staff=bass \octave c; \stemup
+ [fis'8 c'-1] b4-1 <a
+ \translator Staff=treble \octave c''; \stemdown
+ ''a4.-2>
+ \stemdown
+ 'a8~ |
+ ['a 'g-3~] ['g16 'e 'fis8~] ['fis16 'd8.~] ['d8. cis!16] |
+ \translator Staff=bass \octave c; \stemup
+% <[d'8-2 a-1> <a~ g]> <a4 [fis16-2> e-1 fis-2 d-1]
+ \multi 2 <
+ {
+ [d'8-2 a~] a4
+ }
+ {
+ \property Voice.hshift = 1
+ [a8-1 g] [fis16-2 e-1 fis-2 d-1]
+ \property Voice.hshift = 0
+ }
+ >
+ [g-1 fis-2 g-1 a-2] [g-1 b-3 a-2 g-1 ~] |
+ [g g-1 fis-2 e-1] fis-2 ~ fis2
}
three = \melodic{
\octave c;
\stemdown;
d4-3 c-4 'b e-3 |
- a16 ['a-5\mf( c-3 'a-5] [d-2 e-1 fis-2 d-4]
+ a16 ['a-5\mf( cis-3 'a-5] [d-2 e-1 fis-2 d-4]
[g-1 fis-3 g a] [g b a g] |
)fis4 fis e a-4 |
- d'16 \stemboth [d-5\f( fis-3 d-5] [a-2 b-1 c'-2 a-4]
- [d'-1 c'-3 d' e'] [d'-4 fis'-2 e'-1 ) d'] |
+ d'16 \stemboth [d-5\f( fis-3 d-5] [a-2 b-1 cis'-2 a-4]
+ [d'-1 cis'-3 d' e'] [d'-4 fis'-2 e'-1 ) d'] |
[cis'-3 b-4 cis'-3 d'-2] [c'-4 e'-2 d'-3 c'-4]
\stemdown b4-5 [cis'8-4 b-3(] |
[a-4 )fis-5 b-2 a-3] [gis-4 e-5 a-3 g-4] |
@@ -77,10 +128,47 @@ three = \melodic{
\stemboth
r16 [d-4( fis-2 d-4] [)g8-.-1 'g-.-5]
r16 [e-4( g-2 e-4] [)a8-. 'a-.-5] |
+ r16 [fis-4( a fis] [)b8-. 'b-.] r16 [g-4( b g] [)d'8-. d-.] |
+ r16 ['d16-5( 'fis-3 'd] ['a-2 'b-1 cis-2 'a-4] [d 'b-5 d-3 'b]
+ [fis-2 g a-2 fis-4] |
+ )fis16 ['g( 'b 'g] [d-2 e fis-2 d-4] [)g8-. 'g-.] r16 [cis-4( e cis] |
+ [)fis8-. 'fis-.] \stemdown r16 ['b-4( d 'b] [)e8-. 'e-.]
+ r16 ['a-4 cis a] |
+ \stemboth
+ [d-1 e-3 fis-2 d-4] [g-1 fis-2 e-3 d-1] [cis!-3 'a-5 'b cis]
+ [d-2 e fis-2 d-4] |
+ [g8 e-3] \stemdown [a 'a] ['b8.-4 'g16-5] a4-4 |
+ [d8-5 a-2~] [a g-3~] [g g-3] fis4-4 |
+ \stemup
+ r16 [g-2 b-1 g-3] [b'8.-1 c'16-1] [b8.-2 bes16-3] [a8-1 g] |
+ \stemdown
+ r16 ['a-2 cis!-1 a-2] [d-1 e fis d] [e8-1 d-2] [e-1 'a-2] |
+ [d 'a-2~] ['a16 'a-2 'b cis-2] d2 |
+}
+
+four = \melodic{
+ \skip 4*36;
+ \octave c';
+ \stemup;
+ \property Voice.hshift = 1
+ a2 fis |
+ d
+ \property Voice.hshift = 0
+ \skip 4*11;
+ \translator Staff=bass \octave c; \stemup
+ a4 ~ [a16 d-2 g8-1] [fis e-1] |
+ \stemdown
+ d1 ~ |
+ d ~ |
+ 'd ~
+ 'd2 'd2
}
rh = \melodic{
- \one
+ \multi 2 <
+ \one
+ \four
+ >
\bar "|.";
}
@@ -107,16 +195,24 @@ global = \melodic{
\type Staff=treble <
\global
% huh? try these iso directly!
- \lh
-% \one
-% \two
+% \lh
+ \multi 2 <
+ \one
+ \four
+ >
>
\type Staff=bass <
\global
- \rh
+% \rh
% or try \two having here, iso above!
% \two
-% \three
+ {
+ \clef "bass";
+ \multi 2 <
+ \two
+ \three
+ >
+ }
>
>
\paper{
diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly
new file mode 100644
index 0000000000..aee8b4c4a5
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-5.ly
@@ -0,0 +1,212 @@
+\header{
+filename = "preludes-5.ly";
+title = "5";
+composer = "Johann Sebastian Bach (1685-1750)";
+enteredby = "jcn";
+copyright = "public domain";
+}
+
+\include "paper20.ly"
+
+rh = \melodic{
+ \octave c';
+ \textstyle "italic";
+ [d8-1\p a-5-"legato" f-3 d-1 a-5 f-3] |
+ [d-1 a-5 f-3 d-1 a-5 f-3] |
+ [d-1\< b-4 g-2 d-1 b-4 \!g-2] |
+ [d-1 b-4 g-2 d-1 b-5 g-3] |
+ [cis-1\mf g-4 e-2 cis-1 g-4 e-2] |
+ [cis-1 b-5 g-4 e-2 a-5 g-4] |
+ [f-3\< d-1 f-2 a-4 f-1 a-2] |
+ [d'-5 a-1 d'-2 f'-4 d'-1 \!f'-2] |
+ [b'\> f'-3 e' d' c'-3 b] |
+ [a gis-3 fis e d'-5 \!b-2] |
+ \multi 2 <
+ {
+ \stemup
+% c4\mr^"(\\textsharp)"\p r r |
+% c4\mr^"(\\textsharp)" r r
+ c4^"(\\textsharp)"\p r r |
+ c4^"(\\textsharp)" r r
+ }
+ {
+ \stemdown
+ a4 r r |
+ a4 r r
+ }
+ > |
+ [a'8\mf( es'-3\> d' c' bes!-3 a] |
+ [g fis-3 e!-2 d-1 c'-4 \!a] |
+ [)bes32(\p a bes16] [d'8-5 bes-3 g-1] )g'4 |
+% r8 [d'-5( c bes a\pr g] |
+ r8 [d'-5( c bes a g] |
+ [)a-2 c'-4( a f] ) f'4 |
+% r8 [c'-5 bes a g\tr f] |
+ r8 [c'-5 bes a g f] |
+ [g-2 bes-4 a g fis-1 e-2] |
+ [f-3 d-1 f-2 a-3 d'-5 g-2] |
+ \multi 2 <
+ {
+ \stemup
+ [cis'32-4 b cis'16 e'8-5-"poco cresc." cis-3 a e' cis]
+ }
+ {
+ \stemdown
+ a4
+ }
+ >
+ \stemboth
+ [a8 e'-5 cis' a bes!-3 a] |
+ [g e'-5 cis'-3 g e'-5 cis'-3] |
+ [g-1 e'-5 cis' g a-3 g] |
+ [f-"dim." d'-5 bes f d' bes] |
+ [f d'-5 bes f d' bes] |
+ [fis-2-"dim." c'-5 a-3 fis-2 c'-5 a-3] |
+ [fis-2 c'-5 a-3 fis-2 c-5 a-3] |
+ [bes-4 g-1 fis-2 g-3 d-1 g-2] |
+ [bes-4 g-2 d-1 bes-5 g-3 d-1] |
+ [e-2\p g-4 fis-3 g-1 bes-4 g-2] |
+ [es-1 bes-4 g-2 es bes g] |
+ [cis-1 bes-4 g-2 cis bes g] |
+ [cis-1 bes-4 g-2 cis-1 a-5 g-4] |
+ [f-3 a f d a-5 f] |
+ [d-1 a-5 f-3 d-1 cis-2 d-1] |
+ [e-3\< g-5 e-3 'bes-1 g-5 e-3] |
+ ['bes-1 g-5 e-3 \!cis-2 'a-1 g-5] |
+ [f16-4\mf d-2 c-1 'bes-3] s4 s |
+% ugh
+% s1 |
+ s4 s4 s4 |
+ s4 s16 [d16-1-"m.d." f-2 a-4] [d-2-"m.g." f a] \stemup d'-1 |
+ [f' a'-4 f' d'] [f'-4 d' b d'-5] [gis-2 b a g] |
+ <g'!4.-5\f e' a> a'8-5
+ \multi 2 <
+ {
+ \stemup
+ f'4-4\> ~ | \![f'8 e'] [e'32-4 f' e'8. ~] [e'8 d'-3]
+ }
+ {
+ \stemdown
+ <d'4 a> r4 cis'-2
+ }
+ > |
+ \stemboth;
+ [d'8-4 c'!-3 a-1 d'-4 bes-2 g-1] |
+ [c'-5 a-3 fis-2 bes-4 g e ] |
+ [a-5 fis-"dim. e rall." d g-5 e cis-2] |
+ \multi 2 <
+ {
+ \stemup
+ <fis2-.-5\p 'a>
+ }
+ {
+ \stemdown
+ [d32( cis d8. ~] ) d2
+ }
+ > |
+ \bar "|.";
+}
+
+
+lh = \melodic{
+ \clef "bass";
+ \octave c;
+ [d32( cis )d8.] r4 r |
+ 'd4 r r |
+% d\mr r r |
+ d r r |
+ 'd4 r r |
+% d\mr r r |
+ d r r |
+ 'd4 r r |
+ [d8-2 'a-5 d-2 f-1 d-4 f-2] |
+ [a-1 f-4 a-2 d'-1 a-2 d'-1] |
+ gis4-3 r r |
+ e-4( )gis-2 e |
+ [a8-4 e'-1 c'-2 a-4 e'-1 c'-2 ] |
+ fis4-5 r r
+ d-4( ) fis d-5 |
+% g\mr-"(\textsharp)" r r f!8 |
+ g-"(\textsharp)" r r8 f! |
+ [e32 f e8.] r4 r |
+% f\pr r r8 e |
+ f r r8 e |
+ d4 r8 [f-1 e d] |
+ [e-2 d-3 cis-4 e-1 d-2 cis-3] |
+ d4-2( )c! 'b-4 |
+ 'a( )a a |
+ 'a( )a a |
+ 'a( )a a |
+ 'a( )a a |
+ 'b r r |
+ 'b-5( )b 'b |
+ 'a r r |
+ 'a-2( )d-1 'd |
+ 'g r r |
+ 'g( )g g |
+ 'g r r |
+ 'g( )g g |
+ 'a r r |
+ 'a( )a a |
+ 'a r r |
+ 'a( )a a |
+ 'cis r r |
+ 'cis( )cis 'cis |
+ 'd-4 s16
+ \stemdown
+ [g16-1-"m.g." f e] [f-2 a d-3 f] |
+ 'a
+ \stemup
+ [d-5-"m.d." c 'bes] 'a
+ \stemdown ['g-2 'f-"m.g." 'e] ['d 'f-4 'a-2 d-1] |
+ \stemup
+% [f-2\ped a]
+ [f-2-"Ped." a]
+ \stemdown
+% [d-4-"m.g." f-"cresc."] a s s8 s4\dep |
+ [d-4-"m.g." f-"cresc."] a s s8 s4-"*" |
+% ugh, whole rest has duration of one bar
+% r1 |
+ r4 r r |
+%{
+ ugh, 'forget' the 8 below:
+ [cis-3( e cis 'a] [d16-1 c 'b 'a] |
+ and lily dumps koor
+lilypond: ../flower/include/varray.hh:116: struct Rhythmic_grouping *& Array<Rhythmic_grouping *>::elem(int) const: Assertion `i >=0&&i<size_' failed.
+Aborted (core dumped)
+%}
+ [cis8-3( e cis 'a] [d16-1 c 'b 'a] |
+ [)'g8 g a-2( g-3 a-1 'a] |
+ )d4-3 d'-1 d |
+ d r r |
+ 'd( )d 'd |
+ 'd2. |
+ \bar "|.";
+}
+
+global = \melodic{
+ \meter 3/4;
+ \key bes;
+}
+
+\score{
+ % Moderato
+ % it would be nice to shut-off fingering...
+ \melodic \type Grandstaff <
+ <
+ \global
+ \rh
+ >
+ <
+ \global
+ \lh
+ >
+ >
+ \paper{
+ \paper_twenty
+ linewidth= 195.\mm;
+ }
+ \midi{
+ \tempo 4 = 90;
+ }
+}
diff --git a/mutopia/J.S.Bach/preludes-6.ly b/mutopia/J.S.Bach/preludes-6.ly
new file mode 100644
index 0000000000..14d1bf6fb5
--- /dev/null
+++ b/mutopia/J.S.Bach/preludes-6.ly
@@ -0,0 +1,128 @@
+\header{
+filename = "preludes-6.ly";
+title = "6";
+composer = "Johann Sebastian Bach (1685-1750)";
+enteredby = "jcn";
+copyright = "public domain";
+}
+
+\include "paper20.ly"
+
+one = \melodic{
+ \octave c';
+ \skip 4*4; |
+ \stemup
+ r4 d2-5( cis4-4 |
+ \stemboth
+ [)d16-5\mf a'-4( g' f'] [e' f'-4 cis'-2 d'-1]
+ [e32-3 d e8 f16] [d'8.-1 cis'16-3] |
+ \stemup
+ )cis'4\> ~ [cis16 a \!d'8 ~] d4 c-5 |
+ b2-4 ~ b4 a-5 ~ |
+ [a16 a-5 \stemup g! f] g4-4\< ~ g f-3 ~ |
+ [\!f16 a g f] [e16 g8.-5 ~] [g16 g-5 f-4 e-3] [d-1 f8.-4 ~] |
+ [f16 f-3 e d] b4 a-5 g-5 |
+ fis4-4 g r8\<-"rall." [g16-1( bes-2] r16 [bes-2 a-2 \!g-1] |
+ ) d'1-5
+}
+
+two = \melodic{
+ \octave c';
+ r16\p [d'-5( c'-4 bes-3] [a-2 bes-3 f-1 g-2]
+ [a32-3 g a8 bes16-1] [g8. f16-1] |
+ )f2 e2 |
+ \translator Staff=bass \octave c; \stemup
+ r4 a-1 bes-2 b-1 |
+ \translator Staff=treble \octave c'; \stemdown
+ r16 [b-3 a-1 g-2] [f8. f16-2] e2 ~ |
+ e2 ~ e4 ~ [e16 e-2 f! d-1] |
+ s4 [e32 d e8.~] e4 d4 ~ |
+ d4. [cis16-2 d-1] cis4 d-1 ~ |
+ d8 r r16 [e-2 f d] r16 [e-2 f d] r [d-1 e-3 cis] |
+ r16 [e-3 d-1 c!-2] ['bes! d8.] r8 e'4-5 |
+ fis1-2
+}
+
+three = \melodic{
+ \octave c;
+ \stemup
+ f2-1( e-2 |
+ [)d16 b'( c' bes] [a-4 bes-2 f-5 g-4]
+ [a32 g a8 bes16-2]
+ [g8.-4 f16-5] |
+ )f2-5 g4-4 gis |
+ a2-2 ~ [a16 a-1( g f] [e-4 f-2 c-5 d] |
+ [e32 d e8 f16] [d8.-4 c16-5] \stemboth )c4.-5 d8-4 |
+ e4 ~ [e16 f-2( e-3 d-4] [cis 'a 'b cis-3] [d-4 e-3 f-2 d-4] |
+ \textstyle "finger";
+ )'bes!2-"5\\_4" 'a ~ |
+ a a |
+ 'd cis-5 |
+ b1-2
+}
+
+four = \melodic{
+ \octave c;
+ d2-3 cis-4 |
+ \skip 4*16;
+ \stemup
+ b2-1 a-1 |
+ g a4. [gis16 a] |
+ gis2 <[g8 cis> <f-3 d-1]> e4-2 |
+ d4. [fis16-3 g-2] r16 b8.-1 ~ b4 |
+ \stemdown
+ d1-5
+}
+
+rh = \melodic{
+ \one
+ \multi 2 <
+ \one
+ \two
+ >
+ \bar "|.";
+}
+
+
+lh = \melodic{
+ \clef "bass";
+ \multi 2 <
+ \three
+ \four
+ >
+ \bar "|.";
+}
+
+
+global = \melodic{
+ \meter 4/4;
+ \key bes;
+}
+
+\score{
+ % Allegretto
+ % it would be nice to shut-off fingering...
+ \melodic \type Grandstaff <
+ \type Staff=treble <
+ \global
+% huh? try these iso directly!
+ \lh
+% \one
+% \two
+ >
+ \type Staff=bass <
+ \global
+ \rh
+% or try \two having here, iso above!
+% \three
+% \four
+ >
+ >
+ \paper{
+ \paper_twenty
+ linewidth= 195.\mm;
+ }
+ \midi{
+ \tempo 4 = 110;
+ }
+}
diff --git a/mutopia/J.S.Bach/preludes.tex b/mutopia/J.S.Bach/preludes.tex
index 39d19a95be..942bd2d55b 100644
--- a/mutopia/J.S.Bach/preludes.tex
+++ b/mutopia/J.S.Bach/preludes.tex
@@ -45,6 +45,10 @@
\piece{3}{preludes-3}{Semplice e non troppo legato}
\newpage
\piece{4}{preludes-4}{Allegretto}
+\newpage
+\piece{5}{preludes-5}{Moderato}
+\newpage
+\piece{6}{preludes-6}{Andante espressivo}
\end{document}