;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
(define-public (stack-stencils axis dir padding stils)
"Stack stencils STILS in direction AXIS, DIR, using PADDING."
(define-public (stack-lines dir padding baseline stils)
"Stack vertically with a baseline-skip."
- (if (null? stils)
- empty-stencil
- (if (null? (cdr stils))
- (car stils)
- (ly:stencil-combine-at-edge
- (car stils) Y dir
- (stack-lines dir padding baseline (cdr stils))
- padding baseline))))
+ (define result empty-stencil)
+ (define last-y #f)
+ (do
+ ((last-stencil #f (car p))
+ (p stils (cdr p)))
+
+ ((null? p))
+
+ (if (number? last-y)
+ (begin
+ (let* ((dy (max (+ (* dir (interval-bound (ly:stencil-extent last-stencil Y) dir))
+ padding
+ (* (- dir) (interval-bound (ly:stencil-extent (car p) Y) (- dir))))
+ baseline))
+ (y (+ last-y (* dir dy))))
+
+
+
+ (set! result
+ (ly:stencil-add result (ly:stencil-translate-axis (car p) y Y)))
+ (set! last-y y)))
+ (begin
+ (set! last-y 0)
+ (set! result (car p)))))
+
+ result)
+
(define-public (bracketify-stencil stil axis thick protusion padding)
"Add brackets around STIL, producing a new stencil."
(y-ext (ly:stencil-extent stencil 1))
(diameter (max (- (cdr x-ext) (car x-ext))
(- (cdr y-ext) (car y-ext))))
- (radius (+ (/ diameter 2) padding thickness)))
+ (radius (+ (/ diameter 2) padding thickness))
+ (circle (make-circle-stencil radius thickness #f)))
+
(ly:stencil-add
- (centered-stencil stencil) (make-circle-stencil radius thickness #f))))
+ stencil
+ (ly:stencil-translate circle
+ (cons
+ (interval-center x-ext)
+ (interval-center y-ext))))))
+
(define-public (fontify-text font-metric text)
"Set TEXT with font FONT-METRIC, returning a stencil."
`(text ,font-metric ,text) (car b) (cdr b))))
(define-public (fontify-text-white scale font-metric text)
- "Set TEXT with scale factor s"
+ "Set TEXT with scale factor SCALE"
(let* ((b (ly:text-dimension font-metric text))
;;urg -- workaround for using ps font
(c `(white-text ,(* 2 scale) ,text)))
;;urg -- extent is not from ps font, but we hope it's close
(ly:make-stencil c (car b) (cdr b))))
+(define-public (stencil-with-color stencil color)
+ (ly:make-stencil
+ (list 'color color (ly:stencil-expr stencil))
+ (ly:stencil-extent stencil X)
+ (ly:stencil-extent stencil Y)))
+
+(define-public (stencil-whiteout stencil)
+ (let*
+ ((x-ext (ly:stencil-extent stencil X))
+ (y-ext (ly:stencil-extent stencil Y))
+
+ )
+
+ (ly:stencil-add
+ (stencil-with-color (ly:round-filled-box x-ext y-ext 0.0)
+ white)
+ stencil)
+ ))
+
(define-public (dimension-arrows destination)
"Draw twosided arrow from here to @var{destination}"
;; spacing variables
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-public (annotate-y-interval layout name extent is-length)
- (let*
- ((text-props (cons
- '((font-size . -3)
- (font-family . typewriter))
- (layout-extract-page-properties layout)))
- (annotation #f)
- )
-
+(define*-public (annotate-y-interval layout name extent is-length
+ #:key (color darkblue))
+ (let ((text-props (cons '((font-size . -3)
+ (font-family . typewriter))
+ (layout-extract-page-properties layout)))
+ (annotation #f))
+ (define (center-stencil-on-extent stil)
+ (ly:stencil-translate (ly:stencil-aligned-to stil Y CENTER)
+ (cons 0 (interval-center extent))))
;; do something sensible for 0,0 intervals.
(set! extent (interval-widen extent 0.001))
(if (not (interval-sane? extent))
- (set! annotation (interpret-markup layout text-props
- (make-simple-markup (format "~a: NaN/inf" name))))
- (let*
- ((text-stencil (interpret-markup
- layout text-props
- (make-column-markup
- (list
- (make-whiteout-markup (make-simple-markup name))
- (make-whiteout-markup
- (make-simple-markup
- (cond
- ((interval-empty? extent) "empty")
- (is-length (format "~$" (interval-length extent)))
- (else
- (format "(~$,~$)" (car extent)
- (cdr extent))))))))))
- (arrows
- (ly:stencil-translate-axis
- (dimension-arrows (cons 0 (interval-length extent)))
- (interval-start extent) Y)))
-
+ (set! annotation (interpret-markup
+ layout text-props
+ (make-simple-markup (format "~a: NaN/inf" name))))
+ (let ((text-stencil (interpret-markup
+ layout text-props
+ (markup #:whiteout #:simple name)))
+ (dim-stencil (interpret-markup
+ layout text-props
+ (markup #:whiteout
+ #:simple (cond
+ ((interval-empty? extent)
+ (format "empty"))
+ (is-length
+ (format "~$" (interval-length extent)))
+ (else
+ (format "(~$,~$)"
+ (car extent) (cdr extent)))))))
+ (arrows (ly:stencil-translate-axis
+ (dimension-arrows (cons 0 (interval-length extent)))
+ (interval-start extent) Y)))
(set! annotation
- (ly:stencil-aligned-to text-stencil Y CENTER))
-
- (set! annotation (ly:stencil-translate
- annotation
- (cons 0 (interval-center extent))))
-
-
+ (center-stencil-on-extent text-stencil))
(set! annotation
- (ly:stencil-combine-at-edge arrows X RIGHT annotation 0.5 0))
-
+ (ly:stencil-combine-at-edge arrows X RIGHT annotation 0.5))
(set! annotation
- (ly:make-stencil (ly:stencil-expr annotation)
+ (ly:stencil-combine-at-edge annotation X LEFT
+ (center-stencil-on-extent dim-stencil)
+ 0.5))
+ (set! annotation
+ (ly:make-stencil (list 'color color (ly:stencil-expr annotation))
(ly:stencil-extent annotation X)
(cons 10000 -10000)))))
annotation))
(write-system-signatures basename (cdr paper-systems) (1+ count))))))
+(use-modules (scm paper-system))
(define-public (write-system-signature filename paper-system)
(define (float? x)
(and (number? x) (inexact? x)))
rest))
expr))
- (define (music-cause grob)
- (let*
- ((cause (ly:grob-property grob 'cause)))
-
- (cond
- ((ly:music? cause) cause)
- ((ly:grob? cause) (music-cause cause))
- (else #f))))
(define (pythonic-string expr)
"escape quotes and slashes for python consumption"
- (regexp-substitute/global #f "([\\\\'\"])" (format "~a" expr) 'pre "\\" 1 'post))
+ (regexp-substitute/global #f "([\n\\\\'\"])" (format "~a" expr) 'pre "\\" 1 'post))
(define (pythonic-pair expr)
(format "(~a,~a)"
(car expr) (cdr expr)))
-
+
+
+ (define (raw-string expr)
+ "escape quotes and slashes for python consumption"
+ (regexp-substitute/global #f "[@\n]" (format "~a" expr) 'pre " " 'post))
+
+ (define (raw-pair expr)
+ (format "~a ~a"
+ (car expr) (cdr expr)))
+
(define (found-grob expr)
(let*
((grob (car expr))
(rest (cdr expr))
(collected '())
- (cause (music-cause grob))
- (input (if (ly:music? cause) (ly:music-property cause 'origin) #f))
+ (cause (event-cause grob))
+ (input (if (ly:stream-event? cause) (ly:event-property cause 'origin) #f))
(location (if (ly:input-location? input) (ly:input-file-line-char-column input) '()))
(x-ext (ly:grob-extent grob system-grob X))
rest)
(format output
- "['~a', '~a', ~a, ~a, '~a'],\n"
+ "~a@~a@~a@~a@~a\n"
(cdr (assq 'name (ly:grob-property grob 'meta) ))
- (pythonic-string location)
- (pythonic-pair (if (interval-empty? x-ext) '(0 . 0) x-ext))
- (pythonic-pair (if (interval-empty? y-ext) '(0 . 0) y-ext))
- (pythonic-string collected))
+ (raw-string location)
+ (raw-pair (if (interval-empty? x-ext) '(1 . -1) x-ext))
+ (raw-pair (if (interval-empty? y-ext) '(1 . -1) y-ext))
+ (raw-string collected))
))
(define (interpret-for-signature escape collect expr)
(interpret-for-signature found-grob (lambda (x) #f)
(ly:stencil-expr
(paper-system-stencil paper-system)))))
+
+ ;; should be superfluous, but leaking "too many open files"?
+ (close-port output))
projects / lilypond.git / blobdiff