X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Flily.scm;h=b8e3cfc0774cef9db2dc612e952a2163f2f436bc;hb=d983c03ae234308c7b284f42e00aff40fd93e14c;hp=b364d2f20c358caaa38bc0263363fef9d52a8105;hpb=d5fce41ff513cba5e4775ebbdfe888dd13464b80;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index b364d2f20c..b8e3cfc077 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -1,19 +1,15 @@ -;;;; lily.scm -- implement Scheme output routines for TeX and PostScript +;;;; lily.scm -- toplevel Scheme stuff ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; ;;;; (c) 1998--2004 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys -;;; Library functions - (if (defined? 'set-debug-cell-accesses!) (set-debug-cell-accesses! #f)) -;; ugh, need this for encoding.scm test -;; srfi-13 overrides string->list -(define-public plain-string->list string->list) +;;(set-debug-cell-accesses! 5000) (use-modules (ice-9 regex) (ice-9 safe) @@ -22,8 +18,13 @@ (srfi srfi-13)) ; strings +;; my display (define-public (myd k v) (display k) (display ": ") (display v) (display ", ")) +(define-public (print . args) + (apply format (cons (current-output-port) args))) + + ;;; General settings ;;; debugging evaluator is slower. This should ;;; have a more sensible default. @@ -34,12 +35,12 @@ (debug-enable 'backtrace) (read-enable 'positions))) -(define-public (line-column-location line col file) +(define-public (line-column-location file line col) "Print an input location, including column number ." (string-append (number->string line) ":" (number->string col) " " file)) -(define-public (line-location line col file) +(define-public (line-location file line col) "Print an input location, without column number ." (string-append (number->string line) " " file)) @@ -52,7 +53,7 @@ (map (lambda (x) (if (symbol? x) (symbol->string x) (number->string x))) - (ly:version)) + (ly:version)) ".")) @@ -61,312 +62,10 @@ (define ifdef "First run this through cpp.") (define ifndef "First run this through cpp.") - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define-public X 0) -(define-public Y 1) -(define-public START -1) -(define-public STOP 1) -(define-public LEFT -1) -(define-public RIGHT 1) -(define-public UP 1) -(define-public DOWN -1) -(define-public CENTER 0) - -(define-public DOUBLE-FLAT -4) -(define-public THREE-Q-FLAT -3) -(define-public FLAT -2) -(define-public SEMI-FLAT -1) -(define-public NATURAL 0) -(define-public SEMI-SHARP 1) -(define-public SHARP 2) -(define-public THREE-Q-SHARP 3) -(define-public DOUBLE-SHARP 4) -(define-public SEMI-TONE 2) - -(define-public ZERO-MOMENT (ly:make-moment 0 1)) - -(define-public (moment-min a b) - (if (ly:momentstring (car x)) - (symbol->string (car y)))) - -(define-public (chain-assoc x alist-list) - (if (null? alist-list) - #f - (let* ((handle (assoc x (car alist-list)))) - (if (pair? handle) - handle - (chain-assoc x (cdr alist-list)))))) - -(define-public (chain-assoc-get x alist-list . default) - "Return ALIST entry for X. Return DEFAULT (optional, else #f) if not -found." - - (define (helper x alist-list default) - (if (null? alist-list) - default - (let* ((handle (assoc x (car alist-list)))) - (if (pair? handle) - (cdr handle) - (helper x (cdr alist-list) default))))) - - (helper x alist-list - (if (pair? default) (car default) #f))) - -(define (map-alist-vals func list) - "map FUNC over the vals of LIST, leaving the keys." - (if (null? list) - '() - (cons (cons (caar list) (func (cdar list))) - (map-alist-vals func (cdr list))) - )) - -(define (map-alist-keys func list) - "map FUNC over the keys of an alist LIST, leaving the vals. " - (if (null? list) - '() - (cons (cons (func (caar list)) (cdar list)) - (map-alist-keys func (cdr list))) - )) - -;;;;;;;;;;;;;;;; -;; hash - - - -(if (not (defined? 'hash-table?)) ; guile 1.6 compat - (begin - (define hash-table? vector?) - - (define-public (hash-table->alist t) - "Convert table t to list" - (apply append - (vector->list t) - ))) - - ;; native hashtabs. - (begin - (define-public (hash-table->alist t) - - (hash-fold (lambda (k v acc) (acons k v acc)) - '() t) - ) - )) - -;; todo: code dup with C++. -(define-public (alist->hash-table l) - "Convert alist to table" - (let - ((m (make-hash-table (length l)))) - - (map (lambda (k-v) - (hashq-set! m (car k-v) (cdr k-v))) - l) - - m)) - - - -;;;;;;;;;;;;;;;; -; list - -(define (flatten-list lst) - "Unnest LST" - (if (null? lst) - '() - (if (pair? (car lst)) - (append (flatten-list (car lst)) (flatten-list (cdr lst))) - (cons (car lst) (flatten-list (cdr lst)))) - )) - -(define (list-minus a b) - "Return list of elements in A that are not in B." - (lset-difference eq? a b)) - - -;; TODO: use the srfi-1 partition function. -(define-public (uniq-list l) - - "Uniq LIST, assuming that it is sorted" - (define (helper acc l) - (if (null? l) - acc - (if (null? (cdr l)) - (cons (car l) acc) - (if (equal? (car l) (cadr l)) - (helper acc (cdr l)) - (helper (cons (car l) acc) (cdr l))) - ))) - (reverse! (helper '() l) '())) - - -(define (split-at-predicate predicate l) - "Split L = (a_1 a_2 ... a_k b_1 ... b_k) -into L1 = (a_1 ... a_k ) and L2 =(b_1 .. b_k) -Such that (PREDICATE a_i a_{i+1}) and not (PREDICATE a_k b_1). -L1 is copied, L2 not. - -(split-at-predicate (lambda (x y) (= (- y x) 2)) '(1 3 5 9 11) (cons '() '()))" -;; " - -;; KUT EMACS MODE. - - (define (inner-split predicate l acc) - (cond - ((null? l) acc) - ((null? (cdr l)) - (set-car! acc (cons (car l) (car acc))) - acc) - ((predicate (car l) (cadr l)) - (set-car! acc (cons (car l) (car acc))) - (inner-split predicate (cdr l) acc)) - (else - (set-car! acc (cons (car l) (car acc))) - (set-cdr! acc (cdr l)) - acc) - - )) - (let* - ((c (cons '() '())) - ) - (inner-split predicate l c) - (set-car! c (reverse! (car c))) - c) -) - - -(define-public (split-list l sep?) -" -(display (split-list '(a b c / d e f / g) (lambda (x) (equal? x '/))) ) -=> -((a b c) (d e f) (g)) - -" -;; " KUT EMACS. - -(define (split-one sep? l acc) - "Split off the first parts before separator and return both parts." - (if (null? l) - (cons acc '()) - (if (sep? (car l)) - (cons acc (cdr l)) - (split-one sep? (cdr l) (cons (car l) acc)) - ) - )) - -(if (null? l) - '() - (let* ((c (split-one sep? l '()))) - (cons (reverse! (car c) '()) (split-list (cdr c) sep?)) - ))) - - -(define-public (interval-length x) - "Length of the number-pair X, when an interval" - (max 0 (- (cdr x) (car x))) - ) - - -(define (other-axis a) - (remainder (+ a 1) 2)) - - -(define-public (interval-widen iv amount) - (cons (- (car iv) amount) - (+ (cdr iv) amount))) - -(define-public (interval-union i1 i2) - (cons (min (car i1) (car i2)) - (max (cdr i1) (cdr i2)))) - - -(define-public (write-me message x) - "Return X. Display MESSAGE and write X. Handy for debugging, possibly turned off." - (display message) (write x) (newline) x) -;; x) - -(define (index-cell cell dir) - (if (equal? dir 1) - (cdr cell) - (car cell))) - -(define (cons-map f x) - "map F to contents of X" - (cons (f (car x)) (f (cdr x)))) - - -(define-public (list-insert-separator lst between) - "Create new list, inserting BETWEEN between elements of LIST" - (define (conc x y ) - (if (eq? y #f) - (list x) - (cons x (cons between y)) - )) - (fold-right conc #f lst)) - -;;;;;;;;;;;;;;;; -; other -(define (sign x) - (if (= x 0) - 0 - (if (< x 0) -1 1))) - -(define-public (symbolstring l) (symbol->string r))) - -(define-public (!= l r) - (not (= l r))) +;; gettext wrapper for guile < 1.7.2 +(if (defined? 'gettext) + (define-public _ gettext) + (define-public _ ly:gettext)) (define-public (ly:load x) (let* ((fn (%search-load-path x))) @@ -374,165 +73,188 @@ L1 is copied, L2 not. (format (current-error-port) "[~A]" fn)) (primitive-load fn))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(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." + (define (recursion-helper signature arguments count) + (define (helper pred? arg count) + (if (not (pred? arg)) + + (begin + (ly:input-message location + (format #f + (_ "wrong type for argument ~a. Expecting ~a, found ~s") + count (type-name pred?) arg)) + #f) + #t)) + + (if (null? signature) + #t + (and (helper (car signature) (car arguments) count) + (recursion-helper (cdr signature) (cdr arguments) (1+ count))))) + (recursion-helper signature arguments 1)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; output -;; only load modules necessary. -(eval - (cons use-modules - (map (lambda (x) - (list 'scm (string->symbol (string-append "framework-" x)))) - (ly:output-formats))) - (current-module)) - - +;;(define-public (output-framework) (write "hello\n")) + (define output-tex-module (make-module 1021 (list (resolve-interface '(scm output-tex))))) (define output-ps-module (make-module 1021 (list (resolve-interface '(scm output-ps))))) -(define-public (tex-output-expression expr port) - (display (eval expr output-tex-module) port)) + (define-public (ps-output-expression expr port) (display (eval expr output-ps-module) port)) - -(define output-alist - `( - ("tex" . ("TeX output. The default output form." ,tex-output-expression)) - ("scm" . ("Scheme dump: debug scheme stencil expressions" ,write)) -; ("sketch" . ("Bare bones Sketch output." ,sketch-output-expression)) -; ("sodipodi" . ("Bare bones Sodipodi output." ,sodipodi-output-expression)) -; ("pdftex" . ("PDFTeX output. Was last seen nonfunctioning." ,pdftex-output-expression)) - )) - - -(define (document-format-dumpers) - (map - (lambda (x) - (display (string-append (pad-string-to 5 (car x)) (cadr x) "\n")) - output-alist) - )) - -(define-public (find-dumper format) - (let ((d (assoc format output-alist))) - (if (pair? d) - (caddr d) - (scm-error "Could not find dumper for format ~s" format)))) - - +;; 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 + dashed-line + dashed-slur + dot + draw-line + ez-ball + filledbox + glyph-string + horizontal-line + named-glyph + polygon + repeat-slash + round-filled-box + text + white-dot + white-text + 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)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; other files. (for-each ly:load - ;; load-from-path - '("define-music-types.scm" - "output-lib.scm" - "c++.scm" - "chord-ignatzek-names.scm" - "chord-entry.scm" - "chord-generic-names.scm" - "stencil.scm" - "new-markup.scm" - "bass-figure.scm" - "music-functions.scm" - "part-combiner.scm" - "define-music-properties.scm" - "auto-beam.scm" - "chord-name.scm" - - "ly-from-scheme.scm" - - "define-context-properties.scm" - "translation-functions.scm" - "script.scm" - "midi.scm" - "beam.scm" - "clef.scm" - "slur.scm" - "font.scm" - "encoding.scm" - - "fret-diagrams.scm" - "define-markup-commands.scm" - "define-grob-properties.scm" - "define-grobs.scm" - "define-grob-interfaces.scm" - "page-layout.scm" - "page-breaking.scm" - - "paper.scm" - - ; last: - "safe-lily.scm" - )) + ;; load-from-path + '("lily-library.scm" + "define-music-types.scm" + "output-lib.scm" + "c++.scm" + "chord-ignatzek-names.scm" + "chord-entry.scm" + "chord-generic-names.scm" + "stencil.scm" + "new-markup.scm" + "bass-figure.scm" + "music-functions.scm" + "part-combiner.scm" + "define-music-properties.scm" + "auto-beam.scm" + "chord-name.scm" + + "ly-from-scheme.scm" + + "define-context-properties.scm" + "translation-functions.scm" + "script.scm" + "midi.scm" + "beam.scm" + "clef.scm" + "slur.scm" + "font.scm" + "encoding.scm" + + "fret-diagrams.scm" + "define-markup-commands.scm" + "define-grob-properties.scm" + "define-grobs.scm" + "define-grob-interfaces.scm" + "page-layout.scm" + "titling.scm" + + "paper.scm" + + ; last: + "safe-lily.scm")) (set! type-p-name-alist - `( - (,boolean-or-symbol? . "boolean or symbol") - (,boolean? . "boolean") - (,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:grob? . "layout object") - (,ly:input-location? . "input location") - (,ly:moment? . "moment") - (,ly:music? . "music") - (,ly:pitch? . "pitch") - (,ly:translator? . "translator") - (,ly:font-metric? . "font metric") - (,markup-list? . "list of markups") - (,markup? . "markup") - (,ly:music-list? . "list of music") - (,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") - (,scheme? . "any type") - (,string? . "string") - (,symbol? . "symbol") - (,vector? . "vector") - )) + `( + (,boolean-or-symbol? . "boolean or symbol") + (,boolean? . "boolean") + (,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:grob? . "layout object") + (,ly:input-location? . "input location") + (,ly:moment? . "moment") + (,ly:music? . "music") + (,ly:pitch? . "pitch") + (,ly:translator? . "translator") + (,ly:font-metric? . "font metric") + (,markup-list? . "list of markups") + (,markup? . "markup") + (,ly:music-list? . "list of music") + (,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") + (,scheme? . "any type") + (,string? . "string") + (,symbol? . "symbol") + (,vector? . "vector"))) ;; debug mem leaks (define gc-protect-stat-count 0) (define-public (dump-gc-protects) - (set! gc-protect-stat-count (1+ gc-protect-stat-count) ) - (let* - ((protects (sort - (hash-table->alist (ly:protects)) - (lambda (a b) - (< (object-address (car a)) - (object-address (car b)))))) - (outfile (open-file (string-append - "gcstat-" (number->string gc-protect-stat-count) - ".scm" - ) "w")) - ) - - (display "DUMPING...\n") + (set! gc-protect-stat-count (1+ gc-protect-stat-count)) + (let* ((protects (sort + (hash-table->alist (ly:protects)) + (lambda (a b) + (< (object-address (car a)) + (object-address (car b)))))) + (out-file-name (string-append + "gcstat-" (number->string gc-protect-stat-count) + ".scm")) + (outfile (open-file out-file-name "w"))) + + (display "Dumping gc protected objs to ...\n") (display (filter (lambda (x) (not (symbol? x))) (map (lambda (y) - (let - ((x (car y)) - (c (cdr y))) + (let ((x (car y)) + (c (cdr y))) (string-append (string-join @@ -540,34 +262,82 @@ L1 is copied, L2 not. " ") "\n"))) protects)) - outfile) + outfile))) - )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-public (lilypond-main files) - "Entry point for Lilypond" - (let* - ((failed '()) - (handler (lambda (key arg) - (set! failed (cons arg failed)))) - ) +(define-public (ly:system command) + (let* ((status 0) - (for-each - (lambda (fn) - (catch 'ly-file-failed - (lambda () (ly:parse-file fn)) - handler)) - - files) + (silenced + (string-append command (if (ly:get-option 'verbose) + "" + " > /dev/null 2>&1 ")))) + + (if (ly:get-option 'verbose) + (format (current-error-port) (_ "Invoking `~a'...\n") command)) + + (set! status (system silenced)) + (if (> status 0) + (begin + (format (current-error-port) + (_ "Error invoking `~a'. Return value ~a") silenced status) + (newline (current-error-port)))))) + +(define-public (sanitize-command-option str) + (string-append + "\"" + (regexp-substitute/global #f "[^- 0-9,.a-zA-Z'\"\\]" str 'pre 'post) + "\"")) + +(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" ))) + + (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))) +(define-public (lilypond-main files) + "Entry point for LilyPond." + (let* ((failed '()) + (handler (lambda (key arg) (set! failed (cons arg failed))))) + (for-each + (lambda (f) + (catch 'ly-file-failed (lambda () (ly:parse-file f)) handler) + (if #f + (dump-gc-protects))) + files) + (if (pair? failed) (begin - (display (string-append "\n *** Failed files: " (string-join failed) "\n" )) + (newline (current-error-port)) + (display (_ "error: failed files: ") (current-error-port)) + (display (string-join failed) (current-error-port)) + (newline (current-error-port)) + (newline (current-error-port)) (exit 1)) - (exit 0)) - - )) - + (exit 0)))) +(define-public (tweak-grob-property grob sym val) + (set! (ly:grob-property grob sym) val))