From 880450ccfe1af90f6db0ba1442d5cfc1d7afec3d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 2 Jan 2007 19:10:49 +0100
Subject: [PATCH] put \paper and \layout blocks before score/music block.

---
 input/regression/accidental-clef-change.ly    |  6 +++++-
 input/regression/bend-dot.ly                  |  8 +++----
 input/regression/break.ly                     |  8 +++----
 .../regression/completion-heads-polyphony.ly  | 10 ++++-----
 input/regression/dynamics-broken-hairpin.ly   |  7 ++++---
 input/regression/glissando.ly                 | 10 ++++-----
 input/regression/instrument-name-dynamic.ly   | 10 ++++-----
 input/regression/lyric-extender-broken.ly     |  6 +++---
 input/regression/lyric-hyphen-break.ly        | 21 ++++++++++---------
 input/regression/non-empty-text.ly            |  6 +++---
 input/regression/note-line.ly                 | 10 ++++-----
 input/regression/slur-nice.ly                 |  8 +++----
 input/regression/tie-broken-minimum-length.ly | 10 ++++-----
 13 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly
index 59a6b64b58..fabf9546bb 100644
--- a/input/regression/accidental-clef-change.ly
+++ b/input/regression/accidental-clef-change.ly
@@ -2,6 +2,11 @@
   texidoc = "Accidentals are reset for clef changes."
 }
 
+\layout {
+  ragged-right = ##t
+}
+
+
 \version "2.10.0"
 \new Staff \relative c' {
     \clef treble
@@ -10,4 +15,3 @@
     <cis dis fis gis>
 }
 
-\layout {ragged-right = ##t} 
diff --git a/input/regression/bend-dot.ly b/input/regression/bend-dot.ly
index 4b55de5cd4..67a354e2f9 100644
--- a/input/regression/bend-dot.ly
+++ b/input/regression/bend-dot.ly
@@ -3,6 +3,10 @@
   texidoc  = "Bends avoid dots, but only if necessary."
 }
 
+\paper {
+  ragged-right = ##t
+}
+
 \score {
   <<
     \new Staff \relative c' {
@@ -13,7 +17,3 @@
     }
   >>
 }
-
-\paper {
-  ragged-right = ##t
-}
diff --git a/input/regression/break.ly b/input/regression/break.ly
index 1611f96532..b3a88c798e 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -7,13 +7,13 @@ Breaks can be encouraged and discouraged using @code{\\break} and
 @code{\\noBreak}."
 }
 
+\layout {
+  indent = 0.0
+  line-width = 4.0\cm
+}
 
 \relative c'' \context Voice {
   \emptyText
   c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
   c1 \break \mark "break" c1 \break \mark "break" c1 
 }
-\layout {
-  indent = 0.0
-  line-width = 4.0\cm
-}
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index 63c555519a..c2802689b3 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -8,11 +8,6 @@ Completion heads are not fooled by polyphony with a different rhythm.
 
 }
 
-\context Staff  \relative c'' << 
-  { c2. c bes2 } \\
-  { c2. a8 g4 f4. g4 f  }
->>
-
 \layout {
   \context{
     \Voice
@@ -20,3 +15,8 @@ Completion heads are not fooled by polyphony with a different rhythm.
     \consists "Completion_heads_engraver"
   }
 }
+
+\context Staff \relative c'' << 
+  { c2. c bes2 } \\
+  { c2. a8 g4 f4. g4 f  }
+>>
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index fac525db24..439e6bd01b 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -4,11 +4,12 @@
 texidoc = "Broken crescendi should be open on one side."
 }
 
-\relative c'' { 
-  c1 \< \break c1\!  \> \break c1\!
-}
 \layout {
   line-width = 4.\cm
 }
 
 
+\relative c'' { 
+  c1 \< \break c1\!  \> \break c1\!
+}
+
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index 407ad0b9cb..2cea6f9621 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -12,6 +12,11 @@ The engraver does no time-keeping, so it involves some trickery to get
 }
 
 
+\layout{
+  line-width = 50.\mm
+  indent = 0
+}
+
 \new Staff \relative c''{
 				% gliss non gliss and 
   c4 \glissando d e \glissando f \glissando \break
@@ -23,9 +28,4 @@ The engraver does no time-keeping, so it involves some trickery to get
   c4 \glissando c,, \glissando c' \glissando d
 }
 
