;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
;;;;
;;;; LilyPond is free software: you can redistribute it and/or modify
"Include book titles in preview images.")
(include-eps-fonts #t
"Include fonts in separate-system EPS files.")
+ (include-settings #f
+"Include file for global settings, included before the score is processed.")
(job-count #f
"Process in parallel, using the given number of
jobs.")
(instead of the root file)")
(safe #f
"Run in safer mode.")
+ (separate-log-files #f
+"For input files `FILE1.ly', `FILE2.ly', ...
+output log data to files `FILE1.log',
+`FILE2.log', ...")
+ (show-available-fonts #f
+"List available font names.")
(strict-infinity-checking #f
"Force a crash on encountering Inf and NaN
floating point exceptions.")
(strip-output-dir #t
"Don't use directories from input files while
constructing output file names.")
- (separate-log-files #f
-"For input files `FILE1.ly', `FILE2.ly', ...
-output log data to files `FILE1.log',
-`FILE2.log', ...")
+ (svg-woff #f
+"Use woff font files in SVG backend.")
(trace-memory-frequency #f
"Record Scheme cell usage this many times per
second. Dump results to `FILE.stacks' and
`FILE.graph'.")
(trace-scheme-coverage #f
"Record coverage of Scheme files in `FILE.cov'.")
- (show-available-fonts #f
-"List available font names.")
(verbose ,(ly:command-line-verbose?)
"Value of the --verbose flag (read-only).")
(warning-as-error #f
(if (defined? 'set-debug-cell-accesses!)
(set-debug-cell-accesses! #f))
- ;(set-debug-cell-accesses! 1000)
+;;(set-debug-cell-accesses! 1000)
+
+;;; Boolean thunk - are we integrating Guile V2.0 or higher with LilyPond?
+(define-public (guile-v2)
+ (string>? (version) "1.9.10"))
(use-modules (ice-9 regex)
- (ice-9 safe)
- (ice-9 format)
- (ice-9 rdelim)
- (ice-9 optargs)
- (oop goops)
- (srfi srfi-1)
- (srfi srfi-13)
- (srfi srfi-14)
- (scm clip-region)
- (scm memory-trace)
- (scm coverage))
+ (ice-9 safe)
+ (ice-9 format)
+ (ice-9 rdelim)
+ (ice-9 optargs)
+ (oop goops)
+ (srfi srfi-1)
+ (srfi srfi-13)
+ (srfi srfi-14)
+ (scm clip-region)
+ (scm memory-trace)
+ (scm coverage))
+
+(define-public _ gettext)
+;;; TODO:
+;; There are new modules defined in Guile V2.0 which we need to use, e.g.
+;; the modules and scheme files loaded by lily.scm use currying.
+;; In Guile V2 this needs (ice-9 curried-definitions) which is not
+;; present in Guile V1.8
+;;
+;; TODO add in modules for V1.8,7 deprecated in V2.0 and integrated
+;; into Guile base code, like (ice-9 syncase).
+;;
(define-public fancy-format
format)
(define-public (ergonomic-simple-format dest . rest)
- "Like ice-9 format, but without the memory consumption."
+ "Like ice-9's @code{format}, but without the memory consumption."
(if (string? dest)
(apply simple-format (cons #f (cons dest rest)))
(apply simple-format (cons dest rest))))
(if (memq (ly:get-option 'backend) music-string-to-path-backends)
(ly:set-option 'music-strings-to-paths #t))
-(define-public _ gettext)
(define-public (ly:load x)
(let* ((file-name (%search-load-path x)))
(eq? (string-ref file-name 2) #\/))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; If necessary, emulate Guile V2 module_export_all! for Guile V1.8.n
+(cond-expand
+ ((not guile-v2)
+ (define (module-export-all! mod)
+ (define (fresh-interface!)
+ (let ((iface (make-module)))
+ (set-module-name! iface (module-name mod))
+ ;; for guile 2: (set-module-version! iface (module-version mod))
+ (set-module-kind! iface 'interface)
+ (set-module-public-interface! mod iface)
+ iface))
+ (let ((iface (or (module-public-interface mod)
+ (fresh-interface!))))
+ (set-module-obarray! iface (module-obarray mod))))))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (type-check-list location signature arguments)
"Typecheck a list of arguments against a list of type predicates.
Print a message at LOCATION if any predicate failed."
'("lily-library.scm"
"file-cache.scm"
"define-event-classes.scm"
+ "define-music-callbacks.scm"
"define-music-types.scm"
+ "define-note-names.scm"
"output-lib.scm"
"c++.scm"
"chord-ignatzek-names.scm"
"part-combiner.scm"
"autochange.scm"
"define-music-properties.scm"
- "beam-settings.scm"
+ "time-signature-settings.scm"
"auto-beam.scm"
- "chord-name.scm"
-
+ "bezier-tools.scm"
"parser-ly-from-scheme.scm"
"ly-syntax-constructors.scm"
"define-context-properties.scm"
+ ;; guile 1.9 wants markups defined before referenced
+ "define-markup-commands.scm"
+
+ "chord-name.scm"
"translation-functions.scm"
"script.scm"
"midi.scm"
"flag-styles.scm"
"fret-diagrams.scm"
+ "tablature.scm"
"harp-pedals.scm"
+ "define-woodwind-diagrams.scm"
+ "display-woodwind-diagrams.scm"
"predefined-fretboards.scm"
- "define-markup-commands.scm"
"define-grob-properties.scm"
"define-grobs.scm"
"define-grob-interfaces.scm"
"paper.scm"
"backend-library.scm"
"x11-color.scm"
- "tablature.scm"
;; must be after everything has been defined
"safe-lily.scm"))
(,markup-list? . "markup list")
(,moment-pair? . "pair of moment objects")
(,number-or-grob? . "number or grob")
+ (,number-or-pair? . "number or pair")
(,number-or-string? . "number or string")
(,number-pair? . "pair of numbers")
(,rhythmic-location? . "rhythmic location")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define* (ly:exit status #:optional (silently #f) )
- "Exit function for lilypond"
- (if (not silently)
- (case status
- ((0) (ly:success "Compilation successfully completed"))
- ((1) (ly:warning "Compilation completed with warnings or errors"))
- (else (ly:message "")))
- )
- (exit status)
- )
+(define* (ly:exit status #:optional (silently #f))
+ "Exit function for lilypond"
+ (if (not silently)
+ (case status
+ ((0) (ly:success (_ "Compilation successfully completed")))
+ ((1) (ly:warning (_ "Compilation completed with warnings or errors")))
+ (else (ly:message ""))))
+ (exit status))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (lilypond-main files)
(eval-string (ly:command-line-code))
(if (ly:get-option 'help)
(begin (ly:option-usage)
- (ly:exit 0 #t )))
+ (ly:exit 0 #t)))
(if (ly:get-option 'show-available-fonts)
(begin (ly:font-config-display-fonts)
(ly:exit 0 #t)))
(string-contains f "lilypond")))))
(if (pair? failed)
(begin (ly:error (_ "failed files: ~S") (string-join failed))
- (ly:exit 1 #f))
+ (ly:exit 1 #f))
(begin
(ly:exit 0 #f)))))
(if separate-logs
(open-file (if (string-or-symbol? (ly:get-option 'log-file))
(format "~a.log" (ly:get-option 'log-file))
- "/dev/tty") "a") #f))
+ "/dev/stderr") "a") #f))
(do-measurements (ly:get-option 'dump-profile))
(handler (lambda (key failed-file)
(set! failed (append (list failed-file) failed)))))
(for-each (lambda (s)
(ly:set-option (car s) (cdr s)))
all-settings)
- (ly:clear-anonymous-modules)
(ly:set-option 'debug-gc-assert-parsed-dead #t)
(gc)
(ly:set-option 'debug-gc-assert-parsed-dead #f)
(ly:reset-all-fonts))))
files)
- ;; we want the failed-files notice in the aggregrate logfile.
+ ;; Ensure a notice re failed files is written to aggregate logfile.
(if ping-log
(format ping-log "Failed files: ~a\n" failed))
(if (ly:get-option 'dump-profile)
projects / lilypond.git / blobdiff