* ps/lilyponddefs.ps: put mm -> pt scaling in here.

* scm/framework-ps.scm (output-variables): separately scale the
page to mm

diff --git a/ChangeLog b/ChangeLog
index f19dcf21e7c712eb8ac6e1f973412b10f06788d0..5847e4de77ea869e6b85a2953b6c45562583b938 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-01-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * ps/lilyponddefs.ps: put mm -> pt scaling in here.
+
        * input/regression/new-markup-scheme.ly: oops. font-family=music
        -> font-encoding fetaMusic.  
 
@@ -127,6 +129,8 @@
 
 2004-12-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * VERSION: release 2.5.5
+       
        * lily/main.cc: use TeX as default output format.
 
        * flower/file-path.cc (find): try to open directly as well, so we

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 542513c4e2a5bb0501403f636f810543c8af6e50..bdeec36366094345a5c0f7b916553c18e25bd37d 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -10,7 +10,9 @@
 % export GS_LIB=$(pwd)/mf/out:/usr/share/texmf/fonts/type1/bluesky/cm
 
 
-/set-ps-scale-to-lily-scale { output-scale output-scale scale } bind def
+/set-ps-scale-to-lily-scale {
+    lily-output-units output-scale mul
+    lily-output-units output-scale mul scale } bind def
 
 /init-paper {
        gsave

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 4425cf8a1135f260d4e4c1ada236d36390959648..b34175b76e5e20799464d9079e565f436365a32c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -157,7 +157,6 @@
 
   (string-append
    "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter
-lily-output-units lily-output-units scale
 "
    (output-entry "staff-line-thickness" 'linethickness)
    (output-entry "line-width" 'linewidth)