patch::: 1.2.13.jcn4

[lilypond.git] / mutopia / J.S.Bach / Petites-Preludes / preludes-3.lym4

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4 b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
index 302a8adfb9271de5914145470a6a9b13b47a9185..b2f91414091da53b9e2b78dc1c6f09230a437d3a 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.lym4
@@ -7,8 +7,11 @@ define(t, r16 [$1$4 $2 $3] [$2 $1 $2 $6$1] r $1$7 r $5$1 |)
 
 \header{
 filename =      "preludes-3.ly";
+%
+% page 16
+%
 % Pr"aludum in C Moll f"ur Laute
-% blz 16
+%
 % Six Petits Preludes`
 % Collection Johann Peter Kellner
 % ca 1703 - 1707
@@ -17,11 +20,12 @@ enteredby =  "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.14";
+\version "1.1.60";
 
 
-one = \notes  \transpose c`` {
-       \textstyle "italic";
+upper = \context Staff \notes \transpose c'' {
+       \context Voice=i
+       \property Voice . textstyle = "italic"
 %#     s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@)
        t(c,es,g,^\p(\<@,\!,^)\!@,\>)
 %#     s(c es g ^(@ ^@ ^)@)
@@ -47,12 +51,14 @@ one = \notes  \transpose c`` {
 
 
 %#     s(c fis a -"poco a poco cresc.")
-       t(c,fis,a,-"poco a poco cresc.")
+%#     t(c,fis,a,-"poco a poco cresc.")
+       s(c fis a)
        s(d g bes)
-       s(d fis c`)
+       s(d fis c')
 
        s(cis g bes)
-       s(c es a !-"dim.")
+%#     s(c es a !-"dim.")
+       s(c es a !)
        s(bes` e g)
        s(a` c g)
 
@@ -66,24 +72,25 @@ one = \notes  \transpose c`` {
        s(fis` a` c)
        r16\p [g` a` c] [b` g` b` g`] r g` r g`
 %#     s(a` c fis -"poco cresc.")
-       t(a`,c,fis,-"poco cresc.")
+%#     t(a`,c,fis,-"poco cresc.")
+       s(a` c fis)
        s(c fis a)
        s(b` d g)
-       s(b` d f -"dim.")
+%#     s(b` d f -"dim.")
+       s(b` d f)
        s(g` c es)
        s(fis` c es)
        s(fis` c es)
-       r16 [g`(\< b` d] [b` g` b` d] [es c a` )\!fis] |
-       <
-               {\voiceone g2.-\fermata\mf}
-               {\voicetwo <b`2. d>}
+       r16 [g`(\< b` d] [b` g` b` d] [es c a` \!fis] |
+       \context Staff <
+               \context Voice=i {\stemup ) g2.-\fermata\mf}
+               \context Voice=ii {\stemdown <b`2. d>}
        >
-       \onevoice
+       \stemboth
        \bar "|.";
 }
 
-two = \notes{
-       \clef bass;
+lower = \context Staff \notes{
        % c4 r [g8-.(\ped )es-.\*] |
        c4 r [g8-.( )es-.] |
        c4 r [g8-.( )es-.] |
@@ -126,7 +133,7 @@ two = \notes{
 
        d`4 r [bes`8 g`] |
        d`4 r [es8 c] |
-       d`4 r [d8 a] |
+       d`4 r [d8 a`] |
 
        g`4 r [es8 c] |
        g`4 r [d8 b`] |
@@ -145,35 +152,27 @@ two = \notes{
 }
 
 global  = \notes{
-       \meter 3/4;
+       \time 3/4;
        \key es;
 }
 
-treble_staff = \type Staff = treble <
-       \global
-       \one
->
-
-bass_staff = \type Staff = bass <
-% bass = Staff <
-       \clef "bass";
-       \global
-       \two
->
-
-grand_staff = \type GrandStaff <
-       \treble_staff
-       \bass_staff
->
-
-a4 = \paper{
-       linewidth= 193.\mm;
-}
-
 \score{
        % Semplice e non troppo legato
-       \grand_staff
-       \paper{ \a4 }
+       \context GrandStaff <
+               \context Staff = upper <
+                       \global
+                       \upper
+               >
+               \context Staff = lower <
+                       \global
+                       \clef "bass";
+                       \lower
+               >
+       >
+       \paper{
+               \include "preludes-paper.ly";
+               gourlay_maxmeasures = 4.0;
+       }
        \midi{ \tempo 4 = 100; }
        \header{
                opus =  "BWV 999";