Issue 4417 / 3: Fix png filename handling

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

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index dd70eca22f647d2df0bf0b2a9a54c5e1e10e6d72..9c977b6463fd20d3a535ddcb353e567992736958 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -95,7 +95,14 @@
           (pngn (format #f "~a-page%d.~a" base-name extension))
           (page-count (ps-page-count tmp-name))
           (multi-page? (> page-count 1))
-          (output-file (if multi-page? pngn png1))
+
+          ;; Escape `%' (except `page%d') for ghostscript
+          (base-name-gs (string-join
+                         (string-split base-name #\%)
+                         "%%"))
+          (png1-gs (format #f "~a.~a" base-name-gs extension))
+          (pngn-gs (format #f "~a-page%d.~a" base-name-gs extension))
+          (output-file (if multi-page? pngn-gs png1-gs))
 
           (*unspecified* (if #f #f))
           (cmd