X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fcoriolan-margin.ly;h=6e28ba73537e79c40e7e21ea7fd5b7fc89a85603;hb=e9bd265943d37689b1a6892217cb6f67bbe69f73;hp=f16b1dce13ee89cd089718e34c9066709f75549d;hpb=f40100ec7da8bfd4fbf09ae2b072e3e660e1b0d3;p=lilypond.git

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index f16b1dce13..6e28ba7353 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,26 +1,36 @@
+#(ly:set-option 'old-relative)
+\version "1.9.1"
 
 
 % Ugh, we need to override some LaTeX titling stuff
 \header {
-  title =	"Ouverture\\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 = "\\normalfont\\large Allegro con brio";
-  composer = 	 "Ludwig van Beethoven (1770-1827)";
-  enteredby = 	 "JCN";
-}
-#(define raisedflat '((raise . 0.4) (music (named "accidentals--1"))))
+  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
+Demonstration of how to set up an orchestral score (Beethoven's Coriolan overture).
+" }
+
+\include "paper16.ly"
+
+raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
+
+
 
 flauti = \notes \relative c' {
   \property Staff.instrument	= #"2 Flauti"
   \property Staff.instr		= #"Fl."
-  \time 4/4;
+  \time 4/4
   c1 
   \break c
 %  \break c
 %  \break c
-  \bar"|.";
+  \bar"|."
 }
 
 oboi = \notes \relative c' {
@@ -30,8 +40,10 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-  \property Staff.instrument	= #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cl." (rows "(B" ,raisedflat ")"))
+    \property Staff.instrument
+	= \markup { \column << "Clarinetti" { "in B" \raisedFlat } >> }
+    \property Staff.instr
+	= \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
@@ -43,21 +55,23 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  \property Staff.instrument	= #`(lines "2 Corni" (rows "(E" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cor." (rows "(E" ,raisedflat ")"))
+    \property Staff.instrument
+	= \markup { \column << "Corni" { "in E" \raisedFlat } >> }
+    \property 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)")
+  \property Staff.instrument	= \markup \column << "2 Trombe" "(C)" >>
+  \property Staff.instr		= \markup \column <<  "Tbe." "(C)" >>
 
   c1 c
 }
 
 timpani = \notes \relative c' {
-  \property Staff.instrument	= #'(lines "Timpani" "(C-G)")
+  \property Staff.instrument	= \markup \column << "Timpani" "(C-G)" >>
   \property Staff.instr		= #"Timp."
 
   c1 c
@@ -83,12 +97,11 @@ viola = \notes \relative c' {
 }
 
 violoncello = \notes \relative c' {
-  \property Staff.instrument	= #'(lines "Violoncello" "e" "Contrabasso")
-  \property Staff.instr		= #'(lines "Vc." "Cb.")
+  \property Staff.instrument	= \markup \column << "Violoncello" "e" "Contrabasso" >>
+  \property Staff.instr		= \markup \column <<  "Vc." "Cb." >>
   c1 c
 }
 
-\include "paper16.ly"
 
 \score {
   < 
@@ -105,7 +118,7 @@ violoncello = \notes \relative c' {
     \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
      }
@@ -121,10 +134,10 @@ violoncello = \notes \relative c' {
   >
   \paper {
   	\paperSixteen
-  	indent=100.0\mm;
-  	linewidth=150.0\mm;
+  	indent=100.0\mm
+  	linewidth=150.0\mm
     \translator {
-      \HaraKiriStaffContext
+      \RemoveEmptyStaffContext
     }
     \translator {
       \OrchestralScoreContext
@@ -133,3 +146,4 @@ violoncello = \notes \relative c' {
   }
 }
 
+