* mf/GNUmakefile ($(outdir)/$(redhat-package)): use http for

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index ca51feee584c6eba580c91fdcb47270875c6f938..eb0970625035fafbb2c02496f9a1b3839879b5e2 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,4 +1,5 @@
-\version "1.5.68"
+
+\version "2.1.13"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -9,9 +10,17 @@
   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"))))
+
+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"
@@ -31,9 +40,10 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-%   \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 ")"))
+    \property Staff.instrument
+       = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
+    \property Staff.instr
+       = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
@@ -45,21 +55,23 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  \property Staff.instrument   = #`(lines "2 Corni" (columns "(E" ,raisedflat ")"))
-  \property Staff.instr                = #`(lines "Cor." (columns "(E" ,raisedflat ")"))
+    \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   = #'(lines "2 Trombe" "(C)")
-  \property Staff.instr                = #'(lines "Tbe." "(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   = #'(lines "Timpani" "(C-G)")
+  \property Staff.instrument   = \markup \column < "Timpani" "(C-G)" >
   \property Staff.instr                = #"Timp."
 
   c1 c
@@ -85,53 +97,53 @@ viola = \notes \relative c' {
 }
 
 violoncello = \notes \relative c' {
-  \property Staff.instrument   = #'(lines "Violoncello" "e" "Contrabasso")
-  \property Staff.instr                = #'(lines "Vc." "Cb.")
+  \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 
-    >
-    \context StaffGroup ="ottoni" <
+    >>
+    \context StaffGroup ="ottoni" <<
       \context Staff ="corni" \corni
       \context Staff ="trombe" \trombe
-    >
-    \context StaffGroup ="timpani" <
+    >>
+    \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 StaffGroup ="archi" <<
+      \context GrandStaff ="violini" <<
         \context Staff ="violinoI" \violinoI
         \context Staff ="violinoII" \violinoII
-      >
+      >>
       \context Staff ="viola" \viola
       \context Staff ="violoncello" \violoncello
-    >
-  >
+    >>
+  >>
   \paper {
-       \paperSixteen
-       indent=100.0\mm
-       linewidth=150.0\mm
-    \translator {
-      \HaraKiriStaffContext
-    }
-    \translator {
-      \OrchestralScoreContext
-      TimeSignature \override #'style = #'C
-    }
+      \paperSixteen
+      indent=100.0\mm
+      linewidth=150.0\mm
+      \translator {
+         \RemoveEmptyStaffContext
+      }
+      \translator {
+         \OrchestralScoreContext
+         TimeSignature \override #'style = #'C
+      }
   }
 }
 
+