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 1f307006d79efcef9a829eed8899f75849fc7cb1..8bfd8ce3aa828b03413f5652a1389425a5e44c06 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,10 +1,10 @@
 
-\version "2.3.16"
+\version "2.7.39"
 
 
 % Ugh, we need to override some LaTeX titling stuff
 \header {
-  title =      "Ouvertüre"
+  title =      "Ouvertüre"
   subtitle =   "Zu Heinrich Joseph v. Collins Trauerspiel"
   subsubtitle =        \markup { \large \bold "Coriolan" }
   opus = "Op. 62"
@@ -42,7 +42,7 @@ oboi =  \relative c' {
 }
 
 clarinetti =  \relative c' {
-    \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \raisedFlat } > }
+    \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \raisedFlat } } }
     \set Staff.instr = \markup { \smaller  { "Cl(B" \raisedFlat ")" } }
 
   c1 c
@@ -55,21 +55,21 @@ fagotti =  \relative c' {
 }
 
 corni =  \relative c' {
-    \set Staff.instrument = \markup { \column < "Corni" { "in E" \raisedFlat } > }
+    \set Staff.instrument = \markup { \column { "Corni" \line { "in E" \raisedFlat } } }
     \set Staff.instr = \markup { \smaller  { "Cor(E" \raisedFlat ")" } }
 
   c1 c
 }
 
 trombe =  \relative c' {
-  \set Staff.instrument = \markup \column < "2 Trombe" "(C)" >
-  \set Staff.instr = \markup \column <  "Tbe." "(C)" >
+  \set Staff.instrument = \markup \column { "2 Trombe" "(C)" }
+  \set Staff.instr = \markup \column {  "Tbe." "(C)" }
 
   c1 c
 }
 
 timpani =  \relative c' {
-  \set Staff.instrument = \markup \column < "Timpani" "(C-G)" >
+  \set Staff.instrument = \markup \column { "Timpani" "(C-G)" }
   \set Staff.instr = #"Timp."
 
   c1 c
@@ -95,53 +95,66 @@ viola =  \relative c' {
 }
 
 violoncello =  \relative c' {
-  \set Staff.instrument = \markup \column < "Violoncello" "e" "Contrabasso" >
-  \set Staff.instr = \markup \column <  "Vc." "Cb." >
+  \set Staff.instrument = \markup \column { "Violoncello" "e" "Contrabasso" }
+  \set Staff.instr = \markup \column {  "Vc." "Cb." }
   c1 c
 }
 
 
+\paper {
+    indent=10.0\mm
+    line-width=150.0\mm
+    ragged-bottom = ##t 
+}
+
 #(set-global-staff-size 16)
-\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
+\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 {
-      indent=100.0\mm
-      linewidth=150.0\mm
-      \context {
-         \RemoveEmptyStaffContext
+      \layout {
+         \context {
+             \RemoveEmptyStaffContext
+         }
+         \context {
+             \Score
+             \override TimeSignature #'style = #'C
+         }
       }
-      \context {
-         \Score
-         \override TimeSignature #'style = #'C
-      }
-  }
+    }
+    % this is ignored?
+    \paper {
+       indent=10.0\mm
+       line-width=150.0\mm
+    }
 }
 
-
+%% Local Variables:
+%% coding: utf-8
+%% End: