release: 1.3.129

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 842b45bce0fb151ee0d4f1ce1baf1391f811351a..a85403af93d8d2776f95d7c50bbddcda2a621ee7 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,21 +1,15 @@
+\version "1.3.122"
 
-\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}";
-}
+#(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
+  \time 4/4;
+  c1 
+  \break c
+%  \break c
+%  \break c
   \bar"|.";
 }
 
@@ -26,11 +20,8 @@ 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   = #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cl." (rows "(B" ,raisedflat ")"))
 
   c1 c
 }
@@ -42,30 +33,21 @@ 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" (rows "(E" ,raisedflat ")"))
+  \property Staff.instr                = #`(lines "Cor." (rows "(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
@@ -86,18 +68,18 @@ violino2 = \notes \relative 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,6 +94,11 @@ 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" <
@@ -132,12 +119,15 @@ violoncello = \notes \relative c' {
        }
 
   \paper {
+       \paperSixteen
        indent=100.0\mm;
        linewidth=150.0\mm;
     \translator {
-      \StaffContext
-      \consists Staff_margin_engraver;
-      staffMarginHorizontalPadding = #-12
+      \HaraKiriStaffContext
+    }
+    \translator {
+      \OrchestralScoreContext
+      timeSignatureStyle = #"C"
     }
   }
 }