release: 1.5.23

[lilypond.git] / input / test / coriolan-margin.ly

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 842b45bce0fb151ee0d4f1ce1baf1391f811351a..e1a2f78c1d65380f749f5fcf8f969334ac5c6de2 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,22 +1,27 @@
-
-\header{
-%% URG
-Clarinetti ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Clarinetti\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}";
-Cl ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cl.\\hss}\\hbox to0pt{\\hss (B\\textflat)\\hss}\vss}";
-Corni ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Corni\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}";
-Cor ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Cor.\\hss}\\hbox to0pt{\\hss (E\\textflat)\\hss}\vss}";
-Trombe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss2 Trombe\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}";
-Tbe ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Tbe.\\hss}\\hbox to0pt{\\hss (C)\\hss}\vss}";
-Timpani ="\\vbox to0pt{\vss\\hbox to0pt{\\hss Timpani\\hss}\\hbox to0pt{\\hss (C-G)\\hss}\vss}";
-VioloncelloContrabasso ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Violoncello\\hss}\\hbox to0pt{\\hss e\\hss}\\hbox to0pt{\\hss Contrabasso\\hss}\vss}";
-VcCb ="\\hss\\vbox to0pt{\vss\\hbox to0pt{\\hss Vc.\\hss}\\hbox to0pt{\\hss Cb.\\hss}\vss}";
+\version "1.3.146"
+
+
+% 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"
 }
+#(define raisedflat '((raise . 0.4) (music (named "accidentals--1"))))
 
 flauti = \notes \relative c' {
   \property Staff.instrument   = #"2 Flauti"
   \property Staff.instr                = #"Fl."
-  c1 \break c
-  \bar"|.";
+  \time 4/4
+  c1 
+  \break c
+%  \break c
+%  \break c
+  \bar"|."
 }
 
 oboi = \notes \relative c' {
@@ -26,11 +31,9 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaClarinetti         "
-  %%\property Staff.instr      = #"\\mudelaCl    "
-
-  \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   = #`(lines "2 Clarinetti" (columns "(B" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cl." (columns "(B" ,raisedflat ")"))
 
   c1 c
 }
@@ -42,62 +45,53 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaCorni      "
-  %%\property Staff.instr      = #"\\mudelaCor    "
-
-  \property Staff.instrument   = #"2 Corni\n(E\\textflat)"
-  \property Staff.instr                = #"Cor.\n(E\\textflat)"
+  \property Staff.instrument   = #`(lines "2 Corni" (columns "(E" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cor." (columns "(E" ,raisedflat ")"))
 
   c1 c
 }
 
 trombe = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaTrombe        "
-  %%\property Staff.instr      = #"\\mudelaTbe    "
-
-  \property Staff.instrument   = #"2 Trombe\n(C)"
-  \property Staff.instr                = #"Tbe.\n(C)"
+  \property Staff.instrument   = #'(lines "2 Trombe" "(C)")
+  \property Staff.instr                = #'(lines "Tbe." "(C)")
 
   c1 c
 }
 
 timpani = \notes \relative c' {
-  %%\property Staff.instrument = #"\\mudelaTimpani         "
-  %%\property Staff.instr      = #"Timp."
-
-  \property Staff.instrument   = #"Timpani\n(C-G)"
+  \property Staff.instrument   = #'(lines "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 = #"\\mudelaVioloncelloContrabasso         "
-  %%\property Staff.instr      = #"\\mudelaVcCb    "
-
-  \property Staff.instrument   = #"Violoncello\ne\nContrabasso"
-  \property Staff.instr                = #"Vc.\nCb."
+  \property Staff.instrument   = #'(lines "Violoncello" "e" "Contrabasso")
+  \property Staff.instr                = #'(lines "Vc." "Cb.")
   c1 c
 }
 
+\include "paper16.ly"
+
 \score {
   < 
     \context StaffGroup ="legni" < 
@@ -112,32 +106,31 @@ violoncello = \notes \relative c' {
     >
     \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 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 {
-       indent=100.0\mm;
-       linewidth=150.0\mm;
+       \paperSixteen
+       indent=100.0\mm
+       linewidth=150.0\mm
+    \translator {
+      \HaraKiriStaffContext
+    }
     \translator {
-      \StaffContext
-      \consists Staff_margin_engraver;
-      staffMarginHorizontalPadding = #-12
+      \OrchestralScoreContext
+      TimeSignature \override #'style = #'C
     }
   }
 }