X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Foutput-ps.scm;h=97909da80cf6b8537ba39fcbc384825156361978;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=bbb0d0c381a9853537d20e98ebbe3de7f34b8663;hpb=7043b5d2a6a70935ef0e84b62dc021452e28a59f;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index bbb0d0c381..97909da80c 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -1,314 +1,299 @@
-;;;; output-ps.scm -- implement Scheme output interface for PostScript
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;;; Note: currently misused as testbed for titles with markup, see
 ;;;;       input/test/title-markup.ly
-;;;; 
+;;;;
 ;;;; TODO:
 ;;;;   * %% Papersize in (header ...)
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
 (define-module (scm output-ps)
-  #:re-export (quote)
-
-  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
-  #:export (unknown
-	    blank
-	    circle
-	    dot
-	    beam
-	    dashed-slur
-	    char
-	    setcolor
-	    resetcolor
-	    named-glyph
-	    dashed-line
-	    zigzag-line
-	    comment
-	    repeat-slash
-	    placebox
-	    bezier-sandwich
-	    embedded-ps
-	    filledbox
-	    round-filled-box
-	    text
-	    polygon
-	    draw-line
-	    no-origin))
-
+  #:re-export (quote))
 
 (use-modules (guile)
-	     (ice-9 regex)
-	     (srfi srfi-1)
-	     (srfi srfi-13)
-	     (scm framework-ps)
-	     (lily))
-
-;;; helper functions, not part of output interface
-(define (escape-parentheses s)
-  (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
-
-(define (ps-encoding text)
-  (escape-parentheses text))
-
-;; FIXME: lily-def
-(define-public (ps-string-def prefix key val)
-  (string-append "/" prefix (symbol->string key) " ("
-		 (escape-parentheses val)
-		 ") def\n"))
-
-
-(define (ps-number-def prefix key val)
-  (let ((s (if (integer? val)
-	       (ly:number->string val)
-	       (ly:number->string (exact->inexact val)))))
-    (string-append "/" prefix (symbol->string key) " " s " def\n")))
-
+             (ice-9 regex)
+             (ice-9 optargs)
+             (srfi srfi-1)
+             (srfi srfi-13)
+             (scm framework-ps)
+             (lily))
 
 ;;;
 ;;; Lily output interface, PostScript implementation --- cleanup and docme
 ;;;
 
-;;; Output-interface functions
-(define (beam width slope thick blot)
-  (string-append
-   (ly:numbers->string (list slope width thick blot)) " draw_beam" ))
-
-;; two beziers
-(define (bezier-sandwich lst thick)
-  (string-append 
-   (string-join (map ly:number-pair->string lst) " ")
-   " "
-   (ly:number->string thick)
-   " draw_bezier_sandwich"))
-
 (define (char font i)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "(\\" (ly:inexact->string i 8) ") show"))
+  (ly:format "~a (\\~a) show"
+             (ps-font-command font)
+             (ly:inexact->string i 8)))
 
 (define (circle radius thick fill)
-  (format
-   "~a ~a ~a draw_circle" radius thick
+  (ly:format
+   "~a ~4f ~4f draw_circle"
    (if fill
-       "true "
-       "false ")))
-
-(define (dashed-line thick on off dx dy)
-  (string-append 
-   (ly:number->string dx) " "
-   (ly:number->string dy) " "
-   (ly:number->string thick)
-   " [ "
-   (ly:number->string on) " "
-   (ly:number->string off)
-   " ] 0 draw_dashed_line"))
-
-;; what the heck is this interface ?
-(define (dashed-slur thick on off l)
-  (string-append 
-   (string-join (map ly:number-pair->string l) " ")
-   " "
-   (ly:number->string thick) 
-   " [ "
-   (ly:number->string on)
-   " "   
-   (ly:number->string off)
-   " ] 0 draw_dashed_slur"))
-
-(define (dot x y radius)
-  (string-append
-   " "
-   (ly:numbers->string
-    (list x y radius)) " draw_dot"))
+       "true"
+       "false")
+   radius thick))
+
+(define (start-group-node attributes)
+  "")
+
+(define (end-group-node)
+  "")
+
+(define (dashed-line thick on off dx dy phase)
+  (ly:format "~4f ~4f ~4f [ ~4f ~4f ] ~4f draw_dashed_line"
+             dx
+             dy
+             thick
+             on
+             off
+             phase))
 
 (define (draw-line thick x1 y1 x2 y2)
-  (string-append 
-   "1 setlinecap 1 setlinejoin "
-   (ly:number->string thick) " setlinewidth "
-   (ly:number->string x1) " "
-   (ly:number->string y1) " moveto "
-   (ly:number->string x2) " "
-   (ly:number->string y2) " lineto stroke"))
+  (ly:format "~4f ~4f ~4f ~4f ~4f draw_line"
+             (- x2 x1) (- y2 y1)
+             x1 y1 thick))
+
+(define (partial-ellipse x-radius y-radius start-angle end-angle thick connect fill)
+  (ly:format "~a ~a ~4f ~4f ~4f ~4f ~4f draw_partial_ellipse"
+             (if fill "true" "false")
+             (if connect "true" "false")
+             x-radius
+             y-radius
+             start-angle
+             end-angle
+             thick))
+
+(define (ellipse x-radius y-radius thick fill)
+  (ly:format
+   "~a ~4f ~4f ~4f draw_ellipse"
+   (if fill
+       "true"
+       "false")
+   x-radius y-radius thick))
 
 (define (embedded-ps string)
   string)
 
