X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fcoriolan-margin.ly;h=eb0970625035fafbb2c02496f9a1b3839879b5e2;hb=114c05e7b0e992de7dbdd0958d23eb8d2ab1eaae;hp=5f8601d498dd982fdcb5f18740dffbd493e82f35;hpb=e66382d86e12720f8f6708e35f21e24ca7b8f964;p=lilypond.git

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 5f8601d498..eb09706250 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,9 +1,36 @@
+
+\version "2.1.13"
+
+
+% 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
+Demonstration of how to set up an orchestral score (Beethoven's Coriolan overture).
+" }
+
+#(set-global-staff-size 16)
+
+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
   c1 
   \break c
-  \bar"|.";
+%  \break c
+%  \break c
+  \bar"|."
 }
 
 oboi = \notes \relative c' {
@@ -13,8 +40,10 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-  \property Staff.instrument	= #"2 Clarinetti\n(B\\textflat)"
-  \property Staff.instr		= #"Cl.\n(B\\textflat)"
+    \property Staff.instrument
+	= \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
+    \property Staff.instr
+	= \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
@@ -26,119 +55,95 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  \property Staff.instrument	= #"2 Corni\n(E\\textflat)"
-  \property Staff.instr		= #"Cor.\n(E\\textflat)"
+    \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	= #"2 Trombe\n(C)"
-  \property Staff.instr		= #"Tbe.\n(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	= #"Timpani\n(C-G)"
+  \property Staff.instrument	= \markup \column < "Timpani" "(C-G)" >
   \property Staff.instr		= #"Timp."
 
   c1 c
 }
 
-violino1 = \notes \relative c' {
-  \property Staff.instrument	= #"Violino I"
-  \property Staff.instr		= #"Vl. I"
+violinoI = \notes \relative c' {
+  \property Staff.instrument	= #"Violino I  "
+  \property Staff.instr		= #"Vl. I  "
   c1 c
 }
 
-violino2 = \notes \relative c' {
-  \property Staff.instrument	= #"Violino II"
-  \property Staff.instr		= #"Vl. II"
+violinoII = \notes \relative c' {
+  \property Staff.instrument	= #"Violino II  "
+  \property Staff.instr		= #"Vl. II  "
   c1 c
 }
 
 viola = \notes \relative c' {
   \property Staff.instrument	= #"Viola"
   \property Staff.instr		= #"Vla."
-  c1 c
+  c1 c 
+  %c
 }
 
 violoncello = \notes \relative c' {
-  \property Staff.instrument	= #"Violoncello\ne\nContrabasso"
-  \property Staff.instr		= #"Vc.\nCb."
+  \property Staff.instrument	= \markup \column < "Violoncello" "e" "Contrabasso" >
+  \property 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 
-    { %%urg
-      \skip 1; 
-      \context Staff="flauti" \property Staff.marginScriptPadding = #25
-      \context Staff ="oboi" \property Staff.marginScriptPadding = #25
-      \context Staff ="clarinetti" \property Staff.marginScriptPadding = #25
-      \context Staff ="fagotti" \property Staff.marginScriptPadding = #25
-    }
-    >
-    \context StaffGroup ="ottoni" <
+    >>
+    \context StaffGroup ="ottoni" <<
       \context Staff ="corni" \corni
       \context Staff ="trombe" \trombe
-    { %%urg
-      \skip 1; 
-      \context Staff="corni" \property Staff.marginScriptPadding = #25
-      \context Staff ="trome" \property Staff.marginScriptPadding = #25
-    }
-    >
-    \context StaffGroup ="timpani" <
+    >>
+    \context StaffGroup ="timpani" <<
       \context Staff ="timpani" \timpani
-    { %%urg
-      \skip 1; 
-      \context Staff="timpani" \property Staff.marginScriptPadding = #25
-    }
-    >
-    \context StaffGroup ="archi" <
-      \context GrandStaff ="violini" <
-        \context Staff ="violino1" \violino1
-        \context Staff ="violino2" \violino2
-    { %%urg
-      \skip 1; 
-      \context Staff="violino1" \property Staff.marginScriptPadding = #25
-      \context Staff="violino2" \property Staff.marginScriptPadding = #25
-    }
-      >
+     { 
+       \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 ="violinoI" \violinoI
+        \context Staff ="violinoII" \violinoII
+      >>
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
-    { %%urg
-      \skip 1; 
-      \context Staff="viola" \property Staff.marginScriptPadding = #25
-      \context Staff="violoncello" \property Staff.marginScriptPadding = #25
-    }
-    >
-  >
- \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
-      marginScriptPadding = #55  %% urg, this is in pt
-    }
+      \paperSixteen
+      indent=100.0\mm
+      linewidth=150.0\mm
+      \translator {
+	  \RemoveEmptyStaffContext
+      }
+      \translator {
+	  \OrchestralScoreContext
+	  TimeSignature \override #'style = #'C
+      }
   }
 }
 
+