;;; Library functions
-(use-modules (ice-9 regex))
-
+(use-modules (ice-9 regex)
+ (srfi srfi-1) ;lists
+ (srfi srfi-13) ;strings
+ )
;;; General settings
-;; debugging evaluator is slower.
+;;; debugging evaluator is slower. This should
+;;; have a more sensible default.
+
+
(debug-enable 'debug)
;(debug-enable 'backtrace)
(define-public point-and-click #f)
+(define-public (lilypond-version)
+ (string-join
+ (map (lambda (x) (if (symbol? x)
+ (symbol->string x)
+ (number->string x)))
+ (ly:version))
+ "."))
+
+
+
;; cpp hack to get useful error message
(define ifdef "First run this through cpp.")
(define ifndef "First run this through cpp.")
(string<? (symbol->string (car x))
(symbol->string (car y))))
+
+
+(define (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 (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)))
+ ))
+
+
+
;;;;;;;;;;;;;;;;
; list
-(define (tail lst)
- "Return tail element of LST."
- (car (last-pair lst)))
-
(define (flatten-list lst)
"Unnest LST"
(define (list-minus a b)
"Return list of elements in A that are not in B."
- (if (pair? a)
- (if (pair? b)
- (if (member (car a) b)
- (list-minus (cdr a) b)
- (cons (car a) (list-minus (cdr a) b)))
- a)
- '()))
-
-;; why -list suffix (see reduce-list)
-(define-public (filter-list pred? list)
- "return that part of LIST for which PRED is true.
-
- TODO: rewrite using accumulator. Now it takes O(n) stack. "
-
- (if (null? list) '()
- (let* ((rest (filter-list pred? (cdr list))))
- (if (pred? (car list))
- (cons (car list) rest)
- rest))))
-
-(define-public (filter-out-list pred? list)
- "return that part of LIST for which PRED is false."
- (if (null? list) '()
- (let* ((rest (filter-out-list pred? (cdr list))))
- (if (not (pred? (car list)))
- (cons (car list) rest)
- rest))))
-
+ (lset-difference eq? a b))
-(define (first-n n lst)
- "Return first N elements of LST"
- (if (and (pair? lst)
- (> n 0))
- (cons (car lst) (first-n (- n 1) (cdr lst)))
- '()))
+;; TODO: use the srfi-1 partition function.
(define-public (uniq-list list)
+ "Uniq LIST, assuming that it is sorted"
(if (null? list) '()
(if (null? (cdr list))
list
(uniq-list (cdr list))
(cons (car list) (uniq-list (cdr list)))))))
-(define (butfirst-n n lst)
- "Return all but first N entries of LST"
- (if (pair? lst)
- (if (> n 0)
- (butfirst-n (- n 1) (cdr lst))
- lst)
- '()))
-
-(define (split-at predicate 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 (lambda (x y) (= (- y x) 2)) '(1 3 5 9 11) (cons '() '()))"
+(split-at-predicate (lambda (x y) (= (- y x) 2)) '(1 3 5 9 11) (cons '() '()))"
;; "
;; KUT EMACS MODE.
(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.
-
-"
- ;; " KUT EMACS
+ "Split off the first parts before separator and return both parts."
(if (null? l)
(cons acc '())
(if (sep? (car l))
'()
(let* ((c (split-one sep? l '())))
(cons (reverse! (car c) '()) (split-list (cdr c) sep?))
- )
- )
-)
-
+ )))
-(define-public (range x y)
- "Produce a list of integers starting at Y with X elements."
- (if (<= x 0)
- '()
- (cons y (range (- x 1) (+ y 1)))
-
- )
- )
(define-public (interval-length x)
"Length of the number-pair X, when an interval"
(remainder (+ a 1) 2))
-(define-public (widen-interval iv amount)
+(define-public (interval-widen iv amount)
(cons (- (car iv) amount)
- (+ (cdr 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."
"map F to contents of X"
(cons (f (car x)) (f (cdr x))))
-;; used where?
-(define-public (reduce operator list)
- "reduce OP [A, B, C, D, ... ] =
- A op (B op (C ... ))
-"
- (if (null? (cdr list)) (car list)
- (operator (car list) (reduce operator (cdr list)))))
-
-(define (take-from-list-until todo gathered crit?)
- "return (G, T), where (reverse G) + T = GATHERED + TODO, and the last of G
-is the first to satisfy CRIT
-
- (take-from-list-until '(1 2 3 4 5) '() (lambda (x) (eq? x 3)))
-=>
- ((3 2 1) 4 5)
-
-"
- (if (null? todo)
- (cons gathered todo)
- (if (crit? (car todo))
- (cons (cons (car todo) gathered) (cdr todo))
- (take-from-list-until (cdr todo) (cons (car todo) gathered) crit?)
- )
- ))
-(define-public (list-insert-separator list between)
+(define-public (list-insert-separator lst between)
"Create new list, inserting BETWEEN between elements of LIST"
- (if (null? list)
- '()
- (if (null? (cdr list))
- list
- (cons (car list)
- (cons between (list-insert-separator (cdr list) between)))
-
- )))
-
-;;;;;;;;;;;;;;;;
-; strings.
-
-
-;; TODO : make sep optional.
-(define-public (string-join str-list sep)
- "append the list of strings in STR-LIST, joining them with SEP"
-
- (apply string-append (list-insert-separator str-list sep))
- )
-
-(define-public (pad-string-to str wid)
- (string-append str (make-string (max (- wid (string-length str)) 0) #\ ))
- )
+ (define (conc x y )
+ (if (eq? y #f)
+ (list x)
+ (cons x (cons between y))
+ ))
+ (fold-right conc #f lst))
;;;;;;;;;;;;;;;;
; other
;; output
(use-modules (scm output-tex)
(scm output-ps)
- (scm output-pysk)
(scm output-ascii-script)
(scm output-sketch)
(scm output-sodipodi)
(map ly:load
; load-from-path
- '("music-types.scm"
+ '("define-music-types.scm"
"output-lib.scm"
"c++.scm"
- "chords-ignatzek.scm"
+ "chord-ignatzek-names.scm"
"chord-entry.scm"
- "double-plus-new-chord-name.scm"
+ "chord-generic-names.scm"
"molecule.scm"
"new-markup.scm"
"bass-figure.scm"
"define-music-properties.scm"
"auto-beam.scm"
"chord-name.scm"
+
"define-translator-properties.scm"
+ "translation-functions.scm"
"script.scm"
"drums.scm"
"midi.scm"
(set! type-p-name-alist
`(
- (,ly:dir? . "direction")
- (,scheme? . "any type")
- (,number-pair? . "pair of numbers")
- (,ly:input-location? . "input location")
- (,ly:grob? . "grob (GRaphical OBject)")
+ (,boolean-or-symbol? . "boolean or symbol")
+ (,boolean? . "boolean")
+ (,char? . "char")
(,grob-list? . "list of grobs")
- (,ly:duration? . "duration")
- (,pair? . "pair")
+ (,input-port? . "input port")
(,integer? . "integer")
(,list? . "list")
- (,symbol? . "symbol")
- (,string? . "string")
- (,boolean? . "boolean")
- (,ly:pitch? . "pitch")
- (,ly:moment? . "moment")
+ (,ly:context? . "context")
(,ly:dimension? . "dimension, in staff space")
+ (,ly:dir? . "direction")
+ (,ly:duration? . "duration")
+ (,ly:grob? . "grob (GRaphical OBject)")
(,ly:input-location? . "input location")
- (,music-list? . "list of music")
+ (,ly:input-location? . "input location")
+ (,ly:moment? . "moment")
(,ly:music? . "music")
+ (,ly:pitch? . "pitch")
+ (,ly:translator? . "translator")
+ (,markup-list? . "list of markups")
+ (,markup? . "markup")
+ (,music-list? . "list of music")
+ (,number-or-grob? . "number or grob")
+ (,number-or-string? . "number or string")
+ (,number-pair? . "pair of numbers")
(,number? . "number")
- (,char? . "char")
- (,input-port? . "input port")
(,output-port? . "output port")
- (,vector? . "vector")
+ (,pair? . "pair")
(,procedure? . "procedure")
- (,boolean-or-symbol? . "boolean or symbol")
- (,number-or-string? . "number or string")
- (,markup? . "markup")
- (,markup-list? . "list of markups")
- (,number-or-grob? . "number or grob")
+ (,scheme? . "any type")
+ (,string? . "string")
+ (,symbol? . "symbol")
+ (,vector? . "vector")
))
projects / lilypond.git / blobdiff