-;; FIXME: use draw_round_box
-(define (filledbox breapth width depth height)
-  (string-append (ly:numbers->string (list breapth width depth height))
-		 " draw_box"))
-
-(define (glyph-string
-	 postscript-font-name
-	 size cid?
-	 x-y-named-glyphs)
-
-  (define (encoding-vector-hack glyphs)
-    
-    ;; GS fucks up with glyphs that are not in the
-    ;; encoding vector.
-    (define (inner j glyphs)
-      (if (or (null? glyphs) (> j 256))
-	  '()
-	  (cons (format "dup ~a /~a put\n"
-			j (car glyphs))
-		(inner (1+ j) (cdr glyphs)))))
-	  
-    (format "256 array 0 1 255 { 1 index exch /.notdef put} for\n ~a
-/EncHack reencode-font /EncHack findfont"
-	    (apply string-append (inner 32 glyphs))))
-    ;; END HACK.
-  
-  (format #f "gsave 1 output-scale div 1 output-scale div scale
-  /~a ~a ~a scalefont setfont\n~a grestore"
-	  postscript-font-name
-	  (if cid?
-	      " /CIDFont findresource "
-	      " findfont")
-	
-	  size
-	  (apply
-	   string-append
-	   (map (lambda  (item)
-		  (let*
-		      ((x (car item))
-		       (y (cadr item))
-		       (g (caddr item))
-		       (prefix (if  (string? g) "/" "")))
-
-		    (if (and (= 0.0 x)
-			     (= 0.0 y))
-			(format #f " ~a~a glyphshow\n" prefix g)
-			(format #f " ~a ~a rmoveto ~a~a glyphshow\n"
-				x y
-				prefix
-				g))))
-		x-y-named-glyphs))))
+(define (glyph-string pango-font
+                      postscript-font-name
+                      size
+                      cid?
+                      w-x-y-named-glyphs)
+  (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 prefix g)))
+  (define (emglyph-spec w h x y g) ; h not used
+    (if (and (= x 0) (= y 0))
+        (ly:format "currentpoint ~a moveto ~4f 0 rmoveto" g w)
+        (ly:format "currentpoint ~4f ~4f rmoveto ~a moveto ~4f 0 rmoveto" x y g w)))
+  (if cid?
+      (ly:format
+       "/~a /CIDFont findresource ~a output-scale div scalefont setfont\n~a\n~a print_glyphs"
+       postscript-font-name size
+       (string-join (map (lambda (x) (apply glyph-spec x))
+                         (reverse w-x-y-named-glyphs)) "\n")
+       (length w-x-y-named-glyphs))
+      (if (and (ly:bigpdfs) (string-startswith postscript-font-name "Emmentaler"))
+          (ly:format "/~a-O ~a output-scale div selectfont\n~a"
+                     postscript-font-name size
+                     (string-join (map (lambda (x) (apply emglyph-spec x))
+                                       w-x-y-named-glyphs) "\n"))
+          (ly:format "/~a ~a output-scale div selectfont\n~a\n~a print_glyphs"
+                     postscript-font-name size
+                     (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))))
-    (if (not (ly:input-location? music-origin))
-	""
-	(let* ((location (ly:input-file-line-column music-origin))
-	       (raw-file (car location))
-	       (file (if (is-absolute? raw-file)
-			 raw-file
-			 (string-append (ly-getcwd) "/" raw-file)))
-	       (x-ext (ly:grob-extent grob grob X))
-	       (y-ext (ly:grob-extent grob grob Y)))
-
-	  (if (and (< 0 (interval-length x-ext))
-		   (< 0 (interval-length y-ext)))
-	      (format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
-		      (+ (car offset) (car x-ext))
-		      (+ (cdr offset) (car y-ext))
-		      (+ (car offset) (cdr x-ext))
-		      (+ (cdr offset) (cdr y-ext))
-		      file
-		      (cadr location)
-		      (caddr location))
-	      "")))))
-
-(define (lily-def key val)
-  (let ((prefix "lilypondlayout"))
-    (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"))))
+  (if (ly:get-option 'point-and-click)
+      (let* ((cause (ly:grob-property grob 'cause))
+             (music-origin (if (ly:stream-event? cause)
+                               (ly:event-property cause 'origin)))
+             (point-and-click (ly:get-option 'point-and-click)))
+        (if (and
+             (ly:input-location? music-origin)
+             (cond ((boolean? point-and-click) point-and-click)
+                   ((symbol? point-and-click)
+                    (ly:in-event-class? cause point-and-click))
+                   (else (any (lambda (t)
+                                (ly:in-event-class? cause t))
+                              point-and-click))))
+            (let* ((location (ly:input-file-line-char-column music-origin))
+                   (raw-file (car location))
+                   (file (if (is-absolute? raw-file)
+                             raw-file
+                             (string-append (ly-getcwd) "/" raw-file)))
+                   (x-ext (ly:grob-extent grob grob X))
+                   (y-ext (ly:grob-extent grob grob Y)))
+
+              (if (and (< 0 (interval-length x-ext))
+                       (< 0 (interval-length y-ext)))
+                  (ly:format "~4f ~4f ~4f ~4f (textedit://~a:~a:~a:~a) mark_URI\n"
+                             (+ (car offset) (car x-ext))
+                             (+ (cdr offset) (car y-ext))
+                             (+ (car offset) (cdr x-ext))
+                             (+ (cdr offset) (cdr y-ext))
+
+                             ;; Backslashes are not valid
+                             ;; file URI path separators.
+                             (ly:string-percent-encode
+                              (ly:string-substitute "\\" "/" file))
+
+                             (cadr location)
+                             (caddr location)
+                             (1+ (cadddr location)))
+                  ""))
+            ""))
+      ""))
 
 (define (named-glyph font glyph)
-  (string-append 
-   (ps-font-command font) " setfont " 
-   "/" glyph " glyphshow "))
+  (if (and (ly:bigpdfs) (string-startswith (ly:font-file-name font) "emmentaler"))
+      (if (string-endswith (ly:font-file-name font)"-brace")
+          (if (or (string-startswith glyph "brace1") (string-startswith glyph "brace2"))
+              (ly:format "~a ~a" (string-append (ps-font-command font) "-N" ) glyph)
+              (if (or (string-startswith glyph "brace3") (string-startswith glyph "brace4"))
+                  (ly:format "~a ~a" (string-append (ps-font-command font) "-S" ) glyph)
+                  (ly:format "~a ~a" (string-append (ps-font-command font) "-O" ) glyph)))
+          (if (string-startswith glyph "noteheads")
+              (ly:format "~a ~a" (string-append (ps-font-command font) "-N" ) glyph)
+              (if (or (string-startswith glyph "scripts") (string-startswith glyph "clefs"))
+                  (ly:format "~a ~a" (string-append (ps-font-command font) "-S" ) glyph)
+                  (ly:format "~a ~a" (string-append (ps-font-command font) "-O" ) glyph))))
+      (ly:format "~a /~a glyphshow" (ps-font-command font) glyph)))
 
 (define (no-origin)
   "")
 
-(define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
+(define (placebox x y s)
+  (if (not (string-null? s))
+      (ly:format "~4f ~4f moveto ~a\n" x y s)
+      ""))
+
+(define (polygon points blot-diameter filled?)
+  (ly:format "~a ~4l ~a ~4f draw_polygon"
+             (if filled? "true" "false")
+             points
+             (- (/ (length points) 2) 1)
+             blot-diameter))
+
+(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))))
+    (ly:format  "~4l draw_round_box"
+                (list width height x y blotdiam))))
 
-(define (polygon points blotdiameter filled?)
-  (string-append
-   (ly:numbers->string points) " "
-   (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
-   (if filled? " true " " false ")
-   " draw_polygon"))
-
-(define (repeat-slash wid slope thick)
-  (string-append
-   (ly:numbers->string (list wid slope thick))
-   " draw_repeat_slash"))
+;; save current color on stack and set new color
+(define (setcolor r g b)
+  (ly:format "gsave ~4l setrgbcolor\n"
+             (list r g b)))
 
 ;; restore color from stack
-(define (resetcolor)
-  (string-append "setrgbcolor\n"))
+(define (resetcolor) "grestore\n")
 
-(define (round-filled-box x y width height blotdiam)
-  (string-append
-   (ly:numbers->string
-    (list x y width height blotdiam)) " draw_round_box"))
+;; rotation around given point
+(define (setrotation ang x y)
+  (ly:format "gsave ~4l translate ~a rotate ~4l translate\n"
+             (list x y)
+             ang
+             (list (* -1 x) (* -1 y))))
 
-;; save current color on stack and set new color
-(define (setcolor r g b)
-  (string-append "currentrgbcolor "
-  (ly:numbers->string (list r g b))
-  " setrgbcolor\n"))
-
-(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)
-				    " 0.0 rmoveto "))
-	 (out-vec (decode-byte-string s)))
-
-    (string-append
-     (ps-font-command font) " setfont "
-     (string-join
-      (vector->list
-       (vector-for-each
-	
-	(lambda (sym)
-	  (if (eq? sym 'space)
-	      space-move
-	      (string-append "/" (symbol->string sym) " glyphshow")))
-	out-vec))))))
-
-(define (unknown) 
+(define (resetrotation ang x y)
+  "grestore  ")
+
+(define (unknown)
   "\n unknown\n")
 
 (define (url-link url x y)
-  (format "~a ~a ~a ~a (~a) mark_URI"
-	  (car x)
-	  (car y)
-	  (cdr x)
-	  (cdr y)
-	  url))
-
-(define (utf8-string pango-font-description string)
-  (ly:warning (_ "utf8-string encountered in PS backend")))
-
-
-
-(define (zigzag-line centre? zzw zzh thick dx dy)
-  (string-append
-   (if centre? "true" "false") " "
-   (ly:number->string zzw) " "
-   (ly:number->string zzh) " "
-   (ly:number->string thick) " "
-   "0 0 "
-   (ly:number->string dx) " "
-   (ly:number->string dy)
-   " draw_zigzag_line"))
+  (ly:format "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add (~a) mark_URI"
+             (car x)
+             (car y)
+             (cdr x)
+             (cdr y)
+             url))
+
+(define (page-link page-no x y)
+  (if (number? page-no)
+      (ly:format "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add ~a mark_page_link"
+                 (car x)
+                 (car y)
+                 (cdr x)
+                 (cdr y)
+                 page-no)
+      ""))
+
+(define* (path thickness exps #:optional (cap 'round) (join 'round) (fill? #f))
+  (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)
+               ((eq? head 'closepath) 0)
+               (else 1)))
+             (args (take rest arity))
+             )
+
+          ;; WARNING: this is a vulnerability: a user can output arbitrary PS code here.
+          (cons (ly:format
+                 "~l ~a "
+                 args
+                 head)
+                (convert-path-exps (drop rest arity))))
+        '()))
+
+  (let ((cap-numeric (case cap ((butt) 0) ((round) 1) ((square) 2)
+                           (else (begin
+                                   (ly:warning (_ "unknown line-cap-style: ~S")
+                                               (symbol->string cap))
+                                   1))))
+        (join-numeric (case join ((miter) 0) ((round) 1) ((bevel) 2)
+                            (else (begin
+                                    (ly:warning (_ "unknown line-join-style: ~S")
+                                                (symbol->string join))
+                                    1)))))
+     (ly:format
+      "gsave currentpoint translate
+~a setlinecap ~a setlinejoin ~a setlinewidth
+~l ~a grestore"
+      cap-numeric
+      join-numeric
+      thickness
+      (convert-path-exps exps)
+      ;; print outline contour only if there is no fill or if
+      ;; contour is explicitly requested with a thickness > 0
+      (cond ((not fill?) "stroke")
+            ((positive? thickness) "gsave stroke grestore fill")
+            (else "fill")))))
+
+
+(define (setscale x y)
+  (ly:format "gsave ~4l scale\n"
+             (list x y)))
+
+(define (resetscale)
+  "grestore\n")