From: hanwen <hanwen>
Date: Mon, 20 Sep 2004 21:59:21 +0000 (+0000)
Subject: (voice): move linethickness
X-Git-Tag: release/2.3.24^2~168
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=386ece08dddc7db1da000a6958e8d682c2581e09;p=lilypond.git

(voice): move linethickness
settings to bookpaper.
---

diff --git a/ChangeLog b/ChangeLog
index 2fa4f107cc..11f6485e2d 100644
--- 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 2eeccc37bb..b1007b270d 100644
--- 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 b5d36d7b70..1772eab2eb 100644
--- 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 7492cd2682..a875fdaa03 100644
--- 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 e723816e29..5d4bc3dc03 100644
--- 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 6738d98aea..8ce903dc35 100644
--- 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 54d39c93c0..fb6fbd2dd2 100644
--- 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