(ly:make-score music))
-(define (print-book-with parser book process-procedure)
- (let*
- ((paper (ly:parser-lookup parser '$defaultpaper))
- (layout (ly:parser-lookup parser '$defaultlayout))
- (count (ly:parser-lookup parser 'output-count))
- (base (ly:parser-output-name parser))
- (output-suffix (ly:parser-lookup parser 'output-suffix)) )
+(define (get-outfile-name parser base)
+ (let* ((output-suffix (ly:parser-lookup parser 'output-suffix))
+ (counter-alist (ly:parser-lookup parser 'counter-alist))
+ (output-count (assoc-get output-suffix counter-alist 0))
+ (result base))
+ ;; Allow all ASCII alphanumerics, including accents
(if (string? output-suffix)
- (set! base (format "~a-~a" base (string-regexp-substitute
- "[^a-zA-Z0-9-]" "_" output-suffix))))
+ (set! result (format "~a-~a"
+ base (string-regexp-substitute
+ "[^-[:alnum:]]" "_" output-suffix))))
+
+ ;; assoc-get call will always have returned a number
+ (if (> output-count 0)
+ (set! result (format #f "~a-~a" result output-count)))
+
+ (ly:parser-define!
+ parser 'counter-alist
+ (assoc-set! counter-alist output-suffix (1+ output-count)))
+ result))
- ;; must be careful: output-count is under user control.
- (if (not (integer? count))
- (set! count 0))
+(define (print-book-with parser book process-procedure)
+ (let* ((paper (ly:parser-lookup parser '$defaultpaper))
+ (layout (ly:parser-lookup parser '$defaultlayout))
+ (count (ly:parser-lookup parser 'output-count))
+ (base (ly:parser-output-name parser))
+ (outfile-name (get-outfile-name parser base)))
- (if (> count 0)
- (set! base (format #f "~a-~a" base count)))
- (ly:parser-define! parser 'output-count (1+ count))
- (process-procedure book paper layout base)
- ))
+ (process-procedure book paper layout outfile-name)))
(define-public (print-book-with-defaults parser book)
(print-book-with parser book ly:book-process))
(define-public (print-book-with-defaults-as-systems parser book)
(print-book-with parser book ly:book-process-to-systems))
+;; Add a score to the current bookpart, book or toplevel
+(define-public (add-score parser score)
+ (cond
+ ((ly:parser-lookup parser '$current-bookpart)
+ ((ly:parser-lookup parser 'bookpart-score-handler)
+ (ly:parser-lookup parser '$current-bookpart) score))
+ ((ly:parser-lookup parser '$current-book)
+ ((ly:parser-lookup parser 'book-score-handler)
+ (ly:parser-lookup parser '$current-book) score))
+ (else
+ ((ly:parser-lookup parser 'toplevel-score-handler) parser score))))
+
+(define-public (add-text parser text)
+ (add-score parser (list text)))
+
+(define-public (add-music parser music)
+ (collect-music-aux (lambda (score)
+ (add-score parser score))
+ parser
+ music))
+
+
;;;;;;;;;;;;;;;;
;; alist
(cons (min (car i1) (car i2))
(max (cdr i1) (cdr i2))))
+(define-public (interval-intersection i1 i2)
+ (cons (max (car i1) (car i2))
+ (min (cdr i1) (cdr i2))))
+
(define-public (interval-sane? i)
(not (or (nan? (car i))
(inf? (car i))