*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 0a00eff7bbc794f7e5dbd6b2e669a3a7b47ecb19..0200f9dce5054a735fb6bf769ac97954300523c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-07  Guido Amoruso  <guidonte@katamail.com>
+
+       * scm/ps-to-png.scm (Module): 
+       * scm/framework-tex.scm (Module): 
+       * scm/framework-ps.scm (Module): 
+       * scm/backend-library.scm (Module): 
+       * scm/framework-ps.scm: invoke gs with "-dDEVICEWIDTHPOINTS" and
+       "dDEVICEHEIGHTPOINTS".
+
 2006-07-04  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ various: general improvements to

diff --git a/THANKS b/THANKS
index 85b0b71f563bc01c0fdc58b66054e37988d1278c..bd2de73c740a2c68b2d279e4249aea73e6272ee4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -13,10 +13,10 @@ CONTRIBUTORS
 David Feuer
 Erik Sandberg
 Erlend Aasland
+Guido Amoruso
 Heikki Junes
 Joe Neeman
 
-
 SPONSORS
 
 Andrew Sidwell

diff --git a/python/convertrules.py b/python/convertrules.py
index ecf7532ceffda5165889cb58aa0fb940e99eb9ec..f2571e882321ce45fb75b6d9cf5e4ab7e1561000 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2680,6 +2680,7 @@ conversions.append (((2, 7, 28), conv,
 
 def conv (str):
     for a in ['beamed-lengths', 'beamed-minimum-free-lengths',
+              'lengths',
              'beamed-extreme-minimum-free-lengths']:
        str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
                      r"\\override Stem #'details #'%s" % a,

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 731dcf083e79a140d77c0645b9950a6a2d7fd597..689478f291c4c8c401be20108294e861f8f337ca 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -49,14 +49,14 @@
   ;; must be sure that we don't catch stuff from old GUBs.
   (search-executable '("gs")))
 
-(define-public (postscript->pdf papersizename name)
+(define-public (postscript->pdf paper-width paper-height name)
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
         (cmd (format #f
                      "~a\
  ~a\
  ~a\
  -dCompatibilityLevel=1.4 \
- -sPAPERSIZE=~a\
+ -dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f\
  -dNOPAUSE\
  -dBATCH\
  -r1200 \
@@ -70,7 +70,8 @@
                      (if (ly:get-option 'gs-font-load)
                          " -dNOSAFER "
                          " -dSAFER ")
-                     (sanitize-command-option papersizename)
+                     paper-width
+                     paper-height
                      pdf-name
                      name)))
     ;; The wrapper on windows cannot handle `=' signs,
@@ -90,17 +91,16 @@
 
 (use-modules (scm ps-to-png))
 
-(define-public (postscript->png resolution paper-size-name name)
+(define-public (postscript->png resolution paper-width paper-height name)
     ;; Do not try to guess the name of the png file,
     ;; GS produces PNG files like BASE-page%d.png.
     ;;(ly:message (_ "Converting to `~a'...")
     ;;     (string-append (basename name ".ps") "-page1.png" )))
-  (let ((paper-size (sanitize-command-option paper-size-name))
-       (verbose (ly:get-option 'verbose))
+  (let ((verbose (ly:get-option 'verbose))
        (rename-page-1 #f))
 
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-size rename-page-1 verbose
+    (make-ps-images name resolution paper-width paper-height rename-page-1 verbose
                    (ly:get-option 'anti-alias-factor))
     (ly:progress "\n")))
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index a32979b529bd14d9aca4e972c94ef355ee4ad3b1..e39b245233bdb9b82d9a393fc72b7cba5f876067 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -590,11 +590,14 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
+        (paper-width (ly:output-def-lookup defs 'paper-width))
+        (paper-height (ly:output-def-lookup defs 'paper-height))
+        (output-scale (ly:output-def-lookup defs 'output-scale)))
 
     (if (equal? (basename name ".ps") "-")
        (ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-       (postscript->pdf (if (string? papersizename) papersizename "a4")
+       (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
+                        (* paper-height output-scale (/ (ly:bp 1)))
                         name))))
 
 (define-public (convert-to-png book name)
@@ -603,10 +606,13 @@
         (resolution (if (number? defs-resolution)
                         defs-resolution
                         (ly:get-option 'resolution)))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
+        (paper-width (ly:output-def-lookup defs 'paper-width))
+        (paper-height (ly:output-def-lookup defs 'paper-height))
+        (output-scale (ly:output-def-lookup defs 'output-scale)))
 
     (postscript->png resolution
-                    (if (string? papersizename) papersizename "a4")
+                    (* paper-width output-scale (/ (ly:bp 1)))
+                    (* paper-height output-scale (/ (ly:bp 1)))
                     name)))
 
 (define-public (convert-to-dvi book name)

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 27e7d66013134fa980efb4f80626bce38069b938..001da511130b6f488819fc7aaeb3d0c317b1f5d2 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -290,23 +290,27 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
-    (postscript->pdf (if (string? papersizename) papersizename "a4")
+        (paper-width (ly:output-def-lookup defs 'paper-width))
+        (paper-height (ly:output-def-lookup defs 'paper-height))
+        (output-scale (ly:output-def-lookup defs 'output-scale)))
+    (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
+                    (* paper-height output-scale (/ (ly:bp 1)))
                     (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
         (resolution (ly:output-def-lookup defs 'pngresolution))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
+        (paper-width (ly:output-def-lookup defs 'paper-width))
+        (paper-height (ly:output-def-lookup defs 'paper-height))
+        (output-scale (ly:output-def-lookup defs 'output-scale)))
     (postscript->png
      (if (number? resolution)
         resolution
         (ly:get-option 'resolution))
 
-     (if (string? papersizename)
-        papersizename
-        "a4")
-     
+     (* paper-width output-scale (/ (ly:bp 1)))
+     (* paper-height output-scale (/ (ly:bp 1)))
+
      (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 50891e8f4b836430be719559d302c991ebab090d..d76f926a90203b02d006a082d99d25f8f2190c9d 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -129,12 +129,13 @@
 (define-public (make-ps-images ps-name . rest)
   (let-optional
    rest ((resolution 90)
-        (paper-size "a4")
+        page-width
+        page-height
         (rename-page-1? #f)
         (verbose? #f)
         (aa-factor 1) 
         )
-   
+
    (let* ((base (basename (re-sub "[.]e?ps" "" ps-name)))
          (png1 (string-append base ".png"))
          (pngn (string-append base "-page%d.png"))
@@ -148,7 +149,7 @@
          ;;
          (gs-variable-options
           (if multi-page?
-              (format #f "-sPAPERSIZE=~a" paper-size)
+              (format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f" page-width page-height)
               "-dEPSCrop"))
 
          (cmd (format #f "~a\