X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fno-notation%2Fmidi-volume-equaliser.ly;h=73c4f708e3071b7319a250d74456bfda033034f4;hb=169a91c8514e3dcea29d1aa01653a684fb60457d;hp=be41ad5ac57c9989a99bc09edf3bf2372a4d4156;hpb=4c8187e65dd9708d7733692842acc696da121bf1;p=lilypond.git

diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index be41ad5ac5..73c4f708e3 100644
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,12 +1,12 @@
 #(ly:set-option 'old-relative)
-\version "2.1.7"
+\version "2.10.0"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
 another. Use this to tune equalizer settings. "
 }
 
-\include "paper16-init.ly"
+#(set-global-staff-size 16)
 
 %{
 
@@ -21,94 +21,94 @@ Override, see scm/midi.scm:
 
 %}
 
-flauti = \notes \relative c' {
-  \property Staff.midiInstrument = #"flute"
-  \property Staff.instrument	= #"2 Flauti"
-  \property Staff.instr		= #"Fl."
+flauti =  \relative c' {
+  \set Staff.midiInstrument = #"flute"
+  \set Staff.instrumentName = #"2 Flauti"
+  \set Staff.shortInstrumentName = #"Fl."
 
   c1\f R1*10
 }
 
-oboi = \notes \relative c' {
-  \property Staff.midiInstrument = #"oboe"
-  \property Staff.instrument	= #"2 Oboi"
-  \property Staff.instr		= #"Ob."
+oboi =  \relative c' {
+  \set Staff.midiInstrument = #"oboe"
+  \set Staff.instrumentName = #"2 Oboi"
+  \set Staff.shortInstrumentName = #"Ob."
 
   R1*1 c1\f R1*9
 }
 
-clarinetti = \notes \relative c' {
-  \property Staff.midiInstrument = #"clarinet"
-  \property Staff.instrument	= #"Clarinetti"
-  \property Staff.instr		= #"Cl"
+clarinetti =  \relative c' {
+  \set Staff.midiInstrument = #"clarinet"
+  \set Staff.instrumentName = #"Clarinetti"
+  \set Staff.shortInstrumentName = #"Cl"
 
   R1*2 c1\f R1*8
 }
 
-fagotti = \notes \relative c' {
-  \property Staff.midiInstrument = #"bassoon"
-  \property Staff.instrument	= #"2 Fagotti"
-  \property Staff.instr		= #"Fg."
+fagotti =  \relative c' {
+  \set Staff.midiInstrument = #"bassoon"
+  \set Staff.instrumentName = #"2 Fagotti"
+  \set Staff.shortInstrumentName = #"Fg."
 
   \clef bass
   R1*3 c1\f R1*7
 }
 
-corni = \notes \relative c' {
-  \property Staff.midiInstrument = #"french horn"
-  \property Staff.instrument	= #"Corni"
-  \property Staff.instr		= #"Cor"
+corni =  \relative c' {
+  \set Staff.midiInstrument = #"french horn"
+  \set Staff.instrumentName = #"Corni"
+  \set Staff.shortInstrumentName = #"Cor"
 
   R1*4 c1\f R1*6
 }
 
-trombe = \notes \relative c' {
-  \property Staff.midiInstrument = #"trumpet"
-  \property Staff.instrument	= #"Trombe"
-  \property Staff.instr		= #"Tp."
+trombe =  \relative c' {
+  \set Staff.midiInstrument = #"trumpet"
+  \set Staff.instrumentName = #"Trombe"
+  \set Staff.shortInstrumentName = #"Tp."
 
   \clef bass
   R1*5 c1\f R1*5
 }
 
-timpani = \notes \relative c' {
-  \property Staff.midiInstrument = #"timpani"
-  \property Staff.instrument	= #"Timpani"
-  \property Staff.instr		= #"Timp."
+timpani =  \relative c' {
+  \set Staff.midiInstrument = #"timpani"
+  \set Staff.instrumentName = #"Timpani"
+  \set Staff.shortInstrumentName = #"Timp."
 
   R1*6 c1\f R1*4
 }
 
