release: 1.1.43

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

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
index 100156c7d7bf31bcc0ce862ceb3ddcbeafcd039f..638f519953fa8617e3b8ed9449d0e6ecf74bbc5b 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
@@ -1,10 +1,10 @@
 % gigue-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }
@@ -16,10 +16,8 @@ d = { \slurdotted }
 % * slurs/ties in two different threads (like beams): urtext, and additionals
 % 
 
-% urg, Thread is gone, try Voice
-% gigue_notes = \type Thread = gigue \melodic \relative c {
-
-gigue_notes = \type Voice = gigue \melodic \relative c {
+gigue_notes = \context Staff \notes \relative c {
+       \context Voice=i
        a'8 |
        d,4 bes'8 | cis,4 g'8 | f16 e f g a8 |
        d,4 d'8 | e,16(f)g8 bes | c,16(d)e8 c' | a16 g a bes c a |
@@ -27,18 +25,18 @@ gigue_notes = \type Voice = gigue \melodic \relative c {
        f4-\trill a8 | b,()g' cis, | d f16( c bes )a | g8()es' a, |
        bes d16( a g )f | e!8()cis' bes' a g16( f e)d |
        %15
-       %\voiceone e(f g e f)d \onevoice e8()a,\comma c''! |
-       \voiceone e(f g e f)d \onevoice e8()a,^"\\sethuge{\\ \\ '}" c'! |
-       \voiceone c16(d es c d)a bes8 r bes |
+       %\stemup e(f g e f)d \stemboth e8()a,\comma c''! |
+       \stemup e(f g e f)d \stemboth e8()a,^"\\sethuge{\\ \\ '}" c'! |
+       \stemup c16(d es c d)a bes8 r bes |
        bes16(c d bes c)g a8 r a |
        %21
        b16()c d()b c()a | d()e f()d e()c | b()c d()b c()a | e'4 gis,8 |
-       a16()b c()a d()b  |
+       a16()b c()a d()b |
        a()b c()a d()b |
        %27
        a()b c()a d()b |
        a()b c()a d()b |
-       f'8 e16()d c()b \onevoice | 
+       f'8 e16()d c()b \stemboth | 
        e,, e''(d)c b()gis | a f(e)d e()cis | a4
        %33
        c'!8 |
@@ -50,37 +48,38 @@ gigue_notes = \type Voice = gigue \melodic \relative c {
        %45
        as(g)as fis g es' | d,8 g fis | g16 es(d)c d()bes | g4 bes'8
        % what about this?
-       \voiceone\stemdown e,!16(f)g e f d\onevoice
+       \stemup\stemdown e,!16(f)g e f d\stemboth
        c(d e) c d bes | a(bes)c a bes g | f4 a'8
        % what about this?
-       \voiceone\stemdown d,16(e)f d e c\onevoice bes(c)d bes c a 
+       \stemup\stemdown d,16(e)f d e c\stemboth bes(c)d bes c a 
        g16(a)bes g a f | e4 g'8 
        %57
        a,16(b cis d)e g-. | f(g a cis )d f, | e(f g a)bes d,-. |
        cis(d)e a, bes g 
-       \voiceone
+       \stemup
        d'()e f()d g()e |
        %62
        d()e f()d g()e |
        d()e f()d g()e |
        d()e f()d g()e |
-       \onevoice
+       \stemboth
        cis bes'(a g f)e | f, a' g f e cis |
        %67
        d bes a g a f | d a' d e f d | 
-       \voiceone es()f g()es f()d | g()a bes()g a()f es()f g()es f()d |
+       \stemup es()f g()es f()d | g()a bes()g a()f es()f g()es f()d |
        %72
-       cis'4 \onevoice d16()c | bes(a g f e)d | cis(b a g f)e | d f a d f a |
+       cis'4 \stemboth d16()c | bes(a g f e)d | cis(b a g f)e | d f a d f a |
        d4
 }
 
-gigue_b = \melodic \relative c {
-       \voicetwo 
+gigue_b = \context Staff \notes \relative c {
+       \context Voice=ii
+       \stemdown
        s8
        s4.*14
-       a4. | s d | [d8 g, d'] | e4. | [f8 f, f'] |
+       a4. | s d | d8 g, d' | e4. | f8 f, f' |
        %21
-       [d d d] [d d d] [d d d] |
+       d d d  d d d  d d d |
        % one could type r here...
        d4 s8 | <e c> s s | d s s | e s s | f s s | gis s4 |
        s4. s s4 
@@ -93,53 +92,18 @@ gigue_b = \melodic \relative c {
        s4.*7
        <a,8 f> s s g s s a s s bes s s
        s4.*4
-       [g8 g g] [g g g] [g g g] 
+       g8 g g  g g g  g g g 
        %72
        <g4 e'>
 }
 
-gb = \melodic { [s16 s s s s s] }
-
-% urg, Thread is gone, try Voice
-% gigue_beams = \type Thread = gigue \melodic{
-gigue_beams = \type Voice = gigue \melodic{
-       s8 |
-       s4. s4. \gb 
-       s4. \gb \gb \gb 
-       %8
-       s4. 
-       \gb \gb \gb \gb \gb
-       %14
-       \gb \gb \gb \gb s4.
-       %19
-       \gb s4. \gb \gb \gb
-       %24
-       s4.
-       \gb \gb \gb \gb \gb \gb \gb
-       s4 s8 
-       %33
-       s4. s4.
-       \gb s4. \gb \gb 
-       %39
-       \gb s4.
-       \gb \gb \gb \gb \gb \gb \gb
-       %48
-       s4. \gb \gb \gb 
-       s4. \gb \gb \gb s4.
-       \gb \gb \gb \gb \gb
-       \gb \gb \gb \gb \gb
-       \gb \gb \gb \gb \gb
-       s4 [s16 s]
-       \gb \gb \gb 
-}
-
-gigue_a = \type Voice \melodic<
+gigue_a = \context Voice \notes<
        \$gigue_notes
-       \$gigue_beams
 >
 
-gigue = \melodic<
+gigue = \notes<
        \$gigue_a
        \$gigue_b
 >
 
+\version "1.0.19";