Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 6ef405126b41753db80ec19a8ec5091bcf2372ff..8bfd8ce3aa828b03413f5652a1389425a5e44c06 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,14 +1,14 @@
 
-\version "2.1.36"
+\version "2.7.39"
 
 
 % 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"
+  title =      "Ouvertüre"
+  subtitle =   "Zu Heinrich Joseph v. Collins Trauerspiel"
+  subsubtitle =        \markup { \large \bold "Coriolan" }
   opus = "Op. 62"
-  piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"
+  piece = \markup { \large Allegro con brio }
   composer =    "Ludwig van Beethoven (1770-1827)"
 
 texidoc = "@cindex Orchestra Score
@@ -24,7 +24,7 @@ raisedFlat = \markup { \raise #0.4 \smaller \smaller \flat  }
 
 
 
-flauti = \notes \relative c' {
+flauti =  \relative c' {
   \set Staff.instrument = #"2 Flauti"
   \set Staff.instr = #"Fl."
   \time 4/4
@@ -35,113 +35,126 @@ flauti = \notes \relative c' {
   \bar"|."
 }
 
-oboi = \notes \relative c' {
+oboi =  \relative c' {
   \set Staff.instrument = #"2 Oboi"
   \set Staff.instr = #"Ob."
   c1 c
 }
 
-clarinetti = \notes \relative c' {
-    \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
+clarinetti =  \relative c' {
+    \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
     \set Staff.instr = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
 }
 
-fagotti = \notes \relative c' {
+fagotti =  \relative c' {
   \set Staff.instrument = #"2 Fagotti"
   \set Staff.instr = #"Fg."
   c1 c
 }
 
-corni = \notes \relative c' {
-    \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > }
+corni =  \relative c' {
+    \set Staff.instrument = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
     \set Staff.instr = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
 
   c1 c
 }
 
-trombe = \notes \relative c' {
-  \set Staff.instrument = \markup \column < "2 Trombe" "(C)" >
-  \set Staff.instr = \markup \column <  "Tbe." "(C)" >
+trombe =  \relative c' {
+  \set Staff.instrument = \markup \column { "2 Trombe" "(C)" }
+  \set Staff.instr = \markup \column {  "Tbe." "(C)" }
 
   c1 c
 }
 
-timpani = \notes \relative c' {
-  \set Staff.instrument = \markup \column < "Timpani" "(C-G)" >
+timpani =  \relative c' {
+  \set Staff.instrument = \markup \column { "Timpani" "(C-G)" }
   \set Staff.instr = #"Timp."
 
   c1 c
 }
 
-violinoI = \notes \relative c' {
+violinoI =  \relative c' {
   \set Staff.instrument = #"Violino I  "
   \set Staff.instr = #"Vl. I  "
   c1 c
 }
 
-violinoII = \notes \relative c' {
+violinoII =  \relative c' {
   \set Staff.instrument = #"Violino II  "
   \set Staff.instr = #"Vl. II  "
   c1 c
 }
 
-viola = \notes \relative c' {
+viola =  \relative c' {
   \set Staff.instrument = #"Viola"
   \set Staff.instr = #"Vla."
   c1 c 
   %c
 }
 
-violoncello = \notes \relative c' {
-  \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" >
-  \set Staff.instr = \markup \column <  "Vc." "Cb." >
+violoncello =  \relative c' {
+  \set Staff.instrument = \markup \column { "Violoncello" "e" "Contrabasso" }
+  \set Staff.instr = \markup \column {  "Vc." "Cb." }
   c1 c
 }
 
 
-\score {
-  << 
-    \context StaffGroup ="legni" << 
-      \context Staff ="flauti" \flauti
-      \context Staff ="oboi" \oboi
-      \context Staff ="clarinetti" \clarinetti 
-      \context Staff ="fagotti" \fagotti 
-    >>
-    \context StaffGroup ="ottoni" <<
-      \context Staff ="corni" \corni
-      \context Staff ="trombe" \trombe
-    >>
-    \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 ="violinoI" \violinoI
-        \context Staff ="violinoII" \violinoII
+\paper {
+    indent=10.0\mm
+    line-width=150.0\mm
+    ragged-bottom = ##t 
+}
+
+#(set-global-staff-size 16)
+\book {
+    \score {
+      << 
+       \new StaffGroup = "legni" << 
+         \new Staff = "flauti" \flauti
+         \new Staff = "oboi" \oboi
+         \new Staff = "clarinetti" \clarinetti 
+         \new Staff = "fagotti" \fagotti 
+       >>
+       \new StaffGroup = "ottoni" <<
+         \new Staff = "corni" \corni
+         \new Staff = "trombe" \trombe
+       >>
+       \new StaffGroup = "timpani" <<
+         \new 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
+        }
+       >>
+       \new StaffGroup = "archi" <<
+         \new GrandStaff = "violini" <<
+           \new Staff = "violinoI" \violinoI
+           \new Staff = "violinoII" \violinoII
+         >>
+         \new Staff = "viola" \viola
+         \new Staff = "violoncello" \violoncello
+       >>
       >>
-      \context Staff ="viola" \viola
-      \context Staff ="violoncello" \violoncello
-    >>
-  >>
-  \paper {
-      \paperSixteen
-      indent=100.0\mm
-      linewidth=150.0\mm
-      \context {
-         \RemoveEmptyStaffContext
+      \layout {
+         \context {
+             \RemoveEmptyStaffContext
+         }
+         \context {
+             \Score
+             \override TimeSignature #'style = #'C
+         }
       }
-      \context {
-         \OrchestralScoreContext
-         \override TimeSignature #'style = #'C
-      }
-  }
+    }
+    % this is ignored?
+    \paper {
+       indent=10.0\mm
+       line-width=150.0\mm
+    }
 }
 
-
+%% Local Variables:
+%% coding: utf-8
+%% End: