Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / scm / ps-to-png.scm

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index a7c87d8b8dce1f8e4a7b9ca56b5d5f62e3a9c4f5..2d429886f30b24ffd0b3f7bef81250e351b9b0f5 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm ps-to-png))
 
@@ -45,16 +45,16 @@
 (define (gulp-port port max-length)
   (let ((str (make-string max-length)))
     (read-string!/partial str port 0 max-length)
-   str))
+    str))
 
 (define (gulp-file nm len)
 
   ;; string routines barf when strlen() != string-length,.
   ;; which may happen as side effect of read-string!/partial.
   
-;  (gulp-port (open-file nm "r") len))
+                                       ;  (gulp-port (open-file nm "r") len))
   (ly:gulp-file nm len))
-  
+
 
 (define BOUNDING-BOX-RE
   "^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)")
@@ -69,7 +69,7 @@
  ~S\
  -c showpage\
  -c quit 2>~S"
-                         file-name bbox))
+                     file-name bbox))
         (status (system cmd))
         (s (gulp-file d bbox 10240))
         (m (string-match BOUNDING_BOX_RE s)))
@@ -105,48 +105,57 @@
         (percentage (* 100 (/ 1.0 factor)))
         (old (string-append file ".old")))
 
-  (rename-file file old)
-  (my-system be-verbose
-            #t
-            (format #f "convert -scale \"~a%\" ~a ~a" percentage old file))
-  (delete-file old)
-  ))
-
+    (rename-file file old)
+    (my-system be-verbose
+              #t
+              (format #f "convert -scale \"~a%\" -depth 8 ~a ~a" percentage old file))
+    (delete-file old)
+    ))
 
 (define-public (ps-page-count ps-name)
   (let*
-      ((header (gulp-file ps-name 10240))
-       (match (string-match "%%Pages: ([0-9]+)" header))
-       (count (if match
-                 (string->number (match:substring match 1))
-                 0)))
-    count))
+      ((byte-count 10240)
+       (header (gulp-file ps-name byte-count))
+       (first-null (string-index header #\nul))
+       (match (string-match "%%Pages: ([0-9]+)"
+                           (if (number? first-null)
+                               (substring header 0 first-null)
+                               header))))
+
+    (if match
+       (string->number (match:substring match 1))
+       0)))
 
 (define-public (make-ps-images ps-name . rest)
-  (let-optional
-   rest ((resolution 90)
-        (paper-size "a4")
-        (rename-page-1? #f)
-        (verbose? #f)
-        (aa-factor 1) 
-        )
-   
-   (let* ((base (basename (re-sub "[.]e?ps" "" ps-name)))
-         (header (gulp-file ps-name 10240))
-         (png1 (string-append base ".png"))
-         (pngn (string-append base "-page%d.png"))
+  (let-keywords*
+   rest #f
+     ((resolution 90)
+      (page-width  100)
+      (page-height 100)
+      (rename-page-1 #f)
+      (be-verbose #f)
+      (pixmap-format 'png16m)
+      (anti-alias-factor 1))
+     
+   (let* (
+         (format-str (format "~a" pixmap-format))
+         (extension (cond
+                     ((string-contains format-str "png") "png")
+                     ((string-contains format-str "jpg") "jpeg")
+                     ((string-contains format-str "jpeg") "jpeg")
+                     (else
+                      (ly:error "Unknown pixmap format ~a" pixmap-format))))
+         (base (basename (re-sub "[.]e?ps" "" ps-name)))
+         (png1 (format "~a.~a" base extension))
+         (pngn (format  "~a-page%d.~a" base extension))
          (page-count (ps-page-count ps-name))
-         
          (multi-page? (> page-count 1))
          (output-file (if multi-page? pngn png1))
 
-         ;; png16m is because Lily produces color nowadays.
-         ;; can't use pngalpha device, since IE is broken.
-         ;;
          (gs-variable-options
-           (if multi-page?
-               (format #f "-sPAPERSIZE=~a" paper-size)
-               "-dEPSCrop"))
+          (if multi-page?
+              (format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f" page-width page-height)
+              "-dEPSCrop"))
 
          (cmd (format #f "~a\
  ~a\
@@ -154,16 +163,17 @@
  -dGraphicsAlphaBits=4\
  -dTextAlphaBits=4\
  -dNOPAUSE\
- -sDEVICE=png16m\
+ -sDEVICE=~a\
  -sOutputFile=~S\
  -r~S\
  ~S\
  -c quit"
-                          (search-gs)
-                          (if verbose? "" "-q")
-                          gs-variable-options
-                          output-file 
-                          (* aa-factor resolution) ps-name))
+                      (search-gs)
+                      (if be-verbose "" "-q")
+                      gs-variable-options
+                      pixmap-format
+                      output-file 
+                      (* anti-alias-factor resolution) ps-name))
          (status 0)
          (files '()))
 
@@ -174,7 +184,7 @@
           (set! cmd (re-sub "=" "#" cmd))
           (set! cmd (re-sub "-dSAFER " "" cmd))))
 
-     (set! status (my-system verbose? #f cmd))
+     (set! status (my-system be-verbose #f cmd))
 
      (set! files
           (if multi-page?
@@ -189,7 +199,7 @@
           (map delete-file files)
           (exit 1)))
 
-     (if (and rename-page-1? multi-page?)
+     (if (and rename-page-1 multi-page?)
         (begin
           (rename-file (re-sub "%d" "1" pngn) png1)
           (set! files
@@ -197,8 +207,8 @@
                       (cdr files)))
           ))
 
-     (if (not (= 1 aa-factor))
-        (for-each  (lambda (f) (scale-down-image verbose? aa-factor f))
+     (if (not (= 1 anti-alias-factor))
+        (for-each  (lambda (f) (scale-down-image be-verbose anti-alias-factor f))
                    files))
-                           
+
      files)))