release: 1.1.43

[lilypond.git] / mutopia / N.W.Gade / score.ly

diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index 6f858159abb3e6eb83cfa71c0c126a2873067bcc..af45976b133bb3f3c1c0288804bbb04f8b377e6f 100644 (file)
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -1,5 +1,5 @@
 \header{
-title =         "Imellan Fjeldene. Ouverture";
+title =         "Imellem Fjeldene. Ouverture";
 composer =      "Niels W Gade";
 enteredby =     "Mats Bengtsson";
 latexheaders = "\\input global";
@@ -8,7 +8,7 @@ copyright =     "Mats Bengtsson, 1999. Free circulation permitted and " +
                "Statens Musikbibliotek, Stockholm, Sweden";
 }
 
-\version "1.0.14";
+\version "1.0.19";
 
 \include "global.ly"
 \include "wood.ly"
@@ -18,90 +18,90 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
 
 
 \score{ <
-  \type StaffGroup = wood <
-    \type Staff = flauto <
+  \context StaffGroup = wood <
+    \context Staff = flauto <
       \property Staff.instrument = "Flauto"
       \property Staff.instr = "Fl."
       \global
+      \marks
       \flauto
     >
-    \type Staff = oboe <
+    \context Staff = oboe <
       \property Staff.instrument = "Oboe"
       \property Staff.instr = "Ob."
       \global
-      \marks
       \oboe
     >
-    \type Staff = clarI <
+    \context Staff = clarI <
       \property Staff.instrument = "Clarinetto I"
       \property Staff.instr = "Cl. I"
-      \global
+      \globalNoKey
       \clarI
     >
-    \type Staff = clarII <
+    \context Staff = clarII <
       \property Staff.instrument = "Clarinetto II"
       \property Staff.instr = "Cl. II"
-      \global
+      \globalNoKey
       \clarII
     >
-    \type Staff = fagotto <
+    \context Staff = fagotto <
       \property Staff.instrument = "Fagotto"
       \property Staff.instr = "Fg."
       \global
       \fagotto
     >
   >
-  \type StaffGroup = brass <
-    \type Staff = cor <
-      \global
+  \context StaffGroup = brass <
+    \context Staff = cor <
+      \globalNoKey
       \property Staff.instrument = "2 Corni in F"
       \property Staff.instr = "Cor."
-      \type Voice = corI { \stemup \corI }
-      \type Voice = corII { \stemdown \corII }
+      \context Voice = corI { \stemup \corI }
+      \context Voice = corII { \stemdown \corII }
     >
-    \type Staff = trp <
-      \global
+    \context Staff = trp <
+      \globalNoKey
       \property Staff.instrument = "2 Trp. in B\\textflat  "
       \property Staff.instr = "Trp."
-      \type Voice = trpI { \stemup \trpI }
-      \type Voice = trpII { \stemdown \trpII }
+      \context Voice = trpI { \stemup \trpI }
+      \context Voice = trpII { \stemdown \trpII }
     >
   >
-    \type StaffGroup = percussion <\type Staff = timpani <
-      \property Staff.instrument = "Timpani"
-      \property Staff.instr = "Timp."
+    \context StaffGroup = percussion <\context Staff = timpani <
+      \property Staff.instrument = "Timp. \& Triang."
+      \property Staff.instr = "Timp. \& Triang."
       \global
       \timpani
     >
   >
-  \type StaffGroup = strings <
-    \type GrandStaff = violins <
-      \type Staff = viI <
+  \context StaffGroup = strings <
+    \context GrandStaff = violins <
+      \context Staff = viI <
         \property Staff.instrument = "Violin I"
         \property Staff.instr = "Vi. I"
         \global
         \viI
       >
-      \type Staff = viII <
+      \context Staff = viII <
         \property Staff.instrument = "Violin II"
         \property Staff.instr = "Vi. II"
         \global
         \viII
       >
     >
-    \type Staff = vla <
+    \context Staff = vla <
       \property Staff.instrument = "Viola"
       \property Staff.instr = "Vla."
       \global
       \vla
     >
-    \type Staff = vlc <
+    \context Staff = vlc <
       \property Staff.instrument = "Violoncello"
       \property Staff.instr = "Vlc"
       \global
       \vlc
     >
-    \type Staff = cb <
+    \context Staff = cb <
       \property Staff.instrument = "Contrabasso"
       \property Staff.instr = "C.B."
       \global
@@ -110,7 +110,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
   >
 >
  \paper {
-    \paper_sixteen
+%    \paper_sixteen;
     linewidth = 185.\mm;
     textheight = 260.\mm;
     \translator {
@@ -119,31 +119,32 @@ copyright =       "Mats Bengtsson, 1999. Free circulation permitted and " +
     }
     \translator { \StaffContext
        \consists "Staff_margin_engraver";
-        marginHangOnClef = 1;
-        marginScriptPadding = "20.0";
+        marginScriptPadding = "15.0";
        textstyle = "italic";
        textScriptPadding = 5.0;
+        textEmptyDimension = 1;
+        oldTieBehavior = 1;
+    }
+    \translator { \VoiceContext
+        oldTieBehavior = 1;
     }
-\translator{\VoiceContext
-\remove Auto_beam_engraver; % Bug workaround!
-}
   }
 }
 
 \score{
-  \type StaffGroup <
-    \type Staff = oboe \oboe
-    \type Staff = flauto \flauto
-    \type Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >}
-    \type Staff = fagotto \fagotto
-    \type Staff = corniInF {\notes \transpose f <\corI \corII >}
-    \type Staff = trumpetsInBes {\notes \transpose bes <\trpI \trpII >}
-    \type Staff = timpani \timpani
-    \type Staff = violinoi \viI
-    \type Staff = violinoii \viII
-    \type Staff = viola \vla
-    \type Staff = violoncello \vlc
-    \type Staff = contrabass \cb
+  \context StaffGroup <
+    \context Staff = oboe \oboe
+    \context Staff = flauto \flauto
+    \context Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >}
+    \context Staff = fagotto \fagotto
+    \context Staff = corniInF {\notes \transpose f <\corI \corII >}
+    \context Staff = trumpetsInBes {\notes \transpose bes <\trpI \trpII >}
+    \context Staff = timpani \timpani
+    \context Staff = violinoi \viI
+    \context Staff = violinoii \viII
+    \context Staff = viola \vla
+    \context Staff = violoncello \vlc
+    \context Staff = contrabass \cb
   >
   \midi {
     \tempo 4=120;