(voice): move linethickness

settings to bookpaper.

diff --git a/ChangeLog b/ChangeLog
index 2fa4f107cc03b05da47b445c3b617a5ffa128e4a..11f6485e2dc7f15760bb17cc62d0f591011b73b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/test/mensural-ligatures.ly (voice): move linethickness
+       settings to bookpaper.
+
        * lily/simple-spacer.cc (Module): use force to stretch to 
        line length as force measure for ragged spacing.
        

diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 2eeccc37bb9dfe4e6f2d4353f5127f42c64a4812..b1007b270d1597df4c8f1c805720ae52274554de 100644 (file)
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -80,13 +80,16 @@ verba = \context Lyrics = "verba" \lyricmode {
   et fi -- li -- us da -- tus est no -- bis:
 }
 
+\bookpaper  {
+    linethickness = \staffspace / 7.0
+}
+
 \score {
   <<
     \cantus
     \lyricsto "cantus" \verba
   >>
   \paper {
-    linethickness = \staffspace / 7.0
     linewidth = 137.0\mm
     width = 137.0\mm
     indent = 0.0

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index b5d36d7b700cd8d8a52f71da06c633135b1e2d18..1772eab2eb114a74afcd26fce98267279ca41d74 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -210,6 +210,10 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
   >>
 >>
 
+\bookpaper {
+       linethickness = #(/ staffspace 5.0)
+}
+
 \score {
     \context Score <<
        \upperStaff
@@ -219,7 +223,6 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 % do we want to keep these settings? -gp
        linewidth = 17.25\cm
        textheight = 26.0\cm
-       linethickness = #(/ staffspace 5.0)
        indent = 0.0
        \context {
            \Score

diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index 7492cd2682a3d32501f569668b8e57ab74783d62..a875fdaa032c1232baf05460f299fbb24db57346 100644 (file)
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -17,7 +17,7 @@ insert postscript directly into the output.
     s2
     a'1
   }
-  \paper { linewidth = 70 * \staffspace
+  \paper { linewidth = 70 * 5 \pt
 %      raggedright = ##t 
        }
 }

diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index e723816e29418666ab0b24e66882d026defa6ee2..5d4bc3dc031700d110dad613d742679733fbd09b 100644 (file)
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -26,6 +26,10 @@ FIXME: episem stops one notehead too early.
 
 \include "gregorian-init.ly"
 
+\bookpaper {
+    linethickness = \staffspace / 5.0
+}
+
 \score {
   \context VaticanaVoice {
     \override Script #'padding = #-0.5
@@ -45,7 +49,6 @@ FIXME: episem stops one notehead too early.
   }
   \paper {
     linewidth = 70.0
-    linethickness = \staffspace / 5.0
     width = 60.0
     indent = 0.0
     raggedright = ##t

diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index 6738d98aea5c8ecc49820716b3a19ab471427cbe..8ce903dc35540796b015b0bf760494de2d9361d2 100644 (file)
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -21,13 +21,16 @@ verba = \context Lyrics = "verba" \lyricmode {
   Al- le- lu- ia.
 }
 
+\bookpaper {
+    linethickness = \staffspace / 7.0
+}
+
 \score {
   <<
     \cantus
     \lyricsto "cantus" \verba
   >>
   \paper {
-    linethickness = \staffspace / 7.0
     linewidth = 137.0 \mm
     width = 137.0 \mm
     indent = 0.0

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 54d39c93c09c67f248df33a708010848e0ffcb4c..fb6fbd2dd2b5e49e8c7b13711a824c1277af1058 100644 (file)
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -32,6 +32,9 @@ voice =  \transpose c c' {
   \bar "||"
 }
 
+\bookpaper {
+    linethickness = \staffspace / 5.0
+}
 \score {
     \context ChoirStaff <<
        \new MensuralStaff <<
@@ -46,7 +49,6 @@ voice =  \transpose c c' {
        >>
     >>
     \paper {
-       linethickness = \staffspace / 5.0
        \context {
            \Voice
            \name MensuralVoice