;; Mingw
;; #(Windows XP HOSTNAME build 2600 5.01 Service Pack 1 i686)
;;
-(define PLATFORM
+
+;; ugh, code dup.
+(define-public PLATFORM
(string->symbol
(string-downcase
(car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
((windows)
(define native-getcwd getcwd)
(define (slashify x)
- (if (string-index x #\/)
+ (if (string-index x #\\)
x
- (string-regexp-substitute "\\" "/" x)))
+ (string-regexp-substitute
+ "//*" "/"
+ (string-regexp-substitute "\\\\" "/" x))))
;; FIXME: this prints a warning.
(define-public (ly-getcwd)
(slashify (native-getcwd))))
(define-public (ps-output-expression expr port)
(display (eval expr output-ps-module) port))
-;; TODO: generate this list by registering the stencil expressions
-;; stencil expressions should have docstrings.
-(define-public (ly:all-stencil-expressions)
- "Return list of stencil expressions."
- '(beam
- bezier-sandwich
- blank
- bracket
- char
- circle
- dashed-line
- dashed-slur
- dot
- draw-line
- ez-ball
- filledbox
- glyph-string
- horizontal-line
- named-glyph
- polygon
- repeat-slash
- round-filled-box
- text
- url-link
- utf8-string
- white-dot
- white-text
- embedded-ps
- zigzag-line))
-
-;; TODO:
-;; - generate this list by registering the output-backend-commands
-;; output-backend-commands should have docstrings.
-;; - remove hard copies in output-ps output-tex
-(define-public (ly:all-output-backend-commands)
- "Return list of output backend commands."
- '(
- comment
- grob-cause
- no-origin
- placebox
- unknown))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Safe definitions utility
(define safe-objects (list))
"define-grob-properties.scm"
"define-grobs.scm"
"define-grob-interfaces.scm"
+ "define-stencil-commands.scm"
"page-layout.scm"
"titling.scm"
".scm"))
(outfile (open-file out-file-name "w")))
- (display "Dumping gc protected objs to ...\n")
+ (display (format "Dumping gc protected objs to ~a...\n" out-file-name))
(display
(filter
(lambda (x) (not (symbol? x)))
(handler (lambda (key failed-file)
(set! failed (append (list failed-file) failed)))))
;;(handler (lambda (key . arg) (set! failed (append arg failed)))))
- (for-each (lambda (x) (lilypond-file handler x)) files)))
+ (for-each (lambda (x) (lilypond-file handler x)) files)
+ failed))
(define (lilypond-file handler file-name)
(catch 'ly-file-failed
(lambda () (ly:parse-file file-name))
(lambda (x . args) (handler x file-name)))
- ;;(lambda (x) (handler x f)))
+
(if #f
(dump-gc-protects)))
(define (running-from-gui?)
(let ((have-tty? (isatty? (current-input-port))))
;; If no TTY and not using safe, assume running from GUI.
- ;; For mingw, the test must be inverted.
- (if (eq? PLATFORM 'windows)
- have-tty? (not have-tty?))))
+ (cond
+ ((eq? PLATFORM 'windows)
+ ;; This only works for i586-mingw32msvc-gcc -mwindows
+ (not (string-match "standard input"
+ (format #f "~S" (current-input-port)))))
+ ((eq? PLATFORM 'darwin) #f)
+ (else
+ (not have-tty?)))))
(define-public (gui-main files)
(if (null? files) (gui-no-files-handler))
(let* ((base (basename (car files) ".ly"))
- (log-name (string-append base ".log"))
- (log-file (open-file log-name "w")))
+ (log-name (string-append base ".log")))
(if (not (running-from-gui?))
(ly:message (_ "Redirecting output to ~a...") log-name))
- (ly:port-move (fileno (current-error-port)) log-file)
+ (ly:stderr-redirect log-name "w")
(ly:message "# -*-compilation-*-")
(let ((failed (lilypond-all files)))
(if (pair? failed)
(begin
- (system (get-editor-command log-name 0 0))
+ ;; ugh
+ (ly:stderr-redirect "foo" "r")
+ (system (get-editor-command log-name 0 0 0))
(ly:error (_ "failed files: ~S") (string-join failed))
;; not reached?
(exit 1))
(let* ((ly (string-append (ly:effective-prefix) "/ly/"))
;; FIXME: soft-code, localize
(welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
- (cmd (get-editor-command welcome-ly 0 0)))
+ (cmd (get-editor-command welcome-ly 0 0 0)))
(ly:message (_ "Invoking `~a'...") cmd)
(system cmd)
(exit 1)))