patch::: 1.3.38.jcn1

[lilypond.git] / mutopia / gallina.ly

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 06eb3754ff330cd512cc9591ef46702c105acf51..c0ad2ad5a7a1ed93f186612bf684d7f2b1631443 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -45,13 +45,16 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "1.1.66";
+\version "1.3.4";
 
 global = \notes {
   \property StaffGroup.timeSignatureStyle = "old"
   \time 4/4;
   \tempo 4=100;
+  \repeat "volta" 2 {
   \skip 1*31;
+  }
+  \repeat "volta" 2 {
   \property StaffGroup.timeSignatureStyle = "1"
   \time 3/2;
   \tempo 2=140;
@@ -59,6 +62,14 @@ global = \notes {
   \property StaffGroup.timeSignatureStyle = "old"
   \time 4/4;
   \tempo 4=100;
+  s1
+  }
+  \repeat "volta" 2 {
+  \skip 1*12;
+  \cadenzaOn
+  s\breve
+  \cadenzaOff 
+  }
 }
 
 vi1=\context Staff = vi1 <
@@ -67,6 +78,7 @@ vi1=\context Staff = vi1 <
 \property Staff.instrument = "Violin 1"
 \property Staff.midiInstrument = "recorder" % The default midi violin is terrible
 
+  \repeat "volta"  2 {
   d8 d d d d4 a16 b c a |
   b8 g  g g16 a b8 g  g g16 a | 
   b8 g  g a16 b c4 b |
@@ -98,8 +110,9 @@ vi1=\context Staff = vi1 <
   r8 g g g16 f e4 d |
   r8 d16 a  b8 b16 c a2 |
   b1 | 
-  
-  \repeat "semi" 2 {
+  }
+
+  \repeat "volta" 2 {
   r4 d d d d d |
   e1. |
   r4 c c c c c |
@@ -115,10 +128,10 @@ vi1=\context Staff = vi1 <
   a4 c8 b a4 b8 c f,4 g8 a |
   d,4 g g g g g |
   a d,8 c b4 c8 d a2 |
+  b1 |
   }
 
-  \repeat "semi" 2 {
-  b1 |
+  \repeat "volta" 2 {
   d8 d d d d4 a16 b c a |
   b8 g  g g16 a b8 g  g g16 a | 
   b8 g  c2 b4 |
@@ -130,7 +143,7 @@ vi1=\context Staff = vi1 <
   e2 r8 d d d16 e |
   fis a g fis  e d c b a8 d  d d16 e |
   fis4 g2 fis!4 |
-  \cadenza 1;
+  \cadenzaOn
   g\breve
   }
 }>
@@ -141,6 +154,7 @@ vi2=\context Staff = vi2 <
 \property Staff.instrument = "Violin 2"
 \property Staff.midiInstrument = "recorder" % The default midi violin is terrible
 
+  \repeat "volta"  2 {  
   r1 | r | r | 
   d8 d d d d4 a16 b c a |
   b8 g  g g16 a b8 g  g g16 a | 
@@ -170,8 +184,9 @@ vi2=\context Staff = vi2 <
   e4 d r8 c16 g  b8 b16 c |
   a4 g2 fis4 |
   g1 |
+  }
 
-  \repeat "semi" 2 {
+  \repeat "volta" 2 {
   r1. |
   r4 g'8 f e4 f8 g c,4 d8 e |
   a,1. |
@@ -187,10 +202,10 @@ vi2=\context Staff = vi2 <
   c,4 a a a a a |
   b d8 c b4 c8 d d,4 e |
   fis2 g fis! |
+  g1 |
   }
 
-  \repeat "semi" 2 {
-  g1 |
+  \repeat "volta" 2 {
   r1 | r1 |
   g'8 g g g g4 d16 e f d |
   e8 c  c c16 d e8 g,  g g16 a |
@@ -201,7 +216,7 @@ vi2=\context Staff = vi2 <
   c8 g  g g16 a b d c b  a g fis e |
   d8 d'  d d16 e fis16 a g fis  e d c b |
   a d c b  a g fis e d4 d' |
-  \cadenza 1;
+  \cadenzaOn
   b\breve
   }
 }>
@@ -215,6 +230,7 @@ bc=\context Staff = bc <
 \property Staff.midiInstrument = "bassoon" % The default midi violin is terrible
 
 
+  \repeat "volta"  2 {  
   G2 d^"4 3" | G1 |
   g2 c4 G | d1^"3 4 3" |
   G1 | g2 c4 G |
@@ -231,8 +247,9 @@ bc=\context Staff = bc <
   G1^"3 4 3" | c4 B c g |
   c B c G | d1^"3 4 3" |
   G1 |
+  }
 
-  \repeat "semi" 2 {
+  \repeat "volta" 2 {
   g1. | c |
   f | d^"\\textsharp" |
   g | c |
@@ -241,17 +258,17 @@ bc=\context Staff = bc <
   d^"\\textsharp" | e |
   f | g1 B2 |
   d1.^"3 4 3" |
+  G1 |
   }
 
-  \repeat "semi"  2 {
-  G1 |
+  \repeat "volta"  2 {
   g2 fis | g G |
   g1^"3 4 3" | c |
   G^"3 4 3" | c2 G |
   d1^"3 4 3" | G^"3 4 3" |
   c2 G | d1^"\\textsharp" ( |
   ) d^"3 4 3" | 
-  \cadenza 1;
+  \cadenzaOn
   G\breve 
   }
 }>