(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 d03b95870ca49543d4d4c61fec9a6d2fc058bcd5..c9d72d8f5d06fd2dda5a56b62c8af4f05102fabb 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -10,20 +10,19 @@
 
 (define-public (ly:system command)
   (let* ((status 0)
-        (silenced
-         (string-append command (if (ly:get-option 'verbose)
-                                    ""
-                                    " > /dev/null 2>&1 "))))
-
+        (dev-null "/dev/null")
+        (silenced (if (or (ly:get-option 'verbose)
+                          (not (access? dev-null W_OK)))
+                      command
+                      (format #f "~a > ~a 2>&1 " command dev-null))))
     (if (ly:get-option 'verbose)
-       (format (current-error-port) (_ "Invoking `~a'...") command))
+       (ly:message (_ "Invoking `~a'...") command))
     
     (set! status (system silenced))
     (if (> status 0)
        (begin
-         (format (current-error-port) (_ "`~a' failed (~a)") command status)
-         (newline (current-error-port))
-         
+         (ly:message (_ "`~a' failed (~a)") command status)
+         (ly:progress "\n")
          ;; hmmm.  what's the best failure option? 
          (throw 'ly-file-failed)))))
 
@@ -34,40 +33,57 @@
    "\""))
 
 (define-public (postscript->pdf papersizename name)
-  (let* ((cmd (string-append "ps2pdf "
-                            (string-append
-                             " -sPAPERSIZE="
-                             (sanitize-command-option papersizename)
-                             " "
-                             name)))
-        (pdf-name (string-append (basename name ".ps") ".pdf" )))
+  (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
+        (cmd (format #f
+                     "gs\
+ -dSAFER\
+ -dCompatibilityLevel=1.4 \
+ -sPAPERSIZE=~a\
+ -q\
+ -dNOPAUSE\
+ -dBATCH\
+ -r1200 \
+ -sDEVICE=pdfwrite\
+ -sOutputFile=~S\
+ -c .setpdfwrite\
+ -f ~S\
+"
+                     (sanitize-command-option papersizename)
+                     pdf-name
+                     name)))
+    ;; The wrapper on windows cannot handle `=' signs,
+    ;; gs has a workaround with #.
+    (if (eq? PLATFORM 'windows)
+       (begin
+         (set! cmd (string-regexp-substitute "=" "#" cmd))
+         (set! cmd (string-regexp-substitute "-dSAFER " "" cmd))))
 
     (if (access? pdf-name W_OK)
        (delete-file pdf-name))
 
-    (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
-    (ly:system cmd)))
-
-(define-public (postscript->png resolution name)
-  (let ((cmd (string-append
-             "ps2png --resolution="
-             (if (number? resolution)
-                 (number->string resolution)
-                 "90 ")
-             (if (ly:get-option 'verbose)
-                 " --verbose "
-                 " ")
-             name)))
-
-    (ly:system cmd)))
+    (ly:message (_ "Converting to `~a'...") pdf-name)
+    (ly:progress "\n")
+    (ly:system cmd)
+    (if (running-from-gui?) (delete-file 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")
+    (make-ps-images name resolution paper-size rename-page-1? verbose?)
+    (ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module filename formats)
   (for-each
    (lambda (f)
-     ((eval (string->symbol (string-append "convert-to-" f))
-           module)
+     ((eval (string->symbol (string-append "convert-to-" f)) module)
       paper-book filename))
-   
    formats))
 
 (define-public (completize-formats formats)
@@ -83,20 +99,19 @@
      (if (member x formats) (set! new-fmts (cons x new-fmts))))
    '("tex" "dvi" "ps" "pdf" "png"))
 
-  new-fmts)
+  (uniq-list (reverse new-fmts)))
 
 (define (header-to-file file-name key value)
   (set! key (symbol->string key))
   (if (not (equal? "-" file-name))
       (set! file-name (string-append file-name "." key)))
-  (format (current-error-port)
-         (_ "Writing header field `~a' to `~a'...")
-         key
-         (if (equal? "-" file-name) "<stdout>" file-name))
+  (ly:message (_ "Writing header field `~a' to `~a'...")
+             key
+             (if (equal? "-" file-name) "<stdout>" file-name))
   (if (equal? file-name "-")
       (display value)
       (display value (open-file file-name "w")))
-  (newline (current-error-port))
+  (ly:progress "\n")
   "")
 
 (define-public (output-scopes scopes fields basename)