(editor-command-template-alist): Add syn

[lilypond.git] / scm / backend-library.scm

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index e200b2dd4ad8a0f715d126f73546863a893ca9ca..c9d72d8f5d06fd2dda5a56b62c8af4f05102fabb 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -33,7 +33,7 @@
    "\""))
 
 (define-public (postscript->pdf papersizename name)
-  (let* ((pdf-name (string-append (basename name ".ps") ".pdf" ))
+  (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
         (cmd (format #f
                      "gs\
  -dSAFER\
@@ -42,6 +42,7 @@
  -q\
  -dNOPAUSE\
  -dBATCH\
+ -r1200 \
  -sDEVICE=pdfwrite\
  -sOutputFile=~S\
  -c .setpdfwrite\
@@ -53,37 +54,29 @@
     ;; The wrapper on windows cannot handle `=' signs,
     ;; gs has a workaround with #.
     (if (eq? PLATFORM 'windows)
-       (set! cmd (string-regexp-substitute "=" "#" cmd)))
+       (begin
+         (set! cmd (string-regexp-substitute "=" "#" cmd))
+         (set! cmd (string-regexp-substitute "-dSAFER " "" cmd))))
 
     (if (access? pdf-name W_OK)
        (delete-file pdf-name))
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
-    (ly:system cmd)))
-
-(define-public (postscript->png resolution papersizename name)
-  (let* ((prefix (ly:effective-prefix))
+    (ly:system cmd)
+    (if (running-from-gui?) (delete-file name))))
 
-        ;; run the source, if  we are in the build-directory
-        (ps2png-source (if prefix
-                          (format "~a/scripts/lilypond-ps2png.py" prefix)
-                          "lilypond-ps2png"))
-        (cmd (format #f
-                     "~a --resolution=~S --papersize=~a~a ~S"
-                     (if (file-exists? ps2png-source)
-                         (format "python ~a" ps2png-source)
-                         "lilypond-ps2png")
-                     resolution
-                     (sanitize-command-option papersizename)
-                     (if (ly:get-option 'verbose) " --verbose " "")
-                     name)))
+(use-modules (scm ps-to-png))
+(define-public (postscript->png resolution paper-size-name name)
     ;; Do not try to guess the name of the png file,
     ;; GS produces PNG files like BASE-page%d.png.
     ;;(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))
     (ly:message (_ "Converting to ~a...") "PNG")
-    (ly:system cmd)
+    (make-ps-images name resolution paper-size rename-page-1? verbose?)
     (ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module filename formats)