-violinoI = \notes \relative c' {
-  \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument	= #"Violino I "
-  \property Staff.instr		= #"Vl. I "
+violinoI =  \relative c' {
+  \set Staff.midiInstrument = #"violin"
+  \set Staff.instrumentName = #"Violino I "
+  \set Staff.shortInstrumentName = #"Vl. I "
 
   R1*7 c1\f R1*3
 }
 
-violinoII = \notes \relative c' {
-  \property Staff.midiInstrument = #"violin"
-  \property Staff.instrument	= #"Violino II "
-  \property Staff.instr		= #"Vl. II "
+violinoII =  \relative c' {
+  \set Staff.midiInstrument = #"violin"
+  \set Staff.instrumentName = #"Violino II "
+  \set Staff.shortInstrumentName = #"Vl. II "
  
   R1*8 c1\f R1*2
 }
 
-viola = \notes \relative c' {
-  \property Staff.midiInstrument = #"viola"
-  \property Staff.instrument	= #"Viola"
-  \property Staff.instr		= #"Vla."
+viola =  \relative c' {
+  \set Staff.midiInstrument = #"viola"
+  \set Staff.instrumentName = #"Viola"
+  \set Staff.shortInstrumentName = #"Vla."
 
   \clef alto
   R1*9 c1\f R1*1
 }
 
-violoncello = \notes \relative c' {
-  \property Staff.midiInstrument = #"cello"
-  %\property Staff.midiInstrument = #"contrabass"
-  \property Staff.instrument	= #"Violoncello"
-  \property Staff.instr		= #"Vc."
+violoncello =  \relative c' {
+  \set Staff.midiInstrument = #"cello"
+  %\set Staff.midiInstrument = #"contrabass"
+  \set Staff.instrumentName = #"Violoncello"
+  \set Staff.shortInstrumentName = #"Vc."
   
   \clef bass
   R1*10 c1\f
@@ -117,45 +117,51 @@ violoncello = \notes \relative c' {
 
 \score {
   << 
-    \context StaffGroup ="legni" << 
-      \context Staff ="flauti" \flauti
-      \context Staff ="oboi" \oboi
-      \context Staff ="clarinetti" \clarinetti 
-      \context Staff ="fagotti" \fagotti 
+    \new StaffGroup = "legni" << 
+      \new Staff = "flauti" \flauti
+      \new Staff = "oboi" \oboi
+      \new Staff = "clarinetti" \clarinetti 
+      \new Staff = "fagotti" \fagotti 
     >>
-    \context StaffGroup ="ottoni" <<
-      \context Staff ="corni" \corni
-      \context Staff ="trombe" \trombe
+    \new StaffGroup = "ottoni" <<
+      \new Staff = "corni" \corni
+      \new Staff = "trombe" \trombe
     >>
-    \context StaffGroup ="timpani" <<
-      \context Staff ="timpani" \timpani
+    \new StaffGroup = "timpani" <<
+      \new Staff = "timpani" \timpani
      { 
        \skip 1 
        % Hmm: this forces a staff-bracket, that's good!
        % However, I can't find where is decided on staff-bracket yes/no
      }
     >>
-    \context StaffGroup ="archi" <<
-      \context GrandStaff ="violini" <<
-        \context Staff ="violino1" \violinoI
-        \context Staff ="violino2" \violinoII
+    \new StaffGroup = "archi" <<
+      \new GrandStaff = "violini" <<
+        \new Staff = "violino1" \violinoI
+        \new Staff = "violino2" \violinoII
       >>
-      \context Staff ="viola" \viola
-      \context Staff ="violoncello" \violoncello
+      \new Staff = "viola" \viola
+      \new Staff = "violoncello" \violoncello
     >>
   >>
 
-  \paper {
-  	\paperSixteen
+  \layout {
+  	\layoutSixteen
   	indent=100.0\mm
-  	linewidth=150.0\mm
-    \translator {
+  	line-width=150.0\mm
+    \context {
       \RemoveEmptyStaffContext
     }
   }
+  
   \midi {
-  	\tempo 1 = 60
-  }
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 60 1)
+      }
+    }
+
+
 }