Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 4f6d322e4825a69b55ca30a3002cc922c2028601..7b7e3eb157deb3f3d49475a53f8faa13f6edc656 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -50,30 +50,6 @@
 (define-public (gulp-file file-name . max-size)
   (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)
@@ -90,16 +66,19 @@
   status)
 
 (define (scale-down-image be-verbose factor file)
-  (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)))
+  (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)
@@ -146,6 +125,7 @@
  ~a\
  -dGraphicsAlphaBits=4\
  -dTextAlphaBits=4\
+ -q
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\