release: 1.2.13

[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 23181116e2649b54039ecac8777db6dbae476a9c..9daff0680a7ab89fd7a663a3784e54ef2d9e31c0 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,100 +8,115 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " +
                "Statens Musikbibliotek, Stockholm, Sweden";
 }
 
-\version "1.0.14";
+\version "1.2.0";
 
 \include "global.ly"
 \include "wood.ly"
 \include "brass.ly"
 \include "strings.ly"
-\include "paper16.ly";
-
+\include "paper16.ly"
 
 \score{ <
-  \type StaffGroup = wood <
-    \type Staff = flauto <
+  \context StaffGroup = wood <
+    \context Voice = flauto <
       \property Staff.instrument = "Flauto"
       \property Staff.instr = "Fl."
       \global
+      \marks
       \flauto
     >
-    \type Staff = oboe <
+    \context Voice = oboe <
       \property Staff.instrument = "Oboe"
       \property Staff.instr = "Ob."
       \global
-      \marks
       \oboe
     >
-    \type Staff = clarI <
-      \property Staff.instrument = "Clarinetto I"
+    \context Voice = clarI <
+      \property Staff.instrument = "Clar. I in B\\textflat  "
       \property Staff.instr = "Cl. I"
-      \global
+      \globalNoKey
       \clarI
     >
-    \type Staff = clarII <
-      \property Staff.instrument = "Clarinetto II"
+    \context Voice = clarII <
+      \property Staff.instrument = "Clar. II  in B\\textflat  "
       \property Staff.instr = "Cl. II"
-      \global
+      \globalNoKey
       \clarII
     >
-    \type Staff = fagotto <
+    \context Voice = fagotto <
       \property Staff.instrument = "Fagotto"
       \property Staff.instr = "Fg."
       \global
       \fagotto
     >
   >
-  \type StaffGroup = brass <
-    \type Staff = cor <
-      \global
+  \context StaffGroup = brass <
+    \context Staff = cor <
       \property Staff.instrument = "2 Corni in F"
       \property Staff.instr = "Cor."
-      \type Voice = corI { \stemup \corI }
-      \type Voice = corII { \stemdown \corII }
+      \context Voice = corI <
+       \globalNoKey
+       \stemup \property Voice.dynamicDirection = \up 
+        \property Voice.articulationScriptVerticalDirection = \up 
+       \corI 
+      >
+      \context Voice = corII { 
+       \stemdown \property Voice.dynamicDirection = \down 
+        \property Voice.articulationScriptVerticalDirection = \down
+       \corII 
+      }
     >
-    \type Staff = trp <
-      \global
+    \context Staff = trp <
       \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 <
+       \globalNoKey
+       \stemup \property Voice.dynamicDirection = \up 
+        \property Voice.articulationScriptVerticalDirection = \up 
+       \trpI
+      >
+      \context Voice = trpII { 
+       \stemdown \property Voice.dynamicDirection = \down 
+        \property Voice.articulationScriptVerticalDirection = \down
+       \trpII
+      }
     >
   >
-    \type StaffGroup = percussion <\type Staff = timpani <
-      \property Staff.instrument = "Timpani"
-      \property Staff.instr = "Timp."
+    \context StaffGroup = percussion <\context Voice = timpani <
+      \property Staff.instrument = "Timp. \& Triang."
+      \property Staff.instr = "\qquad Tmp\& Trg"
       \global
       \timpani
     >
   >
-  \type StaffGroup = strings <
-    \type GrandStaff = violins <
-      \type Staff = viI <
+  \context StaffGroup = strings <
+    \context GrandStaff = violins <
+      \context Voice = viI <
         \property Staff.instrument = "Violin I"
         \property Staff.instr = "Vi. I"
         \global
         \viI
       >
-      \type Staff = viII <
+      \context Voice = viII <
         \property Staff.instrument = "Violin II"
         \property Staff.instr = "Vi. II"
         \global
         \viII
       >
     >
-    \type Staff = vla <
+    \context Voice = vla <
       \property Staff.instrument = "Viola"
       \property Staff.instr = "Vla."
       \global
       \vla
     >
-    \type Staff = vlc <
+    \context Voice = vlc <
       \property Staff.instrument = "Violoncello"
       \property Staff.instr = "Vlc"
       \global
       \vlc
     >
-    \type Staff = cb <
+    \context Voice = cb <
       \property Staff.instrument = "Contrabasso"
       \property Staff.instr = "C.B."
       \global
@@ -110,42 +125,44 @@ copyright =       "Mats Bengtsson, 1999. Free circulation permitted and " +
   >
 >
  \paper {
-    \paper_sixteen
-    linewidth = 185.\mm;
+%    \paper_sixteen;
+    linewidth = 180.\mm;
     textheight = 260.\mm;
     \translator {
        \OrchestralScoreContext
         minVerticalAlign = 2.5*\staffheight;
+        barNumberScriptPadding = "12.0";
+        markScriptPadding = "20.0";
     }
-    \translator { \StaffContext
+    \translator { 
+%        \HaraKiriStaffContext % Gives lost bar lines and misplaced marks!!
+        \StaffContext
        \consists "Staff_margin_engraver";
-        marginHangOnClef = 1;
-        marginScriptPadding = "20.0";
-       textstyle = "italic";
+        marginScriptPadding = "15.0";
+        dynamicPadding = 3.0;
+       textStyle = "italic";
        textScriptPadding = 5.0;
+        textEmptyDimension = 1;
+       noAutoBeaming = "1"; % Beams inserted explicitly as in the original.
     }
-\translator{\VoiceContext
-\remove Auto_beam_engraver; % Bug workaround!
-}
   }
 }
 
 \score{
-  \type StaffGroup <
-    \oboe
-    \flauto
-    \type Staff = cor {\notes \transpose bes <\clarI \clarII >}
-    \fagotto
-    \type Staff = cor {\notes \transpose f <\corI \corII >}
-    \type Staff = cor {\notes \transpose bes <\trpI \trpII >}
-    \timpani
-    \viI
-    \viII
-    \vla
-    \vlc
-    \cb
+  \context StaffGroup < \global
+    \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;
   }
 }