X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mutopia%2FJ.S.Bach%2FSolo-Cello-Suites%2Fmenuetto-cello.ly;h=80dc4bb6566561863f683853c5ddca6ae4fa1b4a;hb=78ed9c22a8cbf56ff5390553e0a2854aa42cbbc5;hp=461c6ffca8aefa1f78d73741a001ea79275af1c5;hpb=c35429871450860e51d71ad95a868311ed28a1a6;p=lilypond.git

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
index 461c6ffca8..80dc4bb656 100644
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
@@ -16,24 +16,27 @@ copyright =	 "public domain";
  dotted slurs
 %}
 
-\version "1.0.0";
+\version "1.1.52";
 
 \include "menuetto-urtext.ly";
 
-menuetto_i_cello_global = \melodic{
+menuetto_i_cello_global = \notes{
 	\time 3/4;
 	\key f;
 	\clef bass;
-	\skip 2.*8;
-	\bar ":|:";
-	\skip 2.*1;
-	\slurdotted
-	\skip 2.*14;
-	s2._"Fine"
-	\bar ":|";
+	\repeat    "semi" 2 {
+		\skip 2.*8;
+	}
+	\repeat "semi" 2 {
+		\skip 2.*1;
+		\slurdotted
+		\skip 2.*14;
+		s2._"Fine"
+	}
 }
 
-menuetto_i_cello_scripts = \melodic{
+menuetto_i_cello_scripts = \notes{
+	\context Voice=i
 	s2.
 	s8^"~"^1_2_4 s8 s4 s^4
 	s4^0_1 s_4 s
@@ -53,7 +56,7 @@ menuetto_i_cello_scripts = \melodic{
 	s8^2_3 s s s^1 s4^1
 }
 
-menuetto_i_cello_staff = \type Staff <
+menuetto_i_cello_staff = \context Staff <
 	\$menuetto_i
 	\$menuetto_i_cello_global
 %	\$menuetto_i_cello_scripts
@@ -61,25 +64,35 @@ menuetto_i_cello_staff = \type Staff <
 
 \score{
 	\$menuetto_i_cello_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"; }
 }
 
-menuetto_ii_cello_global = \melodic{
+menuetto_ii_cello_global = \notes{
 	\time 3/4;
 	\key D;
 	\clef bass;
-	\skip 2.*8;
-	\bar ":|:";
-	\skip 2.*1;
-	\slurdotted
-	\skip 2.*14;
-	s2._"Menuetto I da Capo"
-	\bar ":|";
+	\repeat "semi" 2 {
+		\skip 2.*8;
+	}
+	\repeat  "semi" 2 {
+		\skip 2.*1;
+		\slurdotted
+		\skip 2.*14;
+		s2._"Menuetto I da Capo"
+	}
+
 }
 
-menuetto_ii_cello_staff = \type Staff <
+menuetto_ii_cello_staff = \context Staff <
 	\$menuetto_ii
 	\$menuetto_ii_cello_global
 %	\$menuetto_ii_cello_scripts
@@ -87,7 +100,15 @@ menuetto_ii_cello_staff = \type Staff <
 
 \score{
 	\$menuetto_ii_cello_staff
-	\include "scs-paper.ly";
+	\paper{
+		\include "scs-paper.ly";
+		gourlay_maxmeasures = 7.0;
+		
+		\translator{
+			\VoiceContext
+			beamAutoEnd_8 = "3/4";
+		}
+	}
 	\midi{ \tempo 4 = 130; }
 	\header{ piece = "Menuetto II"; }
 }