-\layout{
-  line-width = 50.\mm
-  indent = 0
-}
-
 
diff --git a/input/regression/instrument-name-dynamic.ly b/input/regression/instrument-name-dynamic.ly
index abc315f7f3..a418315dee 100644
--- a/input/regression/instrument-name-dynamic.ly
+++ b/input/regression/instrument-name-dynamic.ly
@@ -6,15 +6,15 @@
   pedal line spanners."
 }
 
+\paper {
+  line-width = 3\cm
+  indent = 0\cm
+}
+
 \relative {
   \set Staff.shortInstrumentName = "foo"
   f1 | f1 | f1 |
   f1\< | f1 | f1\! |
 }
 
-\paper {
-  line-width = 3\cm
-  indent = 0\cm
-}
-
 % EOF
diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index c7db439467..36aae288b5 100644
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -8,6 +8,9 @@ of the melisma."
 
 }
 
+\layout {
+  ragged-right = ##t
+}
 
 << 
   \new Voice =A  {
@@ -17,7 +20,4 @@ of the melisma."
   }
   \lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
 >>
-  \layout {
-    ragged-right = ##t
-  }
 
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index c78cd759c4..c48f7c8737 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -8,6 +8,17 @@ they go past the first note. "
 }
 
 
+\layout   {
+  indent = 0.0 \cm
+  line-width = 3.4 \cm
+
+  \context {
+    \Staff \remove "Time_signature_engraver"
+  }
+}
+
+
+
 <<
   \new Staff \relative c'' {
     \time 1/4 c16[ c c  c]
@@ -23,15 +34,5 @@ they go past the first note. "
     bla16 -- bla -- bla 
   }
 >>
-  \layout   {
-    indent = 0.0 \cm
-    line-width = 3.4 \cm
-
-    \context {
-      \Staff \remove "Time_signature_engraver"
-    }
-  }
-  
-
 
   
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index efd1fa5d89..82256aac18 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -6,6 +6,9 @@
 The boolean property @code{no-spacing-rods} in @code{TextScript} is used
 to control the horizontal size of text.  " }
 
+\layout {
+  line-width = 3.0\cm
+}
 
 \relative c''{
   %% \emptyText
@@ -15,8 +18,5 @@ to control the horizontal size of text.  " }
   \fatText
   c_"very wide and long text" c
 }
-\layout {
-  line-width = 3.0\cm
-}
 
 
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index f6e1a55507..c5ea828001 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -9,6 +9,11 @@ su = { \change Staff = up}
 sd = { \change Staff = down}
 
 
+\layout {
+  line-width = 8.0 \cm
+}
+
+
 \context PianoStaff
 <<
   \new Staff = "up"   {
@@ -21,9 +26,4 @@ sd = { \change Staff = down}
     \clef F s1*4
   }
 >>
-  \layout {
-    line-width = 8.0 \cm
-  }
-
-
 
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index bb35666906..8399155a52 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -8,6 +8,9 @@ run through noteheads or stems.
 "
 }
 
+\layout{
+  line-width = 120.\mm
+}
 
 \relative c''{
   \time 3/4
@@ -19,8 +22,3 @@ run through noteheads or stems.
   \stemNeutral c ( \stemUp c \stemNeutral  c) c ( a  c) c( d,  c') c( f,  c')
   \stemDown c( f,  c')
 }
-\layout{
-  line-width = 120.\mm
-}
-
-
diff --git a/input/regression/tie-broken-minimum-length.ly b/input/regression/tie-broken-minimum-length.ly
index 51f9708a3c..2d3739e5ec 100644
--- a/input/regression/tie-broken-minimum-length.ly
+++ b/input/regression/tie-broken-minimum-length.ly
@@ -8,13 +8,13 @@ has a @code{minimum-length} of 5."
 
 }
 
+\paper {
+  indent = 0.0\mm
+  line-width = 40.0\mm
+}
+
 \relative {
   \override Tie #'minimum-length = #5
   f2. f16  f  f  f ~ | \break
   f1
 }
-
-\paper {
-  indent = 0.0\mm
-  line-width = 40.0\mm
-}
-- 
2.39.2