;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2003--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2003--2007 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}"
(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)))
(set! annotation
(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:stencil-combine-at-edge annotation X LEFT
(center-stencil-on-extent dim-stencil)
- 0.5 0))
+ 0.5))
(set! annotation
(ly:make-stencil (list 'color color (ly:stencil-expr annotation))
(ly:stencil-extent annotation X)
(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