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

(scale-paper): divide by scale.

diff --git a/ChangeLog b/ChangeLog
index b9a2b11b81fa574517dc60bd5c593aa6d43f2955..dbcdcba2c07e3c9fc42219e243b8a7032fbaf6f8 100644 (file)
--- 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 15acb3ea767f0858d475e41b37966dde28919041..c4a1471b62d68a5c0acb6ed85793d35071579183 100644 (file)
--- 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)