*** 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 1d4f8605eb2cd75865044cf7c90d1921472bbbf6..b68797aae11c06e8874a6a637343edd11faa4703 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,4 +1,5 @@
-\version "1.7.19"
+
+\version "2.2.0"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -6,22 +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)"
-  enteredby =   "JCN"
-
 
 texidoc = "@cindex Orchestra Score
 @cindex Coriolan Score
-Demonstration of how to set up an orchestral score (Bethoven'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.
 " }
 
-raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
+#(set-global-staff-size 16)
+
+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
@@ -31,118 +36,112 @@ 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 = #`("Clarinetti in B" ,text-flat)
-    \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
 }
 
-\include "paper16.ly"
 
 \score {
-  < 
-    \context StaffGroup ="legni" < 
+  << 
+    \context StaffGroup ="legni" << 
       \context Staff ="flauti" \flauti
       \context Staff ="oboi" \oboi
       \context Staff ="clarinetti" \clarinetti 
       \context Staff ="fagotti" \fagotti 
-    >
-    \context StaffGroup ="ottoni" <
+    >>
+    \context StaffGroup ="ottoni" <<
       \context Staff ="corni" \corni
       \context Staff ="trombe" \trombe
-    >
-    \context StaffGroup ="timpani" <
+    >>
+    \context StaffGroup ="timpani" <<
       \context 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 StaffGroup ="archi" <<
+      \context GrandStaff ="violini" <<
         \context Staff ="violinoI" \violinoI
         \context Staff ="violinoII" \violinoII
-      >
+      >>
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
-    >
-  >
+    >>
+  >>
   \paper {
-       \paperSixteen
-       indent=100.0\mm
-       linewidth=150.0\mm
-    \translator {
-      \RemoveEmptyStaffContext
-    }
-    \translator {
-      \OrchestralScoreContext
-      TimeSignature \override #'style = #'C
-    }
+      \paperSixteen
+      indent=100.0\mm
+      linewidth=150.0\mm
+      \context {
+         \RemoveEmptyStaffContext
+      }
+      \context {
+         \OrchestralScoreContext
+         \override TimeSignature #'style = #'C
+      }
   }
 }
 
-%% new-chords-done %%
+