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 ab0ac5d672adfc01b851b51e10a24006628b7186..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))
 
@@ -13,6 +13,7 @@
  (srfi srfi-1)
  (srfi srfi-13)
  (srfi srfi-14)
+ (lily)
  )
 
 ;; gettext wrapper for guile < 1.7.2
@@ -44,12 +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)
-  (gulp-port (open-file nm "r") len))
 
-;;; ARGH - cuases memory usage to explode with GUILE cvs.  
+  ;; 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 BOUNDING-BOX-RE
   "^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)")
@@ -64,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)))
@@ -100,22 +105,26 @@
         (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*
-      ((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
@@ -127,7 +136,6 @@
         )
    
    (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"))
          (page-count (ps-page-count ps-name))
@@ -135,11 +143,14 @@
          (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\
@@ -151,11 +162,11 @@
  -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 '()))
 
@@ -168,13 +179,13 @@
 
      (set! status (my-system verbose? #f cmd))
 
-     (if multi-page?
-        (set! files
+     (set! files
+          (if multi-page?
               (map
                (lambda (n)
                  (format "~a-page~a.png" base (1+ n)))
-               (iota page-count)))
-        (list (format "~a.png" base)))
+               (iota page-count))
+              (list (format "~a.png" base))))
      
      (if (not (= 0 status))
         (begin
@@ -188,9 +199,9 @@
                 (cons png1
                       (cdr files)))
           ))
-     
+
      (if (not (= 1 aa-factor))
         (for-each  (lambda (f) (scale-down-image verbose? aa-factor f))
                    files))
-                           
+
      files)))