Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index a950c3a3f6beca94d06640c0ec23b3e358bc8308..8bfd8ce3aa828b03413f5652a1389425a5e44c06 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.9.13"
+\version "2.7.39"
 
 
 % 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.instrumentName = #"2 Flauti"
-  \set Staff.shortInstrumentName = #"Fl."
+  \set Staff.instrument = #"2 Flauti"
+  \set Staff.instr = #"Fl."
   \time 4/4
   c1 
   \break c
@@ -36,67 +36,67 @@ flauti =  \relative c' {
 }
 
 oboi =  \relative c' {
-  \set Staff.instrumentName = #"2 Oboi"
-  \set Staff.shortInstrumentName = #"Ob."
+  \set Staff.instrument = #"2 Oboi"
+  \set Staff.instr = #"Ob."
   c1 c
 }
 
 clarinetti =  \relative c' {
-    \set Staff.instrumentName = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
-    \set Staff.shortInstrumentName = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
+    \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
+    \set Staff.instr = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
 
 fagotti =  \relative c' {
-  \set Staff.instrumentName = #"2 Fagotti"
-  \set Staff.shortInstrumentName = #"Fg."
+  \set Staff.instrument = #"2 Fagotti"
+  \set Staff.instr = #"Fg."
   c1 c
 }
 
 corni =  \relative c' {
-    \set Staff.instrumentName = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
-    \set Staff.shortInstrumentName = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
+    \set Staff.instrument = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
+    \set Staff.instr = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
 
   c1 c
 }
 
 trombe =  \relative c' {
-  \set Staff.instrumentName = \markup \column { "2 Trombe" "(C)" }
-  \set Staff.shortInstrumentName = \markup \column {  "Tbe." "(C)" }
+  \set Staff.instrument = \markup \column { "2 Trombe" "(C)" }
+  \set Staff.instr = \markup \column {  "Tbe." "(C)" }
 
   c1 c
 }
 
 timpani =  \relative c' {
-  \set Staff.instrumentName = \markup \column { "Timpani" "(C-G)" }
-  \set Staff.shortInstrumentName = #"Timp."
+  \set Staff.instrument = \markup \column { "Timpani" "(C-G)" }
+  \set Staff.instr = #"Timp."
 
   c1 c
 }
 
 violinoI =  \relative c' {
-  \set Staff.instrumentName = #"Violino I  "
-  \set Staff.shortInstrumentName = #"Vl. I  "
+  \set Staff.instrument = #"Violino I  "
+  \set Staff.instr = #"Vl. I  "
   c1 c
 }
 
 violinoII =  \relative c' {
-  \set Staff.instrumentName = #"Violino II  "
-  \set Staff.shortInstrumentName = #"Vl. II  "
+  \set Staff.instrument = #"Violino II  "
+  \set Staff.instr = #"Vl. II  "
   c1 c
 }
 
 viola =  \relative c' {
-  \set Staff.instrumentName = #"Viola"
-  \set Staff.shortInstrumentName = #"Vla."
+  \set Staff.instrument = #"Viola"
+  \set Staff.instr = #"Vla."
   c1 c 
   %c
 }
 
 violoncello =  \relative c' {
-  \set Staff.instrumentName = \markup \column { "Violoncello" "e" "Contrabasso" }
-  \set Staff.shortInstrumentName = \markup \column {  "Vc." "Cb." }
+  \set Staff.instrument = \markup \column { "Violoncello" "e" "Contrabasso" }
+  \set Staff.instr = \markup \column {  "Vc." "Cb." }
   c1 c
 }