release: 1.3.94

[lilypond.git] / mutopia / J.S.Bach / Solo-Cello-Suites / menuetto-urtext.ly

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
index da320dce164a639844667c8728aaece5038f0a45..2c6fe350b47afc8e335551ec259bc076e3ece50d 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
@@ -18,24 +18,23 @@ menuetto_i_a = \context Staff \notes \relative c {
        %7
        <a f> <d f, bes,> <e g, g,> |
        <cis2. e, a,> |
-       <a2\f e'> d8( e16 )f |
-       \slurdotted
-       e8( d cis )e a,()g |
-       a4 ~ d cis |
-       g'8( f e )f d() c |
+       <a2\f e'> d8 e16 f |
+       e8 d cis e a, g |
+       a4 d cis |
+       g'8 f e f d c |
        %13
        bes2 c4 |
        a8 g a f <d'4 e, bes> |
        <c f, a,> bes8 a g a |
-       f8( e )f a g bes |
+       f8 e f a g bes |
        <a2^\trill fis> bes4 |
        c8 bes c a fis4^\trill |
        %19
 % dispute
 %      <bes,4 g' d'> <c, g' c> < d,8 bes'(> )a |
-       <d'4 g, bes,> <c g c,> bes8()a |
-       c8( bes a )bes g()bes |
-       d4 ~ cis d |
+       <d'4 g, bes,> <c g c,> bes8 a |
+       c8 bes a bes g bes |
+       d4 cis d |
        g,8 f g e f4 |
        g,8 g' <{e4.^\trill d8 } a4.> ~ |
        <d2. a d,> |
@@ -43,21 +42,20 @@ menuetto_i_a = \context Staff \notes \relative c {
 
 menuetto_i_b = \context Staff \notes \relative c {
        \context Voice = ii
-       \stemdown
-       \slurdotted
+       \stemDown
        \skip 2.*1; |
        <e8 c> \skip 8*5; |
        \skip 2.*1; |
        a,8 \skip 8*5; |
        \skip 2.*1; |
        e'8 \skip 8*5; |
-       \stemboth
+       \stemBoth
        s2.*2 |
        s2.
        g8 \skip 8*5; |
        f2 e4
        d8 \skip 8*5; |
-       g4 ~ f e
+       g4 () f e
        f8 \skip 8*5; |
        \skip 2.*3; |
        es8 \skip 8*3; d4 |
@@ -73,24 +71,24 @@ menuetto_i_b = \context Staff \notes \relative c {
 % UGH, fix this like in sarabande
 menuetto_i_a_voice_urg = \notes{
        \context Voice = i
-       \skip 2.*1; \stemup
-       \skip 2.*1; \stemboth
-       \skip 2.*1; \stemup
-       \skip 2.*1; \stemboth
-       \skip 2.*1; \stemup
-       \skip 2.*1; \stemboth
-       \skip 2.*3; \stemup
-       \skip 2.*1; \stemup
+       \skip 2.*1; \stemUp
+       \skip 2.*1; \stemBoth
+       \skip 2.*1; \stemUp
+       \skip 2.*1; \stemBoth
+       \skip 2.*1; \stemUp
+       \skip 2.*1; \stemBoth
+       \skip 2.*3; \stemUp
+       \skip 2.*1; \stemUp
        \skip 2.*3;
-       \skip 4*2; \stemboth
-       \skip 4*2; \stemup
-       \skip2.*1; \stemup
-       \skip 4*2; \stemboth
-       \skip2.*1; \stemup
-       \skip 2.*1; \stemboth
-       \skip 2*1; \stemup
+       \skip 4*2; \stemBoth
+       \skip 4*2; \stemUp
+       \skip2.*1; \stemUp
+       \skip 4*2; \stemBoth
+       \skip2.*1; \stemUp
+       \skip 2.*1; \stemBoth
+       \skip 2*1; \stemUp
        \skip 4*1;
-       \skip 2.*4; \stemboth
+       \skip 2.*4; \stemBoth
        \skip 2.*1;
 }
 
@@ -101,9 +99,9 @@ menuetto_i_a_voice_urg_urg = \notes<
 
 menuetto_i_b_voice_urg = \notes{
        \context Voice=ii
-       \stemdown
+       \stemDown
        % urg urg, huh?
-       \skip 2.*8; \stemdown
+       \skip 2.*8; \stemDown
 }
 
 menuetto_i_b_voice_urg_urg = \notes<
@@ -112,34 +110,30 @@ menuetto_i_b_voice_urg_urg = \notes<
 >
 
 menuetto_i = \context Staff \notes<
-       { \$menuetto_i_a_voice_urg_urg }
-       { \$menuetto_i_b_voice_urg_urg }
+       \repeat "volta" 2 { \$menuetto_i_a_voice_urg_urg }
+       \repeat "volta" 2 { \$menuetto_i_b_voice_urg_urg }
 >
 
 menuetto_ii = \context Staff\notes \relative c {
        \context Voice=i
-       \slurdotted
-       fis4^\trill d8( e fis )g |
+       fis4^\trill d8 e fis g |
        a4 fis, a' |
-       g,8()b e4 g |
-       \slurnormal
+       g,8 b e4 g |
        d8( cis )b cis a g |
        % ugh, forcing knee
        % Lily's not yet smart enough to decide for herself.
-       \stemup fis \stemboth d''( cis b a )g |
+       \stemUp fis \stemBoth d''( cis b a )g |
        b( a g fis e )d |
        %7
        cis d g4 fis8( g16 )a |
-       <\stemdown a,2. \stemup e'> |
-       \stemboth
+       <\stemDown a,2. \stemUp e'> |
+       \stemBoth
        cis4^\prall e8( d cis )b |
        cis4 g, cis' |
        fis,8()a d4 fis |
-       b,8()a g()fis \slurdotted g()b |
-       \slurnormal
+       b,8()a g()fis g b |
        %13
        e, d'( cis )b cis()ais |
-       % check slur! d, b' a! g fis )e |
        d,( b' a! g fis )e |
        g( fis e d cis )d |
        b( cis d e fis )g |
@@ -148,12 +142,10 @@ menuetto_ii = \context Staff\notes \relative c {
        %19
        b8()a c( b a )g |
        fis() g a()fis g()e |
-       \slurdotted
-       cis4^\trill a8( b cis )d |
-       \slurnormal
+       cis4^\trill a8 b cis d |
        e( fis g )b a4 |
        g8()fis e()d e()cis |
        d2.
 }
 
-\version "1.0.20";
+\version "1.3.93";