*** empty log message ***

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index eb0970625035fafbb2c02496f9a1b3839879b5e2..b68797aae11c06e8874a6a637343edd11faa4703 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.13"
+\version "2.2.0"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -7,24 +7,26 @@
   title =      "Ouvertüre\\vrule width0pt height 0pt depth 1ex"
   subtitle =   "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex"
   subsubtitle =        "\\Large\\bf Coriolan"
-  opus =  "Op. 62"
+  opus = "Op. 62"
   piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"
   composer =    "Ludwig van Beethoven (1770-1827)"
 
 texidoc = "@cindex Orchestra Score
 @cindex Coriolan Score
-Demonstration of how to set up an orchestral score (Beethoven's Coriolan overture).
+In an orchestral score (Beethoven's Coriolan overture), there are 
+different instrument groups, and some of the instruments may be
+transposed. Instruments are indicated either with a long or short name.
 " }
 
 #(set-global-staff-size 16)
 
-raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
+raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat  }
 
 
 
 flauti = \notes \relative c' {
-  \property Staff.instrument   = #"2 Flauti"
-  \property Staff.instr                = #"Fl."
+  \set Staff.instrument = #"2 Flauti"
+  \set Staff.instr = #"Fl."
   \time 4/4
   c1 
   \break c
@@ -34,71 +36,67 @@ flauti = \notes \relative c' {
 }
 
 oboi = \notes \relative c' {
-  \property Staff.instrument   = #"2 Oboi"
-  \property Staff.instr                = #"Ob."
+  \set Staff.instrument = #"2 Oboi"
+  \set Staff.instr = #"Ob."
   c1 c
 }
 
 clarinetti = \notes \relative c' {
-    \property Staff.instrument
-       = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
-    \property Staff.instr
-       = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
+    \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
+    \set Staff.instr = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
 
 fagotti = \notes \relative c' {
-  \property Staff.instrument   = #"2 Fagotti"
-  \property Staff.instr                = #"Fg."
+  \set Staff.instrument = #"2 Fagotti"
+  \set Staff.instr = #"Fg."
   c1 c
 }
 
 corni = \notes \relative c' {
-    \property Staff.instrument
-       = \markup { \column < "Corni" { "in E" \raisedFlat } > }
-    \property Staff.instr
-       = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
+    \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > }
+    \set Staff.instr = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
 
   c1 c
 }
 
 trombe = \notes \relative c' {
-  \property Staff.instrument   = \markup \column < "2 Trombe" "(C)" >
-  \property Staff.instr                = \markup \column <  "Tbe." "(C)" >
+  \set Staff.instrument = \markup \column < "2 Trombe" "(C)" >
+  \set Staff.instr = \markup \column <  "Tbe." "(C)" >
 
   c1 c
 }
 
 timpani = \notes \relative c' {
-  \property Staff.instrument   = \markup \column < "Timpani" "(C-G)" >
-  \property Staff.instr                = #"Timp."
+  \set Staff.instrument = \markup \column < "Timpani" "(C-G)" >
+  \set Staff.instr = #"Timp."
 
   c1 c
 }
 
 violinoI = \notes \relative c' {
-  \property Staff.instrument   = #"Violino I  "
-  \property Staff.instr                = #"Vl. I  "
+  \set Staff.instrument = #"Violino I  "
+  \set Staff.instr = #"Vl. I  "
   c1 c
 }
 
 violinoII = \notes \relative c' {
-  \property Staff.instrument   = #"Violino II  "
-  \property Staff.instr                = #"Vl. II  "
+  \set Staff.instrument = #"Violino II  "
+  \set Staff.instr = #"Vl. II  "
   c1 c
 }
 
 viola = \notes \relative c' {
-  \property Staff.instrument   = #"Viola"
-  \property Staff.instr                = #"Vla."
+  \set Staff.instrument = #"Viola"
+  \set Staff.instr = #"Vla."
   c1 c 
   %c
 }
 
 violoncello = \notes \relative c' {
-  \property Staff.instrument   = \markup \column < "Violoncello" "e" "Contrabasso" >
-  \property Staff.instr                = \markup \column <  "Vc." "Cb." >
+  \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" >
+  \set Staff.instr = \markup \column <  "Vc." "Cb." >
   c1 c
 }
 
@@ -136,12 +134,12 @@ violoncello = \notes \relative c' {
       \paperSixteen
       indent=100.0\mm
       linewidth=150.0\mm
-      \translator {
+      \context {
          \RemoveEmptyStaffContext
       }
-      \translator {
+      \context {
          \OrchestralScoreContext
-         TimeSignature \override #'style = #'C
+         \override TimeSignature #'style = #'C
       }
   }
 }