X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=a50f82d639da8dfd80e8e15be14d738e9d6a4643;hb=a1741dc78d0f4a71cd6790b4306fdcd618e5c40a;hp=fd0b768dd88aa7692f88b0c04b2c9652c2159def;hpb=96836c61532a417f64d4ef3b2732db7dcb0f5737;p=lilypond.git diff --git a/scm/output-ps.scm b/scm/output-ps.scm index fd0b768dd8..a50f82d639 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -3,7 +3,7 @@ ;;;; source file of the GNU LilyPond music typesetter ;;;; ;;;; (c) 1998--2006 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; Han-Wen Nienhuys ;;;; Note: currently misused as testbed for titles with markup, see ;;;; input/test/title-markup.ly @@ -18,26 +18,27 @@ ;; JUNK this -- see lily.scm: ly:all-output-backend-commands #:export (unknown - blank + bezier-sandwich + char circle - dot + comment + dashed-line dashed-slur - char - setcolor - resetcolor + dot + draw-line + embedded-ps named-glyph - dashed-line - zigzag-line - comment - repeat-slash + no-origin placebox - bezier-sandwich - embedded-ps + polygon + repeat-slash + resetcolor + resetrotation round-filled-box + setcolor + setrotation text - polygon - draw-line - no-origin)) + zigzag-line)) (use-modules (guile) @@ -48,6 +49,9 @@ (lily)) ;;; helper functions, not part of output interface +;;; + + (define (escape-parentheses s) (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post)) @@ -102,38 +106,43 @@ (define (circle radius thick fill) (format #f - "~f ~f ~a draw_circle" (round4 radius) (round4 thick) + "~a ~f ~f draw_circle" (if fill - "true " - "false "))) + "true" + "false") + (round4 radius) (round4 thick))) -(define (dashed-line thick on off dx dy) - (format #f "~a ~a ~a [ ~a ~a ] 0 draw_dashed_line" +(define (dashed-line thick on off dx dy phase) + (format #f "~a ~a ~a [ ~a ~a ] ~a draw_dashed_line" (str4 dx) (str4 dy) (str4 thick) (str4 on) - (str4 off))) + (str4 off) + (str4 phase) + + )) ;; what the heck is this interface ? (define (dashed-slur thick on off l) (format #f "~a ~a [ ~a ~a ] 0 draw_dashed_slur" - (string-join (map number-pair->string4 l) " ") + (let ((control-points (append (cddr l) (list (car l) (cadr l))))) + (string-join (map number-pair->string4 control-points) " ")) (str4 thick) (str4 on) (str4 off))) (define (dot x y radius) (format #f " ~a draw_dot" - (numbers->string4 (list x y radius)))) + (numbers->string4 (list radius x y)))) (define (draw-line thick x1 y1 x2 y2) - (format #f "1 setlinecap 1 setlinejoin ~a setlinewidth ~a ~a moveto ~a ~a lineto stroke" - (str4 thick) - (str4 x1) - (str4 y1) - (str4 x2) - (str4 y2))) + (format #f "~a ~a ~a ~a ~a draw_line" + (str4 (- x2 x1)) + (str4 (- y2 y1)) + (str4 x1) + (str4 y1) + (str4 thick))) (define (embedded-ps string) string) @@ -143,31 +152,33 @@ cid? w-x-y-named-glyphs) - (format #f "gsave \n/~a ~a output-scale div selectfont\n~a grestore" + (define (glyph-spec w x y g) + (let ((prefix (if (string? g) "/" ""))) + (format #f "~f ~f ~a~a" + (round2 (+ w x)) + (round2 y) + prefix g))) + + (format #f + (if cid? +"/~a /CIDFont findresource ~a output-scale div scalefont setfont +~a +~a print_glyphs" + +"/~a ~a output-scale div selectfont +~a +~a print_glyphs") postscript-font-name size - (string-append - (apply - string-append - (map (lambda (item) - (let* - ((w (car item)) - (x (cadr item)) - (y (caddr item)) - (g (cadddr item)) - (prefix (if (string? g) "/" ""))) - - (format #f "~f ~f ~a~a\n" (round2 (+ w x)) - (round2 y) prefix g) - )) - w-x-y-named-glyphs)) - (format #f "~a print_glyphs" (length w-x-y-named-glyphs))) - )) + (string-join (map (lambda (x) (apply glyph-spec x)) + (reverse w-x-y-named-glyphs)) "\n") + (length w-x-y-named-glyphs))) + (define (grob-cause offset grob) (let* ((cause (ly:grob-property grob 'cause)) - (music-origin (if (ly:music? cause) - (ly:music-property cause 'origin)))) + (music-origin (if (ly:stream-event? cause) + (ly:event-property cause 'origin)))) (if (not (ly:input-location? music-origin)) "" (let* ((location (ly:input-file-line-char-column music-origin)) @@ -202,8 +213,8 @@ (if (string=? (substring key 0 (min (string-length prefix) (string-length key))) prefix) - (string-append "/" key " {" val "} bind def\n") - (string-append "/" key " (" val ") def\n")))) + (format "/~a { ~a } bind def\n" key val) + (format "/~a (~a) def\n" key val)))) (define (named-glyph font glyph) (format #f "~a /~a glyphshow " ;;Why is there a space at the end? @@ -215,45 +226,65 @@ (define (placebox x y s) (format #f -"gsave ~a ~a translate -0 0 moveto -~a -grestore\n" - - (str4 x) - (str4 y) - s)) +"~a ~a moveto +~a\n" + (str4 x) + (str4 y) + s)) (define (polygon points blot-diameter filled?) (format #f "~a ~a ~a ~a draw_polygon" + (if filled? "true" "false") (numbers->string4 points) - (str4 (/ (length points) 2)) - (str4 blot-diameter) - (if filled? "true" "false"))) + (number->string (- (/ (length points) 2) 1)) + (str4 blot-diameter))) -(define (repeat-slash wid slope thick) - (format #f "~a draw_repeat_slash" - (numbers->string4 (list wid slope thick)))) +(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))) + (format #f "~a draw_repeat_slash" + (numbers->string4 (list x-width width height))))) -;; restore color from stack -(define (resetcolor) "setrgbcolor\n") -(define (round-filled-box x y width height blotdiam) - (format #f "~a draw_round_box" - (numbers->string4 - (list x y width height blotdiam)))) +(define (round-filled-box left right bottom top blotdiam) + (let* ((halfblot (/ blotdiam 2)) + (x (- halfblot left)) + (width (- right (+ halfblot x))) + (y (- halfblot bottom)) + (height (- top (+ halfblot y)))) + (format #f "~a draw_round_box" + (numbers->string4 + (list width height x y blotdiam))))) ;; save current color on stack and set new color (define (setcolor r g b) - (format #f "currentrgbcolor ~a setrgbcolor\n" + (format #f "gsave ~a setrgbcolor\n" (numbers->string4 (list r g b)))) +;; restore color from stack +(define (resetcolor) "grestore \n") + +;; rotation around given point +(define (setrotation ang x y) + (format "gsave ~a translate ~a rotate ~a translate\n" + (numbers->string4 (list x y)) + (number->string ang) + (numbers->string4 (list (* -1 x) (* -1 y))))) + +(define (resetrotation ang x y) + "grestore ") + + (define (text font s) ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend")) ;; (ly:warning (_ "Arguments: ~a ~a"" font str)) (let* ((space-length (cdar (ly:text-dimension font " "))) (space-move (string-append (number->string space-length) + ;; how much precision do we need here? " 0.0 rmoveto ")) (out-vec (decode-byte-string s))) @@ -292,3 +323,32 @@ grestore\n" (str4 thick) (str4 dx) (str4 dy))) + + +(define (path thickness exps) + (define (convert-path-exps exps) + (if (pair? exps) + (let* + ((head (car exps)) + (rest (cdr exps)) + (arity + (cond + ((memq head '(rmoveto rlineto lineto moveto)) 2) + ((memq head '(rcurveto curveto)) 6) + (else 1))) + (args (take rest arity)) + ) + + ;; WARNING: this is a vulnerability: a user can output arbitrary PS code here. + (cons (format "~a ~a " + (string-join (map (lambda (x) (format "~a " x)) args) " ") + head) + (convert-path-exps (drop rest arity)))) + '())) + + + (format + "1 setlinecap ~a setlinewidth\n~a stroke" + thickness + (string-join (convert-path-exps exps) " "))) +