X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps-to-png.scm;h=cb20163c01e2062f495a7b95fa076e8975c74f5b;hb=150be05ab6c52ed8760d4dc1b05870355ce7b708;hp=19473b9a638fa08c559bbffb319a7693edaa7207;hpb=1759a10e0e322868d2eefb13ebd13b047c6afd55;p=lilypond.git

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 19473b9a63..cb20163c01 100644
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm ps-to-png))
 
@@ -48,35 +48,8 @@
     str))
 
 (define-public (gulp-file file-name . max-size)
-  ;; 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 file-name (if (pair? max-size) (car max-size))))
 
-(define BOUNDING-BOX-RE
-  "^%%BoundingBox: (-?[0-9]+) (-?[0-9]+) (-?[0-9]+) (-?[0-9]+)")
-
-(define (unused-found-broken-get-bbox file-name)
-  (let* ((bbox (string-append file-name ".bbox"))
-	 ;; -sOutputFile does not work with bbox?
-	 (cmd (format #t "gs\
- -sDEVICE=bbox\
- -q\
- -dNOPAUSE\
- ~S\
- -c showpage\
- -c quit 2>~S"
-		      file-name bbox))
-	 (status (system cmd))
-	 (s (gulp-file bbox 10240))
-	 (m (string-match BOUNDING_BOX_RE s)))
-
-    (if m
-	(list->vector
-	 (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)
@@ -93,18 +66,19 @@
   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
-     ;; convert -scale creates (a large rgb) png from a grayscale
-     ;; (format #f "convert -scale \"~a%\" -depth 8 ~a ~a" percentage old file))
-
-     (format #f "pngtopnm ~a | pnmscale -reduce ~a | pnmtopng > ~a" old factor file))
-    (delete-file old)))
+  (define (with-pbm)
+    (let* ((status 0)
+	   (old (string-append file ".old")))
+      
+      (rename-file file old)
+      (my-system
+       be-verbose #t
+       (format #f
+	       "pngtopnm ~a | pnmscale -reduce ~a 2>/dev/null | pnmtopng -compression 9 2>/dev/null > ~a"
+	       old factor file))
+      (delete-file old)))
+
+  (with-pbm))
 
 (define-public (ps-page-count ps-name)
   (let* ((byte-count 10240)
@@ -116,9 +90,6 @@
 				  header))))
     (if match (string->number (match:substring match 1)) 0)))
 
-(define-public (ps-has-color ps-name)
-  (string-contains (gulp-file ps-name) " setrgbcolor"))
-
 (define-public (make-ps-images ps-name . rest)
   (let-keywords*
    rest #f
@@ -126,7 +97,7 @@
     (page-width  100)
     (page-height 100)
     (rename-page-1 #f)
-    (be-verbose #f)
+    (be-verbose (ly:get-option 'verbose))
     (pixmap-format 'png16m)
     (anti-alias-factor 1))
 
@@ -137,7 +108,7 @@
 		      ((string-contains format-str "jpeg") "jpeg")
 		      (else
 		       (ly:error "Unknown pixmap format ~a" pixmap-format))))
-	  (base (basename (re-sub "[.]e?ps" "" ps-name)))
+	  (base (dir-basename ps-name ".ps" ".eps"))
 	  (png1 (format "~a.~a" base extension))
 	  (pngn (format  "~a-page%d.~a" base extension))
 	  (page-count (ps-page-count ps-name))