Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index ddaa3bc18acda6eccd00230c548a9a93af49b784..50891e8f4b836430be719559d302c991ebab090d 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))
 
@@ -12,7 +12,9 @@
  (ice-9 rw)
  (srfi srfi-1)
  (srfi srfi-13)
- (srfi srfi-14))
+ (srfi srfi-14)
+ (lily)
+ )
 
 ;; gettext wrapper for guile < 1.7.2
 (if (defined? 'gettext)
@@ -43,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 (dir-listing dir-name)
-  (define (dir-helper dir lst)
-    (let ((e (readdir dir)))
-      (if (eof-object? e) lst (dir-helper dir (cons e lst)))))
-  (reverse (dir-helper (opendir dir-name) '())))
+(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))
+  (ly:gulp-file nm len))
 
-(define (dir-re dir re)
-  (filter (lambda (x) (string-match re x)) (dir-listing dir)))
 
 (define BOUNDING-BOX-RE
   "^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)")
@@ -67,12 +69,11 @@
  ~S\
  -c showpage\
  -c quit 2>~S"
-                         file-name bbox))
+                     file-name bbox))
         (status (system cmd))
-        (s (gulp-port (open-file bbox "r") 10240))
+        (s (gulp-file d bbox 10240))
         (m (string-match BOUNDING_BOX_RE s)))
-    (display m)
-    (newline)
+
     (if m
        (list->vector
         (map (lambda (x) (string->number (car x))) (vector->list m)))
@@ -103,13 +104,27 @@
   (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)
-  ))
+
+    (rename-file file old)
+    (my-system be-verbose
+              #t
+              (format #f "convert -scale \"~a%\" ~a ~a" percentage old file))
+    (delete-file old)
+    ))
+
+(define-public (ps-page-count ps-name)
+  (let*
+      ((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
@@ -121,20 +136,21 @@
         )
    
    (let* ((base (basename (re-sub "[.]e?ps" "" ps-name)))
-         (header (ly:gulp-file ps-name))
-;        (header (gulp-port (open-file ps-name "r") 10240))
          (png1 (string-append base ".png"))
          (pngn (string-append base "-page%d.png"))
-         (pngn-re (re-sub "%d" "[0-9]*" pngn))
-         (multi-page? (and (string-match "\n%%Pages: " header)
-                           (not (string-match "\n%%Pages: 1\n" header))))
+         (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.
+         ;; 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 "-sPAPERSIZE=~a" paper-size)
+              "-dEPSCrop"))
+
          (cmd (format #f "~a\
  ~a\
  ~a\
@@ -146,18 +162,14 @@
  -r~S\
  ~S\
  -c quit"
-                          (search-gs)
-                          (if verbose? "" "-q")
-                          gs-variable-options
-                          output-file 
-                          (* aa-factor resolution) ps-name))
+                      (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)
@@ -168,22 +180,28 @@
      (set! status (my-system verbose? #f cmd))
 
      (set! files
-          (append (dir-re "." png1) (dir-re "." pngn-re)))
-
+          (if multi-page?
+              (map
+               (lambda (n)
+                 (format "~a-page~a.png" base (1+ n)))
+               (iota page-count))
+              (list (format "~a.png" base))))
+     
      (if (not (= 0 status))
         (begin
           (map delete-file files)
           (exit 1)))
-     
+
      (if (and rename-page-1? multi-page?)
-        (rename-file (re-sub "%d" "1" pngn) png1))
-     
-     (set! files
-          (append (dir-re "." png1) (dir-re "." pngn-re)))
+        (begin
+          (rename-file (re-sub "%d" "1" pngn) png1)
+          (set! files
+                (cons png1
+                      (cdr files)))
+          ))
 
-     
      (if (not (= 1 aa-factor))
         (for-each  (lambda (f) (scale-down-image verbose? aa-factor f))
                    files))
-                           
+
      files)))