X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=dd92175feb931066f0583562a45bd6e40746a8e3;hb=89e69a386dc15ef3baa2d6df1ed67f11ff5150f2;hp=8c8e853567f4851cae95d8a3da82c798813562a6;hpb=b231459a563c15e11b426c72192d15c49be156b4;p=lilypond.git diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 8c8e853567..dd92175feb 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -58,12 +58,6 @@ ;;; Lily output interface, PostScript implementation --- cleanup and docme ;;; -;; two beziers -(define (bezier-sandwich lst thick) - (ly:format "~l ~4f draw_bezier_sandwich" - (map number-pair->string4 lst) - thick)) - (define (char font i) (ly:format "~a (\\~a) show" (ps-font-command font) @@ -118,12 +112,13 @@ (define (embedded-ps string) string) -(define (glyph-string postscript-font-name +(define (glyph-string pango-font + postscript-font-name size cid? w-x-y-named-glyphs) - (define (glyph-spec w x y g) + (define (glyph-spec w h x y g) ; h not used (let ((prefix (if (string? g) "/" ""))) (ly:format "~4f ~4f ~4f ~a~a" w x y @@ -182,7 +177,7 @@ (cadr location) (caddr location) - (cadddr location)) + (1+ (cadddr location))) "")) "")) "")) @@ -207,16 +202,6 @@ (- (/ (length points) 2) 1) blot-diameter)) -(define (repeat-slash width slope beam-thickness) - (define (euclidean-length x y) - (sqrt (+ (* x x) (* y y)))) - - (let ((x-width (euclidean-length beam-thickness (/ beam-thickness slope))) - (height (* width slope))) - (ly:format "~4l draw_repeat_slash" - (list x-width width height)))) - - (define (round-filled-box left right bottom top blotdiam) (let* ((halfblot (/ blotdiam 2)) (x (- halfblot left))