"Render at higher resolution (using given factor)
and scale down result to prevent jaggies in
PNG images.")
- (aux-files #t
-"Create .tex, .texi, .count files in the
+ (aux-files #t
+"Create .tex, .texi, .count files in the
EPS backend.")
(backend ps
"Select backend. Possible values: 'eps, 'null,
"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)
(if (memq (ly:get-option 'backend) music-string-to-path-backends)
(ly:set-option 'music-strings-to-paths #t))
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
- (define-public _ gettext)
- (define-public _ ly:gettext))
(define-public (ly:load x)
(let* ((file-name (%search-load-path x)))
(if (null? (cdr platform)) #f
(member (string-downcase (cadr platform)) '("95" "98" "me")))))
-(case PLATFORM
- ((windows)
- (define native-getcwd
- getcwd)
-
- (define (slashify x)
- (if (string-index x #\\)
- x
- (string-regexp-substitute
- "//*" "/"
- (string-regexp-substitute "\\\\" "/" x))))
+(define (slashify x)
+ (if (string-index x #\\)
+ x
+ (string-regexp-substitute
+ "//*" "/"
+ (string-regexp-substitute "\\\\" "/" x))))
- ;; FIXME: this prints a warning.
- (define-public (ly-getcwd)
- (slashify (native-getcwd))))
-
- (else
- (define-public ly-getcwd
- getcwd)))
+(define-public (ly-getcwd)
+ (if (eq? PLATFORM 'windows)
+ (slashify (getcwd))
+ (getcwd)))
(define-public (is-absolute? file-name)
(let ((file-name-length (string-length file-name)))
(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"
"output-lib.scm"
"c++.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"
"flag-styles.scm"
"fret-diagrams.scm"
"harp-pedals.scm"
+ "define-woodwind-diagrams.scm"
+ "display-woodwind-diagrams.scm"
"predefined-fretboards.scm"
"define-markup-commands.scm"
"define-grob-properties.scm"
(for-each ly:load init-scheme-files)
+(define-public r5rs-primary-predicates
+ `((,boolean? . "boolean")
+ (,char? . "character")
+ (,number? . "number")
+ (,pair? . "pair")
+ (,port? . "port")
+ (,procedure? . "procedure")
+ (,string? . "string")
+ (,symbol? . "symbol")
+ (,vector? . "vector")))
+
+(define-public r5rs-secondary-predicates
+ `((,char-alphabetic? . "alphabetic character")
+ (,char-lower-case? . "lower-case character")
+ (,char-numeric? . "numeric character")
+ (,char-upper-case? . "upper-case character")
+ (,char-whitespace? . "whitespace character")
+
+ (,complex? . "complex number")
+ (,even? . "even number")
+ (,exact? . "exact number")
+ (,inexact? . "inexact number")
+ (,integer? . "integer")
+ (,negative? . "negative number")
+ (,odd? . "odd number")
+ (,positive? . "positive number")
+ (,rational? . "rational number")
+ (,real? . "real number")
+ (,zero? . "zero")
+
+ (,list? . "list")
+ (,null? . "null")
+
+ (,input-port? . "input port")
+ (,output-port? . "output port")
+
+ ;; would this ever be used?
+ (,eof-object? . "end-of-file object")
+ ))
+
+(define-public guile-predicates
+ `((,hash-table? . "hash table")
+ ))
+
+(define-public lilypond-scheme-predicates
+ `((,boolean-or-symbol? . "boolean or symbol")
+ (,color? . "color")
+ (,cheap-list? . "list")
+ (,grob-list? . "list of grobs")
+ ;; this is built on cheap-list
+ (,list-or-symbol? . "list or symbol")
+ (,markup? . "markup")
+ (,markup-command-list? . "markup command list")
+ (,markup-list? . "markup list")
+ (,moment-pair? . "pair of moment objects")
+ (,number-or-grob? . "number or grob")
+ (,number-or-string? . "number or string")
+ (,number-pair? . "pair of numbers")
+ (,rhythmic-location? . "rhythmic location")
+ (,scheme? . "any type")
+ (,string-or-pair? . "string or pair")
+ (,string-or-symbol? . "string or symbol")
+ ))
+
+(define-public lilypond-exported-predicates
+ `((,ly:box? . "box")
+ (,ly:context? . "context")
+ (,ly:dimension? . "dimension, in staff space")
+ (,ly:dir? . "direction")
+ (,ly:dispatcher? . "dispatcher")
+ (,ly:duration? . "duration")
+ (,ly:font-metric? . "font metric")
+ (,ly:grob? . "graphical (layout) object")
+ (,ly:grob-array? . "array of grobs")
+ (,ly:input-location? . "input location")
+ (,ly:item? . "item")
+ (,ly:iterator? . "iterator")
+ (,ly:lily-lexer? . "lily-lexer")
+ (,ly:lily-parser? . "lily-parser")
+ (,ly:listener? . "listener")
+ (,ly:moment? . "moment")
+ (,ly:music? . "music")
+ (,ly:music-function? . "music function")
+ (,ly:music-list? . "list of music objects")
+ (,ly:music-output? . "music output")
+ (,ly:otf-font? . "OpenType font")
+ (,ly:output-def? . "output definition")
+ (,ly:page-marker? . "page marker")
+ (,ly:pango-font? . "pango font")
+ (,ly:paper-book? . "paper book")
+ (,ly:paper-system? . "paper-system Prob")
+ (,ly:pitch? . "pitch")
+ (,ly:prob? . "property object")
+ (,ly:score? . "score")
+ (,ly:simple-closure? . "simple closure")
+ (,ly:skyline? . "skyline")
+ (,ly:skyline-pair? . "pair of skylines")
+ (,ly:source-file? . "source file")
+ (,ly:spanner? . "spanner")
+ (,ly:stencil? . "stencil")
+ (,ly:stream-event? . "stream event")
+ (,ly:translator? . "translator")
+ (,ly:translator-group? . "translator group")
+ ))
+
+
(set! type-p-name-alist
- `((,boolean? . "boolean")
- (,boolean-or-symbol? . "boolean or symbol")
- (,char? . "char")
- (,grob-list? . "list of grobs")
- (,hash-table? . "hash table")
- (,input-port? . "input port")
- (,integer? . "integer")
- (,list? . "list")
- (,ly:context? . "context")
- (,ly:dimension? . "dimension, in staff space")
- (,ly:dir? . "direction")
- (,ly:duration? . "duration")
- (,ly:font-metric? . "font metric")
- (,ly:grob? . "layout object")
- (,ly:grob-array? . "array of grobs")
- (,ly:input-location? . "input location")
- (,ly:moment? . "moment")
- (,ly:music? . "music")
- (,ly:music-list? . "list of music objects")
- (,ly:music-output? . "music output")
- (,ly:pitch? . "pitch")
- (,ly:translator? . "translator")
- (,ly:score? . "score")
- (,ly:simple-closure? . "simple closure")
- (,ly:skyline-pair? . "pair of skylines")
- (,ly:stencil? . "stencil")
- (,markup-list? . "list of markups")
- (,markup? . "markup")
- (,number-or-grob? . "number or grob")
- (,number-or-string? . "number or string")
- (,number-pair? . "pair of numbers")
- (,number? . "number")
- (,output-port? . "output port")
- (,pair? . "pair")
- (,procedure? . "procedure")
- (,rhythmic-location? . "rhythmic location")
- (,scheme? . "any type")
- (,string? . "string")
- (,symbol? . "symbol")
- (,vector? . "vector")))
+ (append r5rs-primary-predicates
+ r5rs-secondary-predicates
+ guile-predicates
+ lilypond-scheme-predicates
+ lilypond-exported-predicates))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; timing
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(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)
"Entry point for LilyPond."
(eval-string (ly:command-line-code))
(if (ly:get-option 'help)
(begin (ly:option-usage)
- (exit 0)))
+ (ly:exit 0 #t)))
(if (ly:get-option 'show-available-fonts)
(begin (ly:font-config-display-fonts)
- (exit 0)))
+ (ly:exit 0 #t)))
(if (ly:get-option 'gui)
(gui-main files))
(if (null? files)
(begin (ly:usage)
- (exit 2)))
+ (ly:exit 2 #t)))
(if (ly:get-option 'read-file-list)
(set! files
(filter (lambda (s)
(if (ly:get-option 'dump-profile)
(dump-profile "lily-run-total"
'(0 0) (profile-measurements)))
- (exit (if (null? errors)
- 0
- 1))))))
+ (if (null? errors)
+ (ly:exit 0 #f)
+ (ly:exit 1 #f))))))
+
(if (string-or-symbol? (ly:get-option 'log-file))
(ly:stderr-redirect (format "~a.log" (ly:get-option 'log-file)) "w"))
(let ((failed (lilypond-all files)))
(string-contains f "lilypond")))))
(if (pair? failed)
(begin (ly:error (_ "failed files: ~S") (string-join failed))
- (exit 1))
+ (ly:exit 1 #f))
(begin
- ;; HACK: be sure to exit with single newline
- (ly:message "")
- (exit 0)))))
+ (ly:exit 0 #f)))))
+
(define-public (lilypond-all files)
(let* ((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)
(if (ly:get-option 'debug-gc)
(dump-gc-protects)
- (ly:reset-all-fonts))))
+ (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)
(ly:error (_ "failed files: ~S") (string-join failed))
;; not reached?
(exit 1))
- (exit 0)))))
+ (ly:exit 0 #f)))))
(define (gui-no-files-handler)
(let* ((ly (string-append (ly:effective-prefix) "/ly/"))
(cmd (get-editor-command welcome-ly 0 0 0)))
(ly:message (_ "Invoking `~a'...\n") cmd)
(system cmd)
- (exit 1)))
+ (ly:exit 1 #f)))