X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Ftest%2Fcoriolan-margin.ly;h=b68797aae11c06e8874a6a637343edd11faa4703;hb=3684e949054183e4a31e17f5e7ab0bf30da0123e;hp=26bd470d44ee738408d6c784e29252d967065867;hpb=1161a2b71bc32575ea9878a8631221edb8c03279;p=lilypond.git

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 26bd470d44..b68797aae1 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,133 +1,147 @@
 
-#(define raisedflat '((raise . 0.4) (music (named "accidentals--1"))))
+\version "2.2.0"
+
+
+% Ugh, we need to override some LaTeX titling stuff
+\header {
+  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"
+  piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"
+  composer = 	 "Ludwig van Beethoven (1770-1827)"
+
+texidoc = "@cindex Orchestra Score
+@cindex Coriolan Score
+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 \flat  }
+
+
 
 flauti = \notes \relative c' {
-  \property Staff.instrument	= #"2 Flauti"
-  \property Staff.instr		= #"Fl."
-  \time 4/4;
+  \set Staff.instrument = #"2 Flauti"
+  \set Staff.instr = #"Fl."
+  \time 4/4
   c1 
   \break c
 %  \break c
 %  \break c
-  \bar"|.";
+  \bar"|."
 }
 
 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	= #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cl." (rows "(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	= #`(lines "2 Corni" (rows "(E" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cor." (rows "(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	= #'(lines "2 Trombe" "(C)")
-  \property Staff.instr		= #'(lines "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	= #'(lines "Timpani" "(C-G)")
-  \property Staff.instr		= #"Timp."
+  \set Staff.instrument = \markup \column < "Timpani" "(C-G)" >
+  \set Staff.instr = #"Timp."
 
   c1 c
 }
 
-violino1 = \notes \relative c' {
-  \property Staff.instrument	= #"Violino I"
-  \property Staff.instr		= #"Vl. I"
+violinoI = \notes \relative c' {
+  \set Staff.instrument = #"Violino I  "
+  \set Staff.instr = #"Vl. I  "
   c1 c
 }
 
-violino2 = \notes \relative c' {
-  \property Staff.instrument	= #"Violino II"
-  \property Staff.instr		= #"Vl. II"
+violinoII = \notes \relative c' {
+  \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	= #'(lines "Violoncello" "e" "Contrabasso")
-  \property Staff.instr		= #'(lines "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; 
+       \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" \violino1
-        \context Staff ="violino2" \violino2
-      >
+    >>
+    \context StaffGroup ="archi" <<
+      \context GrandStaff ="violini" <<
+        \context Staff ="violinoI" \violinoI
+        \context Staff ="violinoII" \violinoII
+      >>
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
-    >
-  >
- \header{
-		title = "Coriolan";
-		subtitle = "Ouverture"; 
-		opus = "Opus 62";
-		composer = "Ludwig van Beethoven (1770-1827)";
-		enteredby = "JCN";
-		copyright = "public domain";
-	}
-
+    >>
+  >>
   \paper {
-  	\paper_sixteen
-  	indent=100.0\mm;
-  	linewidth=150.0\mm;
-    \translator {
-      \HaraKiriStaffContext
-    }
-    \translator {
-      \OrchestralScoreContext
-      timeSignatureStyle = #"C"
-    }
+      \paperSixteen
+      indent=100.0\mm
+      linewidth=150.0\mm
+      \context {
+	  \RemoveEmptyStaffContext
+      }
+      \context {
+	  \OrchestralScoreContext
+	  \override TimeSignature #'style = #'C
+      }
   }
 }
 
+