X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=2af732a818ffefb02d18a9238e4f2184161f4909;hb=e0407d20831d03468072ba0f219ccee787cd2621;hp=9068ce553987819e6e935d0eda05f1cf4eb9396e;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 9068ce5539..2af732a818 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -6,6 +6,8 @@
 
 (define-module (scm framework-ps))
 
+;;; this is still too big a mess.
+
 (use-modules (ice-9 regex)
 	     (ice-9 string-fun)
 	     (ice-9 format)
@@ -14,6 +16,8 @@
 	     (srfi srfi-13)
 	     (lily))
 
+(define framework-ps-module (current-module))
+
 (define (stderr string . rest)
   (apply format (cons (current-error-port) (cons string rest)))
   (force-output (current-error-port)))
@@ -26,76 +30,44 @@
 
 (define-public (ps-font-command font . override-coding)
   (let* ((name (ly:font-file-name font))
-	 (magnify (ly:font-magnification font))
-	 (coding-alist (ly:font-encoding-alist font))
-	 (input-encoding (assoc-get 'input-name coding-alist))
-	 (font-encoding (assoc-get 'output-name coding-alist))
-	 (coding-command (if (null? override-coding)
-			     (if (equal? input-encoding font-encoding)
-				 #f font-encoding)
-			     (car override-coding))))
+	 (magnify (ly:font-magnification font)))
 
     (string-append
      "magfont" (string-encode-integer (hashq  name 1000000))
-     "m" (string-encode-integer (inexact->exact (round (* 1000 magnify))))
-     (if (not coding-command) "" (string-append "e" coding-command)))))
+     "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
 
 (define (tex-font? fontname)
   (or
    (equal? (substring fontname 0 2) "cm")
    (equal? (substring fontname 0 2) "ec")))
 
-(define (load-fonts paper)
-  (let* ((fonts (ly:paper-fonts paper))
-	 (font-names (uniq-list (sort (map ly:font-file-name fonts) string<?)))
-	 (pfas (map
-		(lambda (x)
-		
-		  (let* ((aname (string-append x ".pfa"))
-			 (apath (ly:kpathsea-find-file aname))
-			 
-			 (bpath (if (not apath)
-				    (ly:kpathsea-find-file
-				     (string-append x ".pfb"))
-				    #f)))
-		    (cond
-		     (apath (ly:gulp-file apath))
-		     (bpath (ly:pfb->pfa bpath))
-		     (else
-		      (ly:warn "cannot find PFA font ~S" x)
-		      ""))))
-		(filter string? font-names))))
-  
-    (string-join pfas "\n")))
+(define (ps-embed-pfa body font-name version)
+  (string-append
+   (format
+    "%%BeginResource: font ~a
+~a
+%%EndResource"
+    font-name body)))
 
-(define (define-fonts paper)
 
+(define (define-fonts paper)
   (define font-list (ly:paper-fonts paper))
   (define (define-font command fontname scaling)
     (string-append
      "/" command " { /" fontname " findfont "
      (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
 
-  (define (reencode-font fontname encoding scaling command)
-    (let ((coding-vector (get-coding-command encoding)))
-      (string-append
-       "/" fontname " findfont " coding-vector " /" command " reencode-font\n"
-       "/" command "{ /" command " findfont " (ly:number->string scaling) " output-scale div scalefont } bind def\n")))
-
   (define (standard-tex-font? x)
     (or (equal? (substring x 0 2) "ms")
 	(equal? (substring x 0 2) "cm")))
- 
+
   (define (font-load-command font)
     (let* ((specced-font-name (ly:font-name font))
 	   (fontname (if specced-font-name
 			 specced-font-name
 			 (ly:font-file-name font)))
-	
-	   (coding-alist (ly:font-encoding-alist font))
-	   (input-encoding (assoc-get 'input-name coding-alist))
-	   (font-encoding (assoc-get 'output-name coding-alist))
 	   (command (ps-font-command font))
+
 	   ;; FIXME -- see (ps-font-command )
 	   (plain (ps-font-command font #f))
 	   (designsize (ly:font-design-size font))
@@ -104,41 +76,17 @@
 	   (scaling (* ops magnification designsize)))
 
       ;; Bluesky pfbs have UPCASE names (sigh.)
-      ;;
+      ;; FIXME - don't support Bluesky?
       (if (standard-tex-font? fontname)
 	  (set! fontname (string-upcase fontname)))
-      
-      ;; debugging: [output]encoding is broken
-      ;; found so far: coding-alist is empty!
-      (pdebug "font: ~S\n" font)
-      (pdebug "fontname: ~S\n" fontname)
-      (pdebug "input-encoding:~S\n" input-encoding)
-      (pdebug "font-encoding:~S\n" font-encoding)
-
-      (pdebug "coding-alist:~S\n" coding-alist)
-      
-      (string-append
-       (define-font plain fontname scaling)
-       (if (equal? input-encoding font-encoding)
-	   ""
-	   (reencode-font fontname input-encoding scaling command)))))
-
-  (define (font-load-encoding encoding)
-    (let ((file-name (get-coding-file-name encoding)))
-      (ly:gulp-file (ly:kpathsea-find-file file-name))))
-
-  (let* ((encoding-list (map (lambda (x)
-			       (assoc-get 'input-name
-					  (ly:font-encoding-alist x)))
-			     font-list))
-	 (encodings (uniq-list (sort-list (filter string? encoding-list)
-					  string<?))))
-
-    (pdebug "encodings:~S\n" encodings)
-    (string-append
-     (apply string-append (map font-load-encoding encodings))
-     (apply string-append
-	    (map (lambda (x) (font-load-command x)) font-list)))))
+      (if (equal? fontname "unknown")
+	  (display (list font fontname)))
+      (define-font plain fontname scaling)))
+
+  (apply string-append
+	 (map (lambda (x) (font-load-command x))
+	      (filter (lambda (x) (not (ly:pango-font? x)))
+		      font-list))))
 
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name
@@ -154,51 +102,64 @@
   (define (output-entry ps-key ly-key)
     (string-append
      "/" ps-key " "
-     (value->string (ly:output-def-lookup layout ly-key)) " def \n"))
+     (value->string (ly:output-def-lookup layout ly-key)) " def\n"))
 
   (string-append
-   "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"
+   "/lily-output-units "
+     (number->string mm-to-bigpoint)
+     " def %% millimeter\n"
    (output-entry "staff-line-thickness" 'linethickness)
    (output-entry "line-width" 'linewidth)
    (output-entry "paper-size" 'papersizename)
    (output-entry "staff-height" 'staffheight)	;junkme.
    "/output-scale "
-   (number->string (ly:output-def-lookup layout 'outputscale))
-   " lily-output-units mul def \n"
+     (number->string (ly:output-def-lookup layout 'outputscale))
+     " def\n"
    (output-entry "page-height" 'vsize)
-   (output-entry "page-width" 'hsize)
-   ))
+   (output-entry "page-width" 'hsize)))
 
-(define (dump-page outputter page page-number page-count landscape?) 
+(define (dump-page outputter page page-number page-count landscape?)
   (ly:outputter-dump-string outputter
-   (string-append
-    "%%Page: "
-    (number->string page-number) " " (number->string page-count) "\n"
-
-    "%%BeginPageSetup\n"
-    (if landscape?
-	"page-width output-scale mul 0 translate 90 rotate\n"
-	"")
-    "%%EndPageSetup\n"
-
-    "start-system { "
-    "set-ps-scale-to-lily-scale "
-    "\n"))
+			    (string-append
+			     "%%Page: "
+			     (number->string page-number) " " (number->string page-count) "\n"
+
+			     "%%BeginPageSetup\n"
+			     (if landscape?
+				 "page-width output-scale mul 0 translate 90 rotate\n"
+				 "")
+			     "%%EndPageSetup\n"
+
+			     "start-page { "
+			     "set-ps-scale-to-lily-scale "
+			     "\n"))
   (ly:outputter-dump-stencil outputter page)
   (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
 
-(define (eps-header paper bbox)
-  (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
+(define (supplies-or-needs paper load-fonts?)
+  (let* ((fonts (ly:paper-fonts paper)))
+    (apply string-append
+	   (map (lambda (f)
+		  (format
+		   (if load-fonts?
+		    "%%DocumentSuppliedResources: font ~a\n"
+		    "%%DocumentNeededResources: font ~a\n")
+		   (ly:font-name f)))
+		fonts))))
+
+(define (eps-header paper bbox load-fonts?)
+    (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
 		 "%%Creator: creator time-stamp\n"
 		 "%%BoundingBox: "
-		 (string-join (map number->string bbox) " ") "\n"
+		 (string-join (map ly:number->string bbox) " ") "\n"
 		 "%%Orientation: "
 		 (if (eq? (ly:output-def-lookup paper 'landscape) #t)
 		     "Landscape\n"
 		     "Portrait\n")
+		 (supplies-or-needs paper load-fonts?)
 		 "%%EndComments\n"))
 
-(define (page-header paper page-count)
+(define (page-header paper page-count load-fonts?)
   (string-append "%!PS-Adobe-3.0\n"
 		 "%%Creator: creator time-stamp\n"
 		 "%%Pages: " (number->string page-count) "\n"
@@ -208,73 +169,153 @@
 		     "Landscape\n"
 		     "Portrait\n")
 		 "%%DocumentPaperSizes: "
-		 (ly:output-def-lookup paper 'papersizename) "\n"))
+		 (ly:output-def-lookup paper 'papersizename) "\n"
+		 (supplies-or-needs paper load-fonts?)
+		 "%%EndComments\n"))
 
-(define (preamble paper)
-  (list
+(define (procset file-name)
+  (string-append
+   (format
+    "%%BeginResource: procset (~a) 1 0
+~a
+%%EndResource
+"
+    file-name (ly:gulp-file file-name))))
+
+(define (setup paper)
+  (string-append
+   "\n"
+   "%%BeginSetup\n"
+   (define-fonts paper)
    (output-variables paper)
-   (ly:gulp-file "music-drawing-routines.ps")
-   (ly:gulp-file "lilyponddefs.ps")
-   (load-fonts paper)
-   (define-fonts paper)))
+   "init-lilypond-parameters\n"
+   "%%EndSetup\n"))
+
+(define (write-preamble paper load-fonts? port)
+  (define (load-fonts paper)
+    (let* ((fonts (ly:paper-fonts paper))
+	   (all-font-names
+	    (map
+	     (lambda (font)
+	       (if (string? (ly:font-file-name font))
+		   (list (ly:font-file-name font))
+		   (ly:font-sub-fonts font)))
+
+	     fonts))
+	   (font-names
+	    (uniq-list
+	     (sort (apply append all-font-names) string<?)))
+	   (pfas (map
+		  (lambda (x)
+		    (let* ((bare-file-name (ly:find-file x))
+			   (cffname (string-append x ".cff"))
+			   (aname (string-append x ".pfa"))
+			   (bname (string-append x ".pfb"))
+			   (cff-file-name (ly:find-file cffname))
+			   (a-file-name (ly:kpathsea-find-file aname))
+			   (b-file-name (ly:kpathsea-find-file bname)))
+		      (cond
+		       (bare-file-name (if (string-match "\\.pfb" bare-file-name)
+					   (ly:pfb->pfa bare-file-name)
+					   (ly:gulp-file bare-file-name)))
+		       (cff-file-name (ps-embed-cff (ly:gulp-file cff-file-name) x 0))
+		       (a-file-name (ps-embed-pfa (ly:gulp-file a-file-name) x 0))
+		       (b-file-name (ps-embed-pfa (ly:pfb->pfa b-file-name) x 0))
+		       (else
+			(ly:warn "cannot find CFF/PFA/PFB font ~S" x)
+			""))))
+		  (filter string? font-names))))
+	   pfas))
+      
+
+  (display (procset "music-drawing-routines.ps") port)
+  (display (procset "lilyponddefs.ps") port)
+  (if load-fonts?
+      (for-each (lambda (f) (display f port)) (load-fonts paper)))
+  (display (setup paper) port))
 
-(define-public (output-framework outputter book scopes fields basename)
-  (let* ((paper (ly:paper-book-paper book))
+(define-public (output-framework basename book scopes fields)
+  (let* ((filename (format "~a.ps" basename))
+	 (outputter  (ly:make-paper-outputter filename "ps"))
+	 (paper (ly:paper-book-paper book))
 	 (pages (ly:paper-book-pages book))
 	 (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
 	 (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
-	 (page-count (length pages)))
-    
-  (for-each
-   (lambda (x)
-     (ly:outputter-dump-string outputter x))
-   (cons
-    (page-header paper page-count)
-    (preamble paper)))
-  
-  (for-each
-   (lambda (page)
-     (set! page-number (1+ page-number))
-     (dump-page outputter page page-number page-count landscape?))
-   pages)
-  
-  (ly:outputter-dump-string outputter "%%Trailer\n%%EOF\n")))
-
-(define-public (output-preview-framework outputter book scopes fields basename)
-  (let* ((paper (ly:paper-book-paper book))
+	 (page-count (length pages))
+	 (port (ly:outputter-port outputter)))
+
+
+    (display (page-header paper page-count #t) port)
+    (write-preamble paper #t  port)
+
+    (for-each
+     (lambda (page)
+       (set! page-number (1+ page-number))
+       (dump-page outputter page page-number page-count landscape?))
+     pages)
+
+    (display "%%Trailer\n%%EOF\n" port)
+    (ly:outputter-close outputter)
+    (postprocess-output book framework-ps-module filename (ly:output-formats))
+))
+
+(if (not (defined? 'nan?))
+    (define (nan? x) #f))
+(if (not (defined? 'inf?))
+    (define (inf? x) #f))
+
+
+(define-public (dump-stencil-as-EPS paper dump-me filename load-fonts?)
+  (let*
+      ((outputter (ly:make-paper-outputter (format "~a.eps" filename)
+					   "ps"))
+       
+       (port (ly:outputter-port outputter))
+       (xext (ly:stencil-extent dump-me X))
+       (yext (ly:stencil-extent dump-me Y))
+       (scale  (ly:output-def-lookup paper 'outputscale))
+       (bbox
+	(map
+	 (lambda (x)
+	   (if (or (nan? x) (inf? x))
+	       0.0 x))
+	 (list (car xext) (car yext)
+	       (cdr xext) (cdr yext))))
+       (rounded-bbox
+	(map
+	 (lambda (x)
+	   (inexact->exact
+	    (round (* x scale mm-to-bigpoint)))) bbox))
+       (port (ly:outputter-port outputter))
+       (header (eps-header paper rounded-bbox load-fonts?)))
+
+    (display header port)
+    (write-preamble paper load-fonts? port)
+    (display "start-system { set-ps-scale-to-lily-scale \n" port)
+    (ly:outputter-dump-stencil outputter dump-me)
+    (display "} stop-system\n%%Trailer\n%%EOF\n" port)
+    (ly:outputter-close outputter)
+    ))
+
+
+(define-public (output-preview-framework basename book scopes fields )
+  (let* ((outputter  (ly:make-paper-outputter filename
+					      "ps"))
+	 (paper (ly:paper-book-paper book))
 	 (systems (ly:paper-book-systems book))
 	 (scale  (ly:output-def-lookup paper 'outputscale ))
 	 (titles (take-while ly:paper-system-title? systems))
 	 (non-title (find (lambda (x)
 			    (not (ly:paper-system-title? x))) systems))
 	 (dump-me
-	  (stack-stencils Y DOWN 0.0 
+	  (stack-stencils Y DOWN 0.0
 			  (map ly:paper-system-stencil
-			       (append titles (list non-title)))))
-	 (xext (ly:stencil-extent dump-me X))
-	 (yext (ly:stencil-extent dump-me Y)))
-    
-  (for-each
-   (lambda (x)
-     (ly:outputter-dump-string outputter x))
-   (cons
-    (eps-header paper
-		(map
-		 (lambda (x)
-		   (inexact->exact
-		    (round (* x scale mm-to-bigpoint))))
-		 (list (car xext) (car yext)
-		       (cdr xext) (cdr yext))))
-    (preamble paper)))
+			       (append titles (list non-title))))))
+    (dump-stencil-as-EPS paper dump-me basename #t)))
 
 
-  (ly:outputter-dump-string outputter
-			    (string-append "start-system { "
-					   "set-ps-scale-to-lily-scale "
-					   "\n"))
 
-  (ly:outputter-dump-stencil outputter dump-me)
-  (ly:outputter-dump-string outputter "} stop-system\n%%Trailer\n%%EOF\n")))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -284,7 +325,7 @@
 	(ly:warn "Can't convert <stdout> to PDF")
 	(postscript->pdf (if (string? papersizename) papersizename "a4")
 			 name))))
-  
+
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
 	 (resolution (ly:output-def-lookup defs 'pngresolution)))