X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=8cb006d70ae48952f60003be88fedd092647519d;hb=54feef141b22b56abf5e4a47c05bf8bbf99d4930;hp=c5e973c17cafe6b958a76c03901ffd7a83192301;hpb=f1b620b50b3fa43949856ab4f901beabc87bcf0a;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index c5e973c17c..8cb006d70a 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -1,4 +1,4 @@
-;;;; framework-ps.scm --
+;;;; framework-ps.scm -- structure for PostScript output
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
@@ -16,11 +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)))
+(define framework-ps-module (current-module))
 
 ;;(define pdebug stderr)
 (define (pdebug . rest) #f)
@@ -28,12 +25,13 @@
 (define mm-to-bigpoint
   (/ 72 25.4))
 
-(define-public (ps-font-command font . override-coding)
-  (let* ((name (ly:font-file-name font))
+(define-public (ps-font-command font)
+  (let* ((name (munge-lily-font-name (ly:font-file-name font)))
 	 (magnify (ly:font-magnification font)))
 
     (string-append
-     "magfont" (string-encode-integer (hashq  name 1000000))
+     "magfont"
+     (string-regexp-substitute "[ /%]" "_" name)
      "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
 
 (define (tex-font? fontname)
@@ -41,15 +39,6 @@
    (equal? (substring fontname 0 2) "cm")
    (equal? (substring fontname 0 2) "ec")))
 
-(define (ps-embed-pfa body font-name version)
-  (string-append
-   (format
-    "%%BeginResource: font ~a
-~a
-%%EndResource\n"
-    font-name body)))
-
-
 (define (define-fonts paper)
   (define font-list (ly:paper-fonts paper))
   (define (define-font command fontname scaling)
@@ -64,12 +53,12 @@
   (define (font-load-command font)
     (let* ((specced-font-name (ly:font-name font))
 	   (fontname (if specced-font-name
-			 specced-font-name
+			 (munge-lily-font-name specced-font-name)
 			 (ly:font-file-name font)))
 	   (command (ps-font-command font))
 
 	   ;; FIXME -- see (ps-font-command )
-	   (plain (ps-font-command font #f))
+	   (plain (ps-font-command font))
 	   (designsize (ly:font-design-size font))
 	   (magnification (* (ly:font-magnification font)))
 	   (ops (ly:output-def-lookup paper 'outputscale))
@@ -83,7 +72,6 @@
 	  (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)))
@@ -93,7 +81,7 @@
 ;; FIXME: silly interface name
 (define (output-variables layout)
   ;; FIXME: duplicates output-layout's scope-entry->string, mostly
-  (define (value->string  val)
+  (define (value->string val)
     (cond
      ((string? val) (string-append "(" val ")"))
      ((symbol? val) (symbol->string val))
@@ -120,36 +108,33 @@
    (output-entry "page-width" 'hsize)))
 
 (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
- lily-output-units mul
- mul 0 translate 90 rotate\n"
-				 "")
-			     "%%EndPageSetup\n"
-
-			     "start-page { "
-			     "set-ps-scale-to-lily-scale "
-			     "\n"))
+  (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 lily-output-units mul 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 (supplies-or-needs paper load-fonts?)
   (define (extract-names font)
     (if (ly:pango-font? font)
 	(map car (ly:pango-font-physical-fonts font))
-	(list (ly:font-name font))))
-  
+	(list (munge-lily-font-name (ly:font-name font)))))
+
   (let* ((fonts (ly:paper-fonts paper))
-	 (names (apply append (map extract-names fonts)))
-	 )
-    
+	 (names (apply append (map extract-names fonts))))
+
     (apply string-append
 	   (map (lambda (f)
 		  (format
@@ -160,8 +145,10 @@
 		(uniq-list (sort names string<?))))))
 
 (define (eps-header paper bbox load-fonts?)
-    (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
-		 "%%Creator: LilyPond\n"
+  (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
+		 "%%Creator: LilyPond "
+		 (lilypond-version)
+		 "\n"
 		 "%%BoundingBox: "
 		 (string-join (map ly:number->string bbox) " ") "\n"
 		 "%%Orientation: "
@@ -173,7 +160,10 @@
 
 (define (page-header paper page-count load-fonts?)
   (string-append "%!PS-Adobe-3.0\n"
-		 "%%Creator: LilyPond\n"
+		 "%%Creator: LilyPond "
+		 (lilypond-version)
+		 "\n"
+		 
 		 "%%Pages: " (number->string page-count) "\n"
 		 "%%PageOrder: Ascend\n"
 		 "%%Orientation: "
@@ -200,60 +190,234 @@
    "%%BeginSetup\n"
    (define-fonts paper)
    (output-variables paper)
-   "init-lilypond-parameters\n"
    "%%EndSetup\n"))
 
+(define-public (munge-lily-font-name name)
+  ;; FIXME: this fixes PFAPAFemmentaler.pfapfa, and also
+  ;; PFAaybabtu.otf.pfa, but the second case now produces aybabtu.otf,
+  ;; which still fails because .otf files cannot be embedded.
+  (regexp-substitute/global #f "^([eE]mmentaler|[aA]ybabtu)"
+			    name 'pre "PFA" 1 'post))
+
+(define (cff-font? font)
+  (let*
+      ((cff-string (ly:otf-font-table-data font "CFF ")))
+    (> (string-length cff-string) 0)))
+
+(define-public (ps-embed-cff body font-set-name version)
+  (let* ((binary-data
+	  (string-append
+	   (format "/~a ~s StartData " font-set-name (string-length body))
+	   body))
+
+	 (header
+	  (format
+	   "%%BeginResource: font ~a
+%!PS-Adobe-3.0 Resource-FontSet
+%%DocumentNeededResources: ProcSet (FontSetInit)
+%%Title: (FontSet/~a)
+%%Version: ~s
+%%EndComments
+%%IncludeResource: ProcSet (FontSetInit)
+%%BeginResource: FontSet (~a)
+/FontSetInit /ProcSet findresource begin
+%%BeginData: ~s Binary Bytes
+"
+	   font-set-name font-set-name version font-set-name
+	   (string-length binary-data)))
+	 (footer "\n%%EndData
+%%EndResource
+%%EOF
+%%EndResource\n"))
+
+    (string-append
+     header
+     binary-data
+     footer)))
+
+
 (define (write-preamble paper load-fonts? port)
+
+  (define (load-font-via-GS font-name-filename)
+    (define (ps-load-file name)
+      (format
+       (if (string? name)
+	   "(~a) (r) file .loadfont\n"
+	   "% can't find font file: ~a\n")
+       name))
+
+    (let* ((font (car font-name-filename))
+	   (name (cadr font-name-filename))
+	   (file-name (caddr font-name-filename))
+	   (bare-file-name (ly:find-file file-name)))
+
+      (cons
+       (munge-lily-font-name name)
+       (cond
+	((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+	 (ps-load-file (ly:find-file
+			(format "~a.pfa" (munge-lily-font-name file-name)))))
+	((string? bare-file-name)
+	 (ps-load-file (munge-lily-font-name file-name)))
+	(else
+	 (ly:warning (_ "can't embed ~S=~S") name file-name)
+	  "")))))
+
+  (define (dir-join a b)
+    (if (equal? a "")
+	b
+	(string-append a "/" b)))
+    
+  (define (dir-listing dir-name)
+    (define (dir-helper dir lst)
+      (let ((e (readdir dir)))
+	(if (eof-object? e) lst (dir-helper dir (cons e lst)))))
+    (reverse (dir-helper (opendir dir-name) '())))
+      
+  (define (handle-mac-font name filename)
+    (let*
+	((dir-name  (tmpnam))
+	 (files '())
+	 (status 0)
+	 (embed #f))
+
+
+      (mkdir dir-name #o700)
+
+      (set! status (ly:system
+		    (format "cd ~a && fondu -force '~a'" dir-name filename)))
+      
+      (set! files (dir-listing dir-name))
+
+      (for-each
+       (lambda (f)
+	 (if (and (not embed)
+		  (string-match (string-append name "\\.") f))
+	     (set! embed
+		   (font-file-as-ps-string name (dir-join dir-name f))))
+	     
+	 (if (or (equal? "." f) 
+		 (equal? ".." f))
+	     #t
+	     (delete-file (dir-join dir-name f))))
+       files)
+      (rmdir dir-name)
+
+      (if (not embed)
+	  (begin
+	    (set! embed "% failed \n")
+	    (ly:warning (_ "can't extract file matching ~a from ~a") name filename)))
+      embed))
+
+    (define (font-file-as-ps-string name file-name)
+      (let*
+	  ((downcase-file-name (string-downcase file-name)))
+	
+      (cond
+       ((and file-name (string-match "\\.pfa" downcase-file-name))
+	(cached-file-contents file-name))
+       ((and file-name (string-match "\\.pfb" downcase-file-name))
+	(ly:pfb->pfa file-name))
+       ((and file-name (string-match "\\.ttf" downcase-file-name))
+	(ly:ttf->pfa file-name))
+       ((and file-name (string-match "\\.otf" downcase-file-name))
+	(ps-embed-cff (ly:otf->cff file-name) name 0))
+       (else
+	(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+	""))))
+      
+  (define (load-font font-name-filename)
+    (let* ((font (car font-name-filename))
+	   (name (cadr font-name-filename))
+	   (file-name (caddr font-name-filename))
+	   (bare-file-name (ly:find-file file-name)))
+      
+      (cons
+       (munge-lily-font-name name)
+       (cond
+	((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+	 (cached-file-contents
+	  (format "~a.pfa" (munge-lily-font-name file-name))))
+	((and
+	  (eq? PLATFORM 'darwin)
+	  bare-file-name (string-match "\\.dfont" bare-file-name))
+	 (handle-mac-font name bare-file-name))
+	
+	((and
+	  (eq? PLATFORM 'darwin)
+	  bare-file-name (= (stat:size (stat bare-file-name)) 0))
+	 (handle-mac-font name bare-file-name))
+
+	((and font (cff-font? font))
+	 (ps-embed-cff (ly:otf-font-table-data font "CFF ")
+		       name
+		       0))
+
+	(bare-file-name (font-file-as-ps-string name bare-file-name))
+	(else
+	 (ly:warning (_ "don't know how to embed font ~s ~s ~s")
+		     name file-name font))))))
+	
+
   (define (load-fonts paper)
     (let* ((fonts (ly:paper-fonts paper))
 	   (all-font-names
 	    (map
 	     (lambda (font)
 	       (cond
-		((string? (ly:font-file-name font)) (list (ly:font-file-name font)))
+		((string? (ly:font-file-name font))
+		 (list (list
+			font
+			(ly:font-name font)
+			(ly:font-file-name font))))
 		((ly:pango-font? font)
-		 (map cdr  (ly:pango-font-physical-fonts font)))
-		(else (ly:font-sub-fonts font))))
-		   
+		 (map
+		  (lambda (name-psname-pair)
+		    (list #f
+			  (car name-psname-pair)
+			  (cdr name-psname-pair)))
+		  (ly:pango-font-physical-fonts font)))
+
+		(else
+		 (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.ps"))
-			   (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
-		       ((and bare-file-name (string-match "\\.pfb" bare-file-name))
-			(ly:pfb->pfa bare-file-name))
-		       ((and bare-file-name (string-match "\\.ttf" bare-file-name))
-			(ly:ttf->pfa bare-file-name))
-		       (bare-file-name (cached-file-contents bare-file-name))
-		       (cff-file-name  (cached-file-contents cff-file-name))
-		       (a-file-name (ps-embed-pfa (cached-file-contents 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))
+	     (sort (apply append all-font-names)
+		   (lambda (x y) (string<? (cadr x) (cadr y))))))
+
+
+	   (font-loader (if (ly:get-option 'gs-font-load)
+			    load-font-via-GS
+			    load-font))
+			 
+	   (pfas (map font-loader font-names)))
+      pfas))
+
+  (if load-fonts?
+      (for-each
+       (lambda (f)
+	 (format port "\n%%BeginFont: ~a\n" (car f))
+	 (display (cdr f) port)
+	 (display "\n%%EndFont\n" port))
+       (load-fonts paper)))
 
+  (display (setup paper) port)
+
+  ;; adobe note 5002: should initialize variables before loading routines.
   (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))
+  (display "init-lilypond-parameters\n" port))
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.ps" basename))
-	 (outputter  (ly:make-paper-outputter filename "ps"))
+	 (outputter (ly:make-paper-outputter
+		     ;; FIXME: better wrap open/open-file,
+		     ;; content-mangling is always bad.
+		     ;; MINGW hack: need to have "b"inary for embedding CFFs
+		     (open-file filename "wb")
+		     "ps"))
 	 (paper (ly:paper-book-paper book))
 	 (pages (ly:paper-book-pages book))
 	 (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
@@ -261,9 +425,9 @@
 	 (page-count (length pages))
 	 (port (ly:outputter-port outputter)))
 
-
+    (output-scopes scopes fields basename)
     (display (page-header paper page-count #t) port)
-    (write-preamble paper #t  port)
+    (write-preamble paper #t port)
 
     (for-each
      (lambda (page)
@@ -273,98 +437,148 @@
 
     (display "%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)
-    (postprocess-output book framework-ps-module filename (ly:output-formats))
-))
+    (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?)
   (define (mm-to-bp-box mmbox)
-    (let*
-	((scale  (ly:output-def-lookup paper 'outputscale))
-	 (box (map 
-	       (lambda (x)
-		 (inexact->exact
-		  (round (* x scale mm-to-bigpoint)))) mmbox)))
+    (let* ((scale (ly:output-def-lookup paper 'outputscale))
+	   (box (map
+		 (lambda (x)
+		   (inexact->exact
+		    (round (* x scale mm-to-bigpoint)))) mmbox)))
 
     (list (car box) (cadr box)
 	  (max (1+ (car box)) (caddr box))
 	  (max (1+ (cadr box)) (cadddr box)))))
-  
-  (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))
-       
-       (bbox
-	(map
-	 (lambda (x)
-	   (if (or (nan? x) (inf? x))
-	       0.0 x))
-	 (list (car xext) (car yext)
-	       (cdr xext) (cdr yext))))
-       (rounded-bbox (mm-to-bp-box bbox))
-       (port (ly:outputter-port outputter))
-       (header (eps-header paper rounded-bbox load-fonts?)))
+
+  (let* ((outputter (ly:make-paper-outputter
+		     ;; FIXME: better wrap open/open-file,
+		     ;; content-mangling is always bad.
+		     ;; MINGW hack: need to have "b"inary for embedding CFFs
+		     (open-file (format "~a.eps" filename) "wb")
+		     "ps"))
+	 (port (ly:outputter-port outputter))
+	 (xext (ly:stencil-extent dump-me X))
+	 (yext (ly:stencil-extent dump-me Y))
+	 (bbox
+	  (map
+	   (lambda (x)
+	     (if (or (nan? x) (inf? x)
+		     ;; FIXME: huh?
+		     (equal? (format #f "~S" x) "+#.#")
+		     (equal? (format #f "~S" x) "-#.#"))
+		 0.0 x))
+	   (list (car xext) (car yext) (cdr xext) (cdr yext))))
+	 (rounded-bbox (mm-to-bp-box 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)
-    ))
+    (ly:outputter-close outputter)))
 
-
-(define-public (output-preview-framework basename book scopes fields )
+(define-public (output-preview-framework basename book scopes fields)
   (let* ((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
-			  (map ly:paper-system-stencil
-			       (append titles (list non-title))))))
-    (dump-stencil-as-EPS paper dump-me
-			 (format "~a.preview" basename)
-			 #t)))
+	 (scale (ly:output-def-lookup paper 'outputscale))
+	 (to-dump-systems '()))
 
+    ;; skip booktitles.
+    (if (and
+	 (not (ly:get-option 'preview-include-book-title))
+	 (pair? systems)
+	 (ly:paper-system-property (car systems) 'is-book-title #f))
 
+	(set! systems (cdr systems)))
 
+    (for-each
+     (lambda (sys)
+       (if (or
+	    (paper-system-title? sys)
+	    (not (pair? to-dump-systems))
+	    (paper-system-title? (car to-dump-systems)))
+	   (set! to-dump-systems (cons sys to-dump-systems))))
+     systems)
+
+    (dump-stencil-as-EPS
+     paper
+     (stack-stencils Y DOWN 0.0
+		     (map paper-system-stencil (reverse to-dump-systems)))
+     (format "~a.preview" basename)
+     #t)
+
+    (postprocess-output book framework-ps-module
+			(format "~a.preview.eps" basename)
+			(cons "png" (ly:output-formats)))))
+(if #f
+    (define-public (output-preview-framework basename book scopes fields)
+
+      (let* ((paper (ly:paper-book-paper book))
+	     (systems (ly:paper-book-systems book))
+	     (scale (ly:output-def-lookup paper 'outputscale))
+	     (titles (take-while paper-system-title? systems))
+	     (non-title (find (lambda (x)
+				(not (paper-system-title? x))) systems))
+	     (dump-me
+	      (stack-stencils Y DOWN 0.0
+			      (map paper-system-stencil
+				   (append titles (list non-title))))))
+	(output-scopes scopes fields basename)
+	(dump-stencil-as-EPS paper dump-me
+			     (format "~a.preview" basename)
+			     #t)
+
+	(postprocess-output book framework-ps-module
+			    (format "~a.preview.eps" basename)
+			     (ly:output-formats)))))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
 	 (papersizename (ly:output-def-lookup defs 'papersizename)))
 
-    (if (equal? name "-")
-	(ly:warn "Can't convert <stdout> to PDF")
+    (if (equal? (basename name ".ps") "-")
+	(ly:warning (_ "can't convert <stdout> to ~S" "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)))
-
-    (postscript->png (if (number? resolution) resolution
+	 (defs-resolution (ly:output-def-lookup defs 'pngresolution))
+	 (resolution (if (number? defs-resolution)
+			 defs-resolution
+			 (ly:get-option 'resolution)))
+	 (papersizename (ly:output-def-lookup defs 'papersizename)))
 
-			 (ly:get-option 'resolution))
+    (postscript->png resolution
+		     (if (string? papersizename) papersizename "a4")
 		     name)))
 
 (define-public (convert-to-dvi book name)
-  (ly:warn "Can not generate DVI via the postscript back-end"))
+  (ly:warning (_ "can't generate ~S using the postscript back-end") "DVI"))
 
 (define-public (convert-to-tex book name)
-  (ly:warn "Can not generate TeX via the postscript back-end"))
+  (ly:warning (_ "can't generate ~S using the postscript back-end") "TeX"))
 
 (define-public (convert-to-ps book name)
   #t)
+
+(define-public (output-classic-framework basename book scopes fields)
+
+  (ly:error (_ "\nThe PostScript backend does not support the 'classic'
+framework. Use the EPS backend instead,
+
+  lilypond -b eps <file>
+
+or remove the lilypond-book specific settings from the input.
+")))