release: 1.2.14

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

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
index b00f4aafd2230590f6c23396e717a72de121699d..614ddd16171f8cd07c591d4784a9d475c89a0231 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
@@ -1,23 +1,7 @@
-\header{
-filename =      "menuetto-viola.ly";
-title =         "Solo Cello Suites";
-subtitle = "Suite II";
-% piece = "Menuetto I";
-description =   "Transcribed for Viola";
-source =        "?";
-% opus =        "BWV 1008 no. 5";
-opus =  "";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "JCN";
-copyright =     "public domain";
-}
 
-%{
- Tested Features:breaking algorithm, chords, multivoice, accents, 
- dotted slurs
-%}
 
-\version "1.0.10";
+
+\version "1.2.0";
 
 \include "menuetto-urtext.ly";
 
@@ -25,19 +9,22 @@ menuetto_i_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
-       \skip 2.*8;
-       \bar ":|:";
-       \clef violin;
-       \skip 2.*1;
-       \slurdotted
-       \skip 2.*3;
-       \clef alto;
-       \skip 2.*11;
-       s2._"Fine"
-       \bar ":|";
+       \repeat "volta" 2 {
+               \skip 2.*8;
+               \clef violin;
+               \skip 2.*1;
+       } \repeat "volta" 2 {
+               \slurdotted
+               \skip 2.*3;
+               \clef alto;
+               \skip 2.*11;
+               \property Voice.textEmptyDimension = 1
+               s2._"Fine"
+       }
 }
 
 menuetto_i_viola_scripts = \notes{
+       \context Voice=i
        s2.
        s8^"~"^1_2_4 s8*5
        s2.*5
@@ -52,7 +39,7 @@ menuetto_i_viola_scripts = \notes{
        s4-\downbow s4-\upbow
 }
 
-menuetto_i_viola_staff = \type Staff <
+menuetto_i_viola_staff = \context Staff <
        \notes \transpose c' \$menuetto_i
        \$menuetto_i_viola_global
 %      \$menuetto_i_viola_scripts
@@ -60,25 +47,36 @@ menuetto_i_viola_staff = \type Staff <
 
 \score{
        \$menuetto_i_viola_staff
-       \include "scs-paper.ly";
+       \paper{
+               \include "scs-paper.ly";
+               gourlay_maxmeasures = 7.0;
+               \translator{
+                       \VoiceContext
+                       beamAutoEnd_8 = "3/4";
+               }
+       }
        \midi{ \tempo 4 = 110; }
-       \header{ piece = "Menuetto I"; }
+       \header{
+       opus= "" ; 
+       piece ="Menuetto I"; }
 }
 
 menuetto_ii_viola_global = \notes{
        \time 3/4;
        \key D;
        \clef alto;
-       \skip 2.*8;
-       \bar ":|:";
-       \skip 2.*1;
-       \slurdotted
-       \skip 2.*14;
-       s2._"Menuetto I da Capo"
-       \bar ":|";
+       \repeat "volta" 2 {
+               \skip 2.*8;
+       } \repeat "volta" 2 {
+               \skip 2.*1;
+               \slurdotted
+               \skip 2.*14;
+               \property Voice.textEmptyDimension = 1
+               s2._"Menuetto I da Capo"
+       }
 }
 
-menuetto_ii_viola_staff = \type Staff <
+menuetto_ii_viola_staff = \context Staff <
        \notes \transpose c' \$menuetto_ii
        \$menuetto_ii_viola_global
 %      \$menuetto_ii_viola_scripts
@@ -86,8 +84,15 @@ menuetto_ii_viola_staff = \type Staff <
 
 \score{
        \$menuetto_ii_viola_staff
-       \include "scs-paper.ly";
+       \paper{
+               \translator{
+                       \VoiceContext
+                       beamAutoEnd_8 = "3/4";
+               }
+       }
        \midi{ \tempo 4 = 130; }
-       \header{ piece = "Menuetto II"; }
+       \header{
+       opus= "" ; 
+       piece ="Menuetto II"; }
 }