patch::: 1.3.132.jcn1

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 3f323c24e01405e5bab802b083168d12a4803ecb..b09bc2997c090856079b57eca931374ee710eb62 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,8 +1,25 @@
+\version "1.3.122"
+
+% 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"))))
+
 flauti = \notes \relative c' {
   \property Staff.instrument   = #"2 Flauti"
   \property Staff.instr                = #"Fl."
+  \time 4/4;
   c1 
   \break c
+%  \break c
+%  \break c
   \bar"|.";
 }
 
@@ -13,8 +30,8 @@ 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   = #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cl." (rows "(B" ,raisedflat ")"))
 
   c1 c
 }
@@ -26,47 +43,48 @@ 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   = #`(lines "2 Corni" (rows "(E" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cor." (rows "(E" ,raisedflat ")"))
 
   c1 c
 }
 
 trombe = \notes \relative c' {
-  \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   = #"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"
+  \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"
+  \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   = #'(lines "Violoncello" "e" "Contrabasso")
+  \property Staff.instr                = #'(lines "Vc." "Cb.")
   c1 c
 }
 
@@ -101,26 +119,16 @@ violoncello = \notes \relative c' {
       \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
+       \paperSixteen
        indent=100.0\mm;
        linewidth=150.0\mm;
     \translator {
       \HaraKiriStaffContext
     }
     \translator {
-      \ScoreContext
-      instrumentScriptPadding = #55  %% urg, this is in pt
-      instrScriptPadding = #35
+      \OrchestralScoreContext
+      timeSignatureStyle = #"C"
     }
   }
 }