* scm/output-lib.scm (fret-number-tablature-format): vcenter and

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

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index d9c406acbc395bbe61f53dd378d2c2994dea8c6e..dfcb9551b08bb942e2b170ee03f6edf705cd2dd9 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -10,16 +10,36 @@
  (ice-9 optargs)
  (ice-9 regex)
  (ice-9 rw)
- (srfi srfi-1))
+ (srfi srfi-1)
+ (srfi srfi-13)
+ (srfi srfi-14))
 
 ;; gettext wrapper for guile < 1.7.2
 (if (defined? 'gettext)
     (define-public _ gettext)
     (define-public (_ x) x))
 
+(define PLATFORM
+  (string->symbol
+   (string-downcase
+    (car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
+
 (define (re-sub re sub string)
   (regexp-substitute/global #f re string 'pre sub 'post))
 
+(define (search-executable names)
+  (define (helper path lst)
+    (if (null? (cdr lst))
+       (car lst)
+       (if (search-path path (car lst)) (car lst)
+           (helper path (cdr lst)))))
+
+  (let ((path (parse-path (getenv "PATH"))))
+    (helper path names)))
+
+(define (search-gs)
+  (search-executable '("gs-nox" "gs-8.15" "gs")))
+
 (define (gulp-port port max-length)
   (let ((str (make-string max-length)))
     (read-string!/partial str port)
@@ -58,12 +78,48 @@
         (map (lambda (x) (string->number (car x))) (vector->list m)))
        #f)))
 
+
+;; copy of ly:system. ly:* not available via lilypond-ps2png.scm
+(define (my-system be-verbose exit-on-error cmd)
+  (define status 0)
+  (if be-verbose
+      (begin
+       (format (current-error-port) (_ "Invoking `~a'...") cmd)
+       (newline (current-error-port))))
+
+  
+  (set! status (system cmd))
+  
+  (if (not (= status 0))
+      (begin
+       (format (current-error-port)
+               (format #f (_ "~a exited with status: ~S") "GS" status))
+       (if exit-on-error
+           (exit 1))))
+
+  status)
+
+(define (scale-down-image be-verbose factor file)
+  (let* ((status 0)
+        (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)
+  ))
+
 (define-public (make-ps-images ps-name . rest)
   (let-optional
    rest ((resolution 90)
         (paper-size "a4")
         (rename-page-1? #f)
-        (verbose? #f))
+        (verbose? #f)
+        (aa-factor 1) 
+        )
+   
    (let* ((base (basename (re-sub "[.]e?ps" "" ps-name)))
          (header (gulp-port (open-file ps-name "r") 10240))
          (png1 (string-append base ".png"))
@@ -74,45 +130,58 @@
          (output-file (if multi-page? pngn png1))
 
          ;;png16m is because Lily produces color nowadays.
-         (cmd (if multi-page?
-                  (format #f "gs\
+         (gs-variable-options
+           (if multi-page?
+               (format #f "-sPAPERSIZE=~a" paper-size)
+               "-dEPSCrop"))
+         (cmd (format #f "~a\
+ ~a\
+ ~a\
  -dGraphicsAlphaBits=4\
- -dNOPAUSE\
  -dTextAlphaBits=4\
- -sDEVICE=png16m\
- -sOutputFile='~a'\
- -sPAPERSIZE=~a\
- -q\
- -r~S\
- '~a'\
- -c showpage\
- -c quit" output-file paper-size resolution ps-name)
-                  (format #f "gs\
- -s\
- -dGraphicsAlphaBits=4\
- -dEPSCrop\
  -dNOPAUSE\
- -dTextAlphaBits=4\
  -sDEVICE=png16m\
- -sOutputFile='~a'\
- -q\
+ -sOutputFile=~S\
  -r~S\
- '~a'\
- -c quit" output-file resolution ps-name)))
-         (foo (for-each delete-file (append (dir-re "." png1)
-                                            (dir-re "." pngn-re))))
-         (bar (if verbose?
-                  (begin
-                    (format (current-error-port) (_ "Invoking `~a'...") cmd)
-                    (newline (current-error-port)))))
-         (status (system cmd)))
-     (if (not (= status 0))
+ ~S\
+ -c quit"
+                          (search-gs)
+                          (if verbose? "" "-q")
+                          gs-variable-options
+                          output-file 
+                          (* aa-factor resolution) ps-name))
+         (status 0)
+         (files '()))
+     
+     (for-each delete-file (append (dir-re "." png1)
+                                  (dir-re "." pngn-re)))
+     
+     ;; The wrapper on windows cannot handle `=' signs,
+     ;; gs has a workaround with #.
+     (if (eq? PLATFORM 'windows)
         (begin
-          (map delete-file
-               (append (dir-re "." png1) (dir-re "." pngn-re)))
-          (format (current-error-port)
-                  (format #f (_ "~a exited with status: ~S") "GS" status))
+          (set! cmd (re-sub "=" "#" cmd))
+          (set! cmd (re-sub "-dSAFER " "" cmd))))
+
+     (set! status (my-system verbose? #f cmd))
+
+     (set! files
+          (append (dir-re "." png1) (dir-re "." pngn-re)))
+
+     (if (not (= 0 status))
+        (begin
+          (map delete-file files)
           (exit 1)))
+     
      (if (and rename-page-1? multi-page?)
-        (rename (re-sub "%d" "1" pngn) png1))
-     (append (dir-re "." png1) (dir-re "." pngn-re)))))
+        (rename-file (re-sub "%d" "1" pngn) png1))
+     
+     (set! files
+          (append (dir-re "." png1) (dir-re "." pngn-re)))
+
+     
+     (if (not (= 1 aa-factor))
+        (for-each  (lambda (f) (scale-down-image verbose? aa-factor f))
+                   files))
+                           
+     files)))