From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 24 May 2004 21:14:55 +0000 (+0000)
Subject: (paper-set-staff-size): scale linewidth too.
X-Git-Tag: release/2.3.2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=31d5a3e78382c87d02a88a6ab12d35d2dff179f9;p=lilypond.git

(paper-set-staff-size): scale linewidth too.
(scale-paper): divide by scale.
---

diff --git a/ChangeLog b/ChangeLog
index b9a2b11b81..dbcdcba2c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* scm/paper.scm (paper-set-staff-size): scale linewidth too.
+	(scale-paper): divide by scale.
+
 2004-05-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* lily/rest-collision.cc (do_shift): also do nothing for the (0,2)
diff --git a/scm/paper.scm b/scm/paper.scm
index 15acb3ea76..c4a1471b62 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -26,6 +26,7 @@
 
     (module-define! m 'dimension-variables
 		    '(pt mm cm in staffheight staff-space
+			 linewidth
 			 staffspace linethickness ledgerlinethickness
 			 blotdiameter interscoreline))
     ))
@@ -111,14 +112,12 @@
       ((scale (ly:bookpaper-outputscale bookpap))
        (new-pap (ly:output-def-clone pap))
        (dim-vars (ly:paper-lookup pap 'dimension-variables))
-       (scope (ly:output-def-scope new-pap))
-       )
+       (scope (ly:output-def-scope new-pap)))
 
     (for-each
      (lambda (v)
        (module-define! scope v
-		       (* (ly:paper-lookup pap v) scale)))
-
+		       (/ (ly:paper-lookup pap v) scale)))
      
      dim-vars)