* scm/ps-to-png.scm (make-ps-images): fix rename-page-1 functionality.

* scm/backend-library.scm (postscript->png): set rename-page-1 to
true.

diff --git a/ChangeLog b/ChangeLog
index a8950a084f8e123963308f26f7326d86221bcdad..7800f284b87d860a235118bd0ae3e216e2bf07f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/ps-to-png.scm (make-ps-images): fix rename-page-1 functionality.
+
+       * scm/backend-library.scm (postscript->png): set rename-page-1 to
+       true.
+
 2005-06-11  Graham Percival <gperlist@shaw.ca>
 
        * Documentation/user/lilypond-book.itely: add warning about
@@ -5,6 +12,8 @@
 
 2005-06-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * THANKS: typo
+
        * mf/GNUmakefile ($(outdir)/$(redhat-package)): Fedora-4 url.
 
        * GNUmakefile.in: remove links for .map, .enc

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 8a9de3b665b951b3afa749b51a6344a40fb892cf..25b2ae9e7b3d427cd798467ba1a1af29a0779b1b 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -93,10 +93,10 @@
     ;;(ly:message (_ "Converting to `~a'...")
     ;;     (string-append (basename name ".ps") "-page1.png" )))
   (let ((paper-size (sanitize-command-option paper-size-name))
-       (verbose? (ly:get-option 'verbose))
-       (rename-page-1? #f))
+       (verbose (ly:get-option 'verbose))
+       (rename-page-1 #t))
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-size rename-page-1? verbose?)
+    (make-ps-images name resolution paper-size rename-page-1 verbose)
     (ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module filename formats)

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index b18176de68accaffed2dc6714ca42170f8516ca7..5df74ca516297cb77b1e00c5aabbb8b0058f3263 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -147,5 +147,5 @@
                   (format #f (_ "~a exited with status: ~S") "GS" status))
           (exit 1)))
      (if (and rename-page-1? multi-page?)
-        (rename (re-sub "%d" "1" pngn) png1))
+        (rename-file (re-sub "%d" "1" pngn) png1))
      (append (dir-re "." png1) (dir-re "." pngn-re)))))