bump .ly \version to 2.10.0

[lilypond.git] / input / test / coriolan-margin.ly

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index c447c9a25dc88facbb73112dd78d9870fe9afcd6..f29f41090ffbd73429fa0c661025aec73b745394 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.5.13"
+\version "2.10.0"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -25,8 +25,8 @@ raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat  }
 
 
 flauti =  \relative c' {
-  \set Staff.instrument = #"2 Flauti"
-  \set Staff.instr = #"Fl."
+  \set Staff.instrumentName = #"2 Flauti"
+  \set Staff.shortInstrumentName = #"Fl."
   \time 4/4
   c1 
   \break c
@@ -36,106 +36,106 @@ flauti =  \relative c' {
 }
 
 oboi =  \relative c' {
-  \set Staff.instrument = #"2 Oboi"
-  \set Staff.instr = #"Ob."
+  \set Staff.instrumentName = #"2 Oboi"
+  \set Staff.shortInstrumentName = #"Ob."
   c1 c
 }
 
 clarinetti =  \relative c' {
-    \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
-    \set Staff.instr = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
+    \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
+    \set Staff.shortInstrumentName = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
 
 fagotti =  \relative c' {
-  \set Staff.instrument = #"2 Fagotti"
-  \set Staff.instr = #"Fg."
+  \set Staff.instrumentName = #"2 Fagotti"
+  \set Staff.shortInstrumentName = #"Fg."
   c1 c
 }
 
 corni =  \relative c' {
-    \set Staff.instrument = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
-    \set Staff.instr = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
+    \set Staff.instrumentName = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
+    \set Staff.shortInstrumentName = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
 
   c1 c
 }
 
 trombe =  \relative c' {
-  \set Staff.instrument = \markup \column { "2 Trombe" "(C)" }
-  \set Staff.instr = \markup \column {  "Tbe." "(C)" }
+  \set Staff.instrumentName = \markup \column { "2 Trombe" "(C)" }
+  \set Staff.shortInstrumentName = \markup \column {  "Tbe." "(C)" }
 
   c1 c
 }
 
 timpani =  \relative c' {
-  \set Staff.instrument = \markup \column { "Timpani" "(C-G)" }
-  \set Staff.instr = #"Timp."
+  \set Staff.instrumentName = \markup \column { "Timpani" "(C-G)" }
+  \set Staff.shortInstrumentName = #"Timp."
 
   c1 c
 }
 
 violinoI =  \relative c' {
-  \set Staff.instrument = #"Violino I  "
-  \set Staff.instr = #"Vl. I  "
+  \set Staff.instrumentName = #"Violino I  "
+  \set Staff.shortInstrumentName = #"Vl. I  "
   c1 c
 }
 
 violinoII =  \relative c' {
-  \set Staff.instrument = #"Violino II  "
-  \set Staff.instr = #"Vl. II  "
+  \set Staff.instrumentName = #"Violino II  "
+  \set Staff.shortInstrumentName = #"Vl. II  "
   c1 c
 }
 
 viola =  \relative c' {
-  \set Staff.instrument = #"Viola"
-  \set Staff.instr = #"Vla."
+  \set Staff.instrumentName = #"Viola"
+  \set Staff.shortInstrumentName = #"Vla."
   c1 c 
   %c
 }
 
 violoncello =  \relative c' {
-  \set Staff.instrument = \markup \column { "Violoncello" "e" "Contrabasso" }
-  \set Staff.instr = \markup \column {  "Vc." "Cb." }
+  \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" }
+  \set Staff.shortInstrumentName = \markup \column {  "Vc." "Cb." }
   c1 c
 }
 
 
 \paper {
     indent=10.0\mm
-    linewidth=150.0\mm
-    raggedbottom = ##t 
+    line-width=150.0\mm
+    ragged-bottom = ##t 
 }
 
 #(set-global-staff-size 16)
 \book {
     \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 ="violinoI" \violinoI
-           \context Staff ="violinoII" \violinoII
+       \new StaffGroup = "archi" <<
+         \new GrandStaff = "violini" <<
+           \new Staff = "violinoI" \violinoI
+           \new Staff = "violinoII" \violinoII
          >>
-         \context Staff ="viola" \viola
-         \context Staff ="violoncello" \violoncello
+         \new Staff = "viola" \viola
+         \new Staff = "violoncello" \violoncello
        >>
       >>
       \layout {
@@ -151,7 +151,7 @@ violoncello =  \relative c' {
     % this is ignored?
     \paper {
        indent=10.0\mm
-       linewidth=150.0\mm
+       line-width=150.0\mm
     }
 }