From: fred <fred>
Date: Sun, 24 Mar 2002 20:11:48 +0000 (+0000)
Subject: lilypond-0.1.64
X-Git-Tag: release/1.5.59~3096
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=75ba7d0371aac3f56027b270f55c05591a8b2755;p=lilypond.git
lilypond-0.1.64
---
diff --git a/mutopia/J.S.Bach/preludes-1.ly b/mutopia/J.S.Bach/preludes-1.ly
index 124b1b8019..9bb0f07040 100644
--- a/mutopia/J.S.Bach/preludes-1.ly
+++ b/mutopia/J.S.Bach/preludes-1.ly
@@ -3,7 +3,8 @@ filename = "preludes-1.ly";
% mmm
title = "DOUZE PETITES PR\'ELUDES";
opus = "BWV 924";
-piece = "\\numfont 1";
+% piece = "\\numfont 1";
+piece = "1";
% blz 1
% Clavierb"uchlein f"ur W. Fr. Bach
% Clav. W. Fr. Bach: 2-Praeambulum I
@@ -13,56 +14,55 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.14";
one = \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] |
+ 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
<
- { \voiceone; f,4 r s }
- { \voicetwo; <''g4 d,> r s }
+ { \voiceone f,4 r s }
+ { \voicetwo <g,,4 d,> r s }
>
- \onevoice;
+ \onevoice
% ugh beam across staffs, slur starts at lower staff
- r16 [''g-1( b,, d,] |
- \voiceone;
- )''b s4 ['g16-1( b,-2 d] )'b s s s [f-2 g-3 b-5 f-2] |
- \onevoice;
+ r16 [g,,-1( b,, d,] |
+ \voiceone
+ )b,, s4 [g,16-1( b,-2 d] )b, s s s [f-2 g-3 b-5 f-2] |
+ \onevoice
[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]
+ [)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]
<
- { \voiceone; r [c8 b,16] }
- { \voicetwo; ['d8 f,-2] }
+ { \voiceone r [c8 b,16] }
+ { \voicetwo [d,8 f,-2] }
>
- \onevoice; |
+ \onevoice |
<c1\mf g, e,>
\bar "|.";
}
@@ -79,14 +79,14 @@ two = \melodic{
g-\mordent^"(\\textsharp)" g, g-\mordent g, |
g-\mordent g, g-\mordent g, |
% ugh, f should be at upper staff
- g-\mordent r r16 ['g-5( b,-4 d] )f-1 s s s |
+ g-\mordent 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]
% huh, can't violin anymore (see BUGS)
s [g-5( b-4 d'-2] )f'-1 s s s s [g'-4 b'-2 d''-1]
s s s s \clef bass; |
<
- { \voiceone; g1 ~ g ~ g ~ g ~ g ~ g ~ g }
- { \voicetwo; g,1 ~ g, ~ g, ~ g, ~ g, ~ g, ~ g, }
+ { \voiceone g1 ~ g ~ g ~ g ~ g ~ g ~ g }
+ { \voicetwo g,1 ~ g, ~ g, ~ g, ~ g, ~ g, ~ g, }
>
<c1 c,>
\bar "|.";
diff --git a/mutopia/J.S.Bach/preludes-2.ly b/mutopia/J.S.Bach/preludes-2.ly
index ac159f2903..8f4dca4506 100644
--- a/mutopia/J.S.Bach/preludes-2.ly
+++ b/mutopia/J.S.Bach/preludes-2.ly
@@ -2,7 +2,8 @@
filename = "preludes-2.ly";
title = "2";
opus = "BWV 939";
-piece = "\\numfont 2";
+% urg?? piece = "\\numfont 2";
+piece = "2";
% blz 10
%
% Six Petits Pr'eludes
@@ -13,7 +14,6 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.14";
one = \melodic{
\octave c'';
\textstyle "italic";
@@ -21,65 +21,65 @@ one = \melodic{
[)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] |
<
- {\voiceone )e2-4\f r4 e-5 }
- {\voicetwo <c2 g,> r4 <c g,> }
+ {\voiceone )e2-4\f r4 e-5 }
+ {\voicetwo <c2 g,> r4 <c g,> }
>
- \onevoice |
+ \onevoice |
<
- { \voiceone d2-4 r4 d-4 }
- { \voicetwo <c2 a,> r4 <c a,> }
+ { \voiceone d2-4 r4 d-4 }
+ { \voicetwo <c2 a,> r4 <c a,> }
>
- \onevoice |
+ \onevoice |
<
- { \voiceone d8 }
- { \voicetwo <b,8 g,> }
+ { \voiceone d8 }
+ { \voicetwo <b,8 g,> }
>
- \onevoice
+ \onevoice
[g,8-1\mf( b,-2 d-4]
<
- { \voiceone )b,4 e-5 }
- { \voicetwo g,4 b, }
+ { \voiceone )b,4 e-5 }
+ { \voicetwo g,4 b, }
>
- \onevoice |
+ \onevoice |
<
- { \voiceone c2 r4 < {c-5 ~ c8} {a,4 ~ a,8} > }
- { \voicetwo c2 r4 e,4 ~ e,8 }
+ { \voiceone c2 r4 < {c-5 ~ c8} {a,4 ~ a,8} > }
+ { \voicetwo c2 r4 e,4 ~ e,8 }
>
- \onevoice
+ \onevoice
[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] |
<
- { \voiceone )g2-5\f }
- { \voicetwo <d2 b,> }
+ { \voiceone )g2-5\f }
+ { \voicetwo <d2 b,> }
>
- \onevoice
+ \onevoice
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
<
- { \voiceone c2-5 b,4-4 }
- { \voicetwo g,2-2 d,4-1 }
+ { \voiceone c2-5 b,4-4 }
+ { \voicetwo g,2-2 d,4-1 }
>
- \onevoice
+ \onevoice
<
- { \voiceone c1^5 }
- { \voicetwo e,1_1}
+ { \voiceone c1^5 }
+ { \voicetwo e,1_1}
>
- \onevoice
+ \onevoice
\bar "|.";
}
two = \melodic{
\octave c;
<
- { \voiceone c1 ~ | c ~ | c }
- { \voicetwo c,1 ~ | c, ~ | c, }
+ { \voiceone c1 ~ | c ~ | c }
+ { \voicetwo c,1 ~ | c, ~ | c, }
>
- \onevoice |
+ \onevoice |
r8 [c-5( e-3 g-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( |
diff --git a/mutopia/J.S.Bach/preludes-4.ly b/mutopia/J.S.Bach/preludes-4.ly
index c9098c7b19..7ebf40661f 100644
--- a/mutopia/J.S.Bach/preludes-4.ly
+++ b/mutopia/J.S.Bach/preludes-4.ly
@@ -2,7 +2,8 @@
filename = "preludes-4.ly";
title = "4";
opus = "BWV 925";
-piece = "\\numfont 4";
+% piece = "\\numfont 4";
+piece = "4";
% blz 8
% Clavierb"uchlein f"ur W. Fr. Bach
% Clav. W. Fr. Bach: 27-Praeludium ex d neutral
@@ -11,19 +12,18 @@ composer = "Johann Sebastian Bach (1685-1750)";
enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.14";
one = \melodic{
\octave c'';
\textstyle "italic";
r16\p_"legato"
\textstyle "finger";
- ['d-1( fis,-3 d,-1] ['a-2 b,-3 cis-4 a,-3]
+ [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;
+ \stemup
)cis4-2 fis-5 ~ [fis8 fis-4] e4-3 ~ |
- e16\< \stemboth ['a16( cis a,] [d-2 e fis d-1]
+ e16\< \stemboth [a,16( cis a,] [d-2 e fis d-1]
[g-3 fis g a-4] [g-3 b a \!g] |
\stemup
)fis4-"2\\_3" [e8-2 a-5] <fis4-4 d-2> <gis-5 e-3> |
@@ -33,30 +33,30 @@ one = \melodic{
\textstyle "italic";
[fis_"dim." e fis-3 g] [fis-3 a-5 g fis]
\textstyle "finger";
- e4-"2\\_5" ~ e16 ['e( fis, g, ] |
+ e4-"2\\_5" ~ e16 [e,( fis, g, ] |
\textstyle "italic";
- ['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,] |
+ [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
+ )fis,4\p
\skip 4*7; |
\textstyle "finger";
d4.\mf cis8-"4\\_5" ~ cis b,4-5 a,8-"4\\_5" ~ |
\textstyle "italic";
- a, g,4-5 fis,8-4 ~ ['fis16 fis,-4-"dim." e,-3 d,-2]
+ a, g,4-5 fis,8-4 ~ [fis,16 fis,-4-"dim." e,-3 d,-2]
\textstyle "finger";
e,4-"3\\_5" ~ |
- ['e16 e,-5 d, cis,] d,4-5 ~ ['d16 d,-5 cis, b,,] cis,4-5 |
+ [e,16 e,-5 d, cis,] d,4-5 ~ [d,16 d,-5 cis, b,,] cis,4-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,] ['fis8-\prall e,16-4 d,-3]
- ['d8. e,16~] ['e d,8 cis,16] |
+ [fis,,16-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,] [fis,8-\prall e,16-4 d,-3]
+ [d,8. e,16~] [e, d,8 cis,16] |
\stemup
- r16 ['d-1\< fis, d,] ['g a, b, g,-1] [c-3 b, c d] [c e d-4 \!c] |
- b,4-5 a, ~ ['a8 g,-5 ~] ['g16 fis,8-4 e,16-3] |
- ['fis8-4 e,-5~] ['e d,-5~] d,4 cis,-4 |
- d,2\p-"rall." ~ ['d16 a,,-2( b,,-3 cis,-4] )'d4-5 |
+ r16 [d,-1\< fis, d,] [g, a, b, g,-1] [c-3 b, c d] [c e d-4 \!c] |
+ b,4-5 a, ~ [a,8 g,-5 ~] [g,16 fis,8-4 e,16-3] |
+ [fis,8-4 e,-5~] [e, d,-5~] d,4 cis,-4 |
+ d,2\p-"rall." ~ [d,16 a,,-2( b,,-3 cis,-4] )d,4-5 |
\bar "|.";
}
@@ -65,7 +65,7 @@ two = \melodic{
\textstyle "finger";
% ugh: koor
% \translator Staff=bass \octave c; \stemup
-% \stemup;
+% \stemup
fis4-1( e8-2 a4 a4 gis8-2 |
) a8
\translator Staff=treble \octave c''; \stemdown
@@ -84,10 +84,10 @@ two = \melodic{
\translator Staff=treble \octave c''; \stemdown
d,4
\stemboth
- r16 [''b-1\< d,-2 b,,~] <'g4-5 e,-3 b,,>
- r16 ['cis-1 e,-2 \!'cis~] |
- <'a4-5 fis,-3 cis,> r16 ['d-1 fis,-2 d,~] <'b4-5 g,-3 d,>
- r16 ['fis-1 a, fis,~] |
+ r16 [b,,-1\< d,-2 b,,~] <g,4-5 e,-3 b,,>
+ r16 [cis,-1 e,-2 \!cis,~] |
+ <a,4-5 fis,-3 cis,> r16 [d,-1 fis,-2 d,~] <b,4-5 g,-3 d,>
+ r16 [fis,-1 a, fis,~] |
\stemdown
fis,4 e, d, cis, |
b,, a,, b,,4. b,,8 |
@@ -96,21 +96,21 @@ two = \melodic{
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
- d,8.-1 ~ ['d8 c,] d,4 [''a8 g,,] |
+ d,8.-1 ~ [d,8 c,] d,4 [a,,8 g,,] |
\translator Staff=bass \octave c; \stemup
[fis'8 c'-1] b4-1 \stemdown <a
\translator Staff=treble \octave c''; \stemdown
a,,4.-2>
\stemdown
a,8~ |
- ['a g,-3~] ['g16 e, fis,8~] ['fis16 d,8.~] ['d8. cis,!16] |
+ [a, g,-3~] [g,16 e, fis,8~] [fis,16 d,8.~] [d,8. cis,!16] |
\translator Staff=bass \octave c; \stemup
% <[d'8-2 a-1> <a~ g]> <a4 [fis16-2> e-1 fis-2 d-1]
<
- { \voiceone; [d'8-2 a~] a4 }
- { \voicethree; [a8-1 g] [fis16-2 e-1 fis-2 d-1] }
+ { \voiceone [d'8-2 a~] a4 }
+ { \voicethree [a8-1 g] [fis16-2 e-1 fis-2 d-1] }
>
- \voiceone;
+ \voiceone
[g-1 fis-2 g-1 a-2] [g-1 b-3 a-2 g-1 ~] |
[g g-1 fis-2 e-1] fis4-2 ~ fis2
\bar "|.";
@@ -118,9 +118,9 @@ two = \melodic{
three = \melodic{
\octave c;
-% \stemdown;
+% \stemdown
d4-3 c-4 b, e-3 |
- a16 ['a-5\mf( cis-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 cis'-2 a-4]
@@ -133,27 +133,27 @@ three = \melodic{
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,]
+ r16 [d,16-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,] |
+ )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 g,16-5] a,4-4 |
+ [g8 e-3] \stemdown [a a,] [b,8.-4 g,16-5] a,4-4 |
[d8-5 a-2~] [a g-3~] [g g-3] fis4-4 |
\stemup
r16 [g-2 b-1 g-3] [d'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 |
+ r16 [a,-2 cis!-1 a-2] [d-1 e fis d] [e8-1 d-2] [e-1 a,-2] |
+ [d a,-2~] [a,16 a,-2 b, cis-2] d2 |
}
four = \melodic{
\skip 4*36;
\octave c';
-% \stemup;
+% \stemup
% \property Voice.hshift = 1
a2 fis |
d
diff --git a/mutopia/J.S.Bach/preludes-5.ly b/mutopia/J.S.Bach/preludes-5.ly
index 3e1f0a394a..2584662853 100644
--- a/mutopia/J.S.Bach/preludes-5.ly
+++ b/mutopia/J.S.Bach/preludes-5.ly
@@ -1,7 +1,8 @@
\header{
filename = "preludes-5.ly";
title = "5";
-piece = "\\numfont 5";
+% piece = "\\numfont 5";
+piece = "5";
opus = "BWV 926";
% blz 2
% Clavierb"uchlein f"ur W. Fr. Bach
@@ -12,7 +13,6 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.14";
one = \melodic{
\octave c';
\textstyle "italic";
@@ -28,15 +28,15 @@ one = \melodic{
[a gis-3 fis e d'-5 \!b-2] |
<
{
- \voiceone;
+ \voiceone
\textstyle "roman";
c'4-\mordent^"(\\textsharp)"\p r r |
c'4-\mordent^"(\\textsharp)" r r
\textstyle "italic";
}
- { \voicetwo; a4 r r | a4 r r }
+ { \voicetwo a4 r r | a4 r r }
> |
- \onevoice;
+ \onevoice
[a'8\mf( es'-3\> d' c' bes!-3 a] |
[g fis-3 e!-2 d-1 c'-4 \!a] |
[)bes8-\mordent\p( d'8-5 bes-3 g-1] )g'4 |
@@ -47,13 +47,13 @@ one = \melodic{
[f-3 d-1 f-2 a-3 d'-5 g-2] |
<
{
- \voiceone;
+ \voiceone
% ... textnatural
[cis'8-\prall e'8-5-"poco cresc." cis'-3 a e' cis']
}
- { \voicetwo; a4 }
+ { \voicetwo a4 }
>
- \onevoice;
+ \onevoice
[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] |
@@ -70,7 +70,7 @@ one = \melodic{
[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] |
+ [bes,-1 g-5 e-3 \!cis-2 a,-1 g-5] |
[f16-4\mf d-2 c-1 bes,-3] \stemup a,-2 s16 s8 s4 |
% ugh
% s1 |
@@ -81,18 +81,18 @@ one = \melodic{
<g'!4.-5\f e' a> a'8-5
<
{
- \voiceone;
+ \voiceone
f'4-4\> ~ | \![f'8 e'] [e'32-4 f' e'8. ~] [e'8 d'-3]
}
- { \voicetwo; <d'4 a> r4 cis'-2 }
+ { \voicetwo <d'4 a> r4 cis'-2 }
> |
- \onevoice;
+ \onevoice
[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] |
<
- { \voiceone; <fis2-.-5\p a,> }
- { \voicetwo; [d32( cis d8. ~] ) d2 }
+ { \voiceone <fis2-.-5\p a,> }
+ { \voicetwo [d32( cis d8. ~] ) d2 }
> |
\bar "|.";
}
@@ -149,7 +149,7 @@ two = \melodic{
a,
\stemup
[d-5-"m.d." c bes,] a,
- \stemdown ['g-2 f,-"m.g." e,] ['d f,-4 a,-2 d-1] |
+ \stemdown [g,-2 f,-"m.g." e,] [d, f,-4 a,-2 d-1] |
\stemup
% [f-2\ped a]
[f-2-"Ped." a]
@@ -168,7 +168,7 @@ lilypond: ../flower/include/varray.hh:116: struct Rhythmic_grouping *& Array<Rhy
Aborted (core dumped)
%}
[cis8-3( e cis a,] [d16-1 c bes, a,] |
- [)'g8 g a-2( g-3 a-1 a,] |
+ [)g,8 g a-2( g-3 a-1 a,] |
)d4-3 d'-1 d |
d r r |
d,( )d d, |
diff --git a/mutopia/J.S.Bach/preludes-6.ly b/mutopia/J.S.Bach/preludes-6.ly
index b38fd5144e..2a23c20d43 100644
--- a/mutopia/J.S.Bach/preludes-6.ly
+++ b/mutopia/J.S.Bach/preludes-6.ly
@@ -1,7 +1,8 @@
\header{
filename = "preludes-6.ly";
title = "6";
-piece = "\\numfont 5";
+% piece = "\\numfont 5";
+piece = "5";
opus = "BWV 940";
% blz 11
% Six Petits Pr'eludes
@@ -12,7 +13,6 @@ enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.14";
one = \melodic{
\octave c';
\skip 4*4; |
@@ -46,7 +46,7 @@ two = \melodic{
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.] s4 r16\> [bes-2 a-2 \!g-1] |
+ r16 [e-3 d-1 c!-2] [bes,! d8.] s4 r16\> [bes-2 a-2 \!g-1] |
fis1-2
}
@@ -54,7 +54,7 @@ three = \melodic{
\octave c;
\stemup
f2-1( e-2 |
- \stemboth;
+ \stemboth
[)d16 d'( c' bes] [a-4 bes-2 f-5 g-4]
[a32 g a8 bes16-2]
[g8.-4 f16-5] |
@@ -64,7 +64,7 @@ three = \melodic{
\stemdown
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, ~ |
+ )bes,!2-"5\\_4" a, ~ |
a, a, |
d, cis-5 |
a1-2
@@ -73,7 +73,7 @@ three = \melodic{
four = \melodic{
\octave c;
- \stemdown;
+ \stemdown
d2-3 cis-4 |
\skip 4*12;
\translator Staff=treble \octave c'; \stemup \property Voice.hshift = 1