;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+(define-public (translate-stencil stencil coordinate-pair)
+ "Translate @code{stencil} by the distances specified in
+@code{coordinate-pair}."
+ (ly:stencil-translate-axis
+ (ly:stencil-translate-axis stencil (cdr coordinate-pair) Y)
+ (car coordinate-pair) X))
(define-public (stack-stencils axis dir padding stils)
"Stack stencils STILS in direction AXIS, DIR, using PADDING."
(ly:stencil-combine-at-edge stil (other-axis axis) -1 rb padding))
stil))
+(define-public (make-line-stencil width startx starty endx endy)
+ "Make a line stencil of given linewidth and set its extents accordingly"
+ (let ((xext (cons (min startx endx) (max startx endx)))
+ (yext (cons (min starty endy) (max starty endy))))
+ (ly:make-stencil
+ (list 'draw-line width startx starty endx endy)
+ ; Since the line has rounded edges, we have to / can safely add half the
+ ; width to all coordinates!
+ (interval-widen xext (/ width 2))
+ (interval-widen yext (/ width 2)))))
+
+(define-public (make-round-filled-box-stencil xext yext blot-diameter)
+ "Make a filled rounded box."
+
+ (ly:make-stencil
+ (list 'round-filled-box (- (car xext)) (cdr xext)
+ (- (car yext)) (cdr yext) blot-diameter)
+ xext yext))
+
(define-public (make-filled-box-stencil xext yext)
"Make a filled box."
(define-public (make-circle-stencil radius thickness fill)
"Make a circle of radius @var{radius} and thickness @var{thickness}"
+ (let*
+ ((out-radius (+ radius (/ thickness 2.0))))
+
(ly:make-stencil
(list 'circle radius thickness fill)
- (cons (- radius) radius)
- (cons (- radius) radius)))
+ (cons (- out-radius) out-radius)
+ (cons (- out-radius) out-radius))))
+
+(define-public (make-oval-stencil x-radius y-radius thickness fill)
+ "Make an oval from two Bezier curves, of x radius @var{x-radius},
+ y radius @code{y-radius},
+ and thickness @var{thickness} with fill defined by @code{fill}."
+ (let*
+ ((x-out-radius (+ x-radius (/ thickness 2.0)))
+ (y-out-radius (+ y-radius (/ thickness 2.0))) )
+
+ (ly:make-stencil
+ (list 'oval x-radius y-radius thickness fill)
+ (cons (- x-out-radius) x-out-radius)
+ (cons (- y-out-radius) y-out-radius))))
+
+(define-public (make-ellipse-stencil x-radius y-radius thickness fill)
+ "Make an ellipse of x radius @var{x-radius}, y radius @code{y-radius},
+ and thickness @var{thickness} with fill defined by @code{fill}."
+ (let*
+ ((x-out-radius (+ x-radius (/ thickness 2.0)))
+ (y-out-radius (+ y-radius (/ thickness 2.0))) )
+
+ (ly:make-stencil
+ (list 'ellipse x-radius y-radius thickness fill)
+ (cons (- x-out-radius) x-out-radius)
+ (cons (- y-out-radius) y-out-radius))))
(define-public (box-grob-stencil grob)
"Make a box of exactly the extents of the grob. The box precisely
"
(let* ((xext (ly:grob-extent grob grob 0))
(yext (ly:grob-extent grob grob 1))
- (thick 0.1))
-
+ (thick 0.01))
+
(ly:stencil-add
(make-filled-box-stencil xext (cons (- (car yext) thick) (car yext)))
(make-filled-box-stencil xext (cons (cdr yext) (+ (cdr yext) thick)))
(define-public (circle-stencil stencil thickness padding)
"Add a circle around STENCIL, producing a new stencil."
- (let* ((x-ext (ly:stencil-extent stencil 0))
- (y-ext (ly:stencil-extent stencil 1))
- (diameter (max (- (cdr x-ext) (car x-ext))
- (- (cdr y-ext) (car y-ext))))
+ (let* ((x-ext (ly:stencil-extent stencil X))
+ (y-ext (ly:stencil-extent stencil Y))
+ (diameter (max (interval-length x-ext)
+ (interval-length y-ext)))
(radius (+ (/ diameter 2) padding thickness))
(circle (make-circle-stencil radius thickness #f)))
(interval-center x-ext)
(interval-center y-ext))))))
+(define-public (oval-stencil stencil thickness x-padding y-padding)
+ "Add an oval around @code{stencil}, padded by the padding pair,
+ producing a new stencil."
+ (let* ((x-ext (ly:stencil-extent stencil X))
+ (y-ext (ly:stencil-extent stencil Y))
+ (x-length (+ (interval-length x-ext) x-padding thickness))
+ (y-length (+ (interval-length y-ext) y-padding thickness))
+ (x-radius (* 0.707 x-length) )
+ (y-radius (* 0.707 y-length) )
+ (oval (make-oval-stencil x-radius y-radius thickness #f)))
+
+ (ly:stencil-add
+ stencil
+ (ly:stencil-translate oval
+ (cons
+ (interval-center x-ext)
+ (interval-center y-ext))))))
+
+(define-public (ellipse-stencil stencil thickness x-padding y-padding)
+ "Add an ellipse around STENCIL, padded by the padding pair,
+ producing a new stencil."
+ (let* ((x-ext (ly:stencil-extent stencil X))
+ (y-ext (ly:stencil-extent stencil Y))
+ (x-length (+ (interval-length x-ext) x-padding thickness))
+ (y-length (+ (interval-length y-ext) y-padding thickness))
+ ;(aspect-ratio (/ x-length y-length))
+ (x-radius (* 0.707 x-length) )
+ (y-radius (* 0.707 y-length) )
+ ;(diameter (max (- (cdr x-ext) (car x-ext))
+ ; (- (cdr y-ext) (car y-ext))))
+ ;(radius (+ (/ diameter 2) padding thickness))
+ (ellipse (make-ellipse-stencil x-radius y-radius thickness #f)))
+
+ (ly:stencil-add
+ stencil
+ (ly:stencil-translate ellipse
+ (cons
+ (interval-center x-ext)
+ (interval-center y-ext))))))
+
+(define-public (rounded-box-stencil stencil thickness padding blot)
+ "Add a rounded box around STENCIL, producing a new stencil."
+
+ (let* ((xext (interval-widen (ly:stencil-extent stencil 0) padding))
+ (yext (interval-widen (ly:stencil-extent stencil 1) padding))
+ (min-ext (min (-(cdr xext) (car xext)) (-(cdr yext) (car yext))))
+ (ideal-blot (min blot (/ min-ext 2)))
+ (ideal-thickness (min thickness (/ min-ext 2)))
+ (outer (ly:round-filled-box
+ (interval-widen xext ideal-thickness)
+ (interval-widen yext ideal-thickness)
+ ideal-blot))
+ (inner (ly:make-stencil (list 'color (x11-color 'white)
+ (ly:stencil-expr (ly:round-filled-box
+ xext yext (- ideal-blot ideal-thickness)))))))
+ (set! stencil (ly:stencil-add outer inner))
+ stencil))
+
(define-public (fontify-text font-metric text)
"Set TEXT with font FONT-METRIC, returning a stencil."
(if (not (interval-sane? extent))
(set! annotation (interpret-markup
layout text-props
- (make-simple-markup (format "~a: NaN/inf" name))))
+ (make-simple-markup (simple-format #f "~a: NaN/inf" name))))
(let ((text-stencil (interpret-markup
layout text-props
(markup #:whiteout #:simple name)))
((interval-empty? extent)
(format "empty"))
(is-length
- (format "~$" (interval-length extent)))
+ (ly:format "~$" (interval-length extent)))
(else
- (format "(~$,~$)"
+ (ly:format "(~$,~$)"
(car extent) (cdr extent)))))))
(arrows (ly:stencil-translate-axis
(dimension-arrows (cons 0 (interval-length extent)))
(define-public (eps-file->stencil axis size file-name)
(let*
((contents (ly:gulp-file file-name))
- (bbox (get-postscript-bbox contents))
+ (bbox (get-postscript-bbox (car (string-split contents #\nul))))
(bbox-size (if (= axis X)
(- (list-ref bbox 2) (list-ref bbox 0))
(- (list-ref bbox 3) (list-ref bbox 1))
))
- (factor (exact->inexact (/ size bbox-size)))
+ (factor (if (< 0 bbox-size)
+ (exact->inexact (/ size bbox-size))
+ 0))
(scaled-bbox
- (map (lambda (x) (* factor x)) bbox)))
+ (map (lambda (x) (* factor x)) bbox))
+ (clip-rect-string (ly:format
+ "~a ~a ~a ~a rectclip"
+ (list-ref bbox 0)
+ (list-ref bbox 1)
+ (- (list-ref bbox 2) (list-ref bbox 0))
+ (- (list-ref bbox 3) (list-ref bbox 1)))))
+
(if bbox
(ly:make-stencil
(list
'embedded-ps
(string-append
- (format
+ (ly:format
"
gsave
currentpoint translate
BeginEPSF
-~a ~a scale
+~a dup scale
+~a
%%BeginDocument: ~a
-" factor factor
+" factor clip-rect-string
+
file-name
)
contents
(if (pair? paper-systems)
(begin
(let*
- ((outname (format "~a-~a.signature" basename count)) )
+ ((outname (simple-format #f "~a-~a.signature" basename count)) )
(ly:message "Writing ~a" outname)
(write-system-signature outname (car paper-systems))
(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)
(paper-system-system-grob paper-system))
(define output (open-output-file filename))
-
+
+ ;; todo: optionally use a command line flag? Or just junk this?
+ (define compare-expressions #f)
(define (strip-floats expr)
"Replace floats by #f"
(cond
rest))
expr))
-
- (define (pythonic-string expr)
- "escape quotes and slashes for python consumption"
- (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))
+ (regexp-substitute/global #f "[@\n]" (simple-format #f "~a" expr) 'pre " " 'post))
(define (raw-pair expr)
- (format "~a ~a"
+ (simple-format #f "~a ~a"
(car expr) (cdr expr)))
(define (found-grob expr)
(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) '()))
+ ;; todo: use stencil extent if available.
(x-ext (ly:grob-extent grob system-grob X))
(y-ext (ly:grob-extent grob system-grob Y))
- )
-
- (interpret-for-signature #f (lambda (e)
- (set! collected (cons e collected)))
- rest)
-
- (format output
+ (expression-skeleton
+ (if compare-expressions
+ (interpret-for-signature
+ #f (lambda (e)
+ (set! collected (cons e collected)))
+ rest)
+ "")))
+
+ (simple-format output
"~a@~a@~a@~a@~a\n"
(cdr (assq 'name (ly:grob-property grob 'meta) ))
(raw-string location)
(if (ly:grob? system-grob)
(begin
- (display (format "# Output signature\n# Generated by LilyPond ~a\n" (lilypond-version))
+ (display (simple-format #f "# Output signature\n# Generated by LilyPond ~a\n" (lilypond-version))
output)
(interpret-for-signature found-grob (lambda (x) #f)
(ly:stencil-expr
projects / lilypond.git / blobdiff