*** 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 3f323c24e01405e5bab802b083168d12a4803ecb..9160e08f64e8891e78f22bdffdd84dc456b66258 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,9 +1,31 @@
+\version "1.7.6"
+
+
+% 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)"
+  enteredby =   "JCN"
+
+
+texidoc = "Demonstration of how to set up an orchestral score."  
+}
+
+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 +35,11 @@ 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 = #`("Clarinetti in B" ,text-flat)
+    \property Staff.instrument
+       = \markup { \column << "Clarinetti" { "in B" \raisedFlat } >> }
+    \property Staff.instr
+       = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
@@ -26,47 +51,50 @@ 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
 }
 
@@ -87,41 +115,32 @@ 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
      }
     >
     \context StaffGroup ="archi" <
       \context GrandStaff ="violini" <
-        \context Staff ="violino1" \violino1
-        \context Staff ="violino2" \violino2
+        \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;
+       \paperSixteen
+       indent=100.0\mm
+       linewidth=150.0\mm
     \translator {
       \HaraKiriStaffContext
     }
     \translator {
-      \ScoreContext
-      instrumentScriptPadding = #55  %% urg, this is in pt
-      instrScriptPadding = #35
+      \OrchestralScoreContext
+      TimeSignature \override #'style = #'C
     }
   }
 }
 
+%% new-chords-done %%