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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index fb1c4efd50..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,6 +16,7 @@
 	     (srfi srfi-13)
 	     (lily))
 
+
 (define framework-ps-module (current-module))
 
 ;;(define pdebug stderr)
@@ -145,7 +146,9 @@
 
 (define (eps-header paper bbox load-fonts?)
   (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
-		 "%%Creator: LilyPond\n"
+		 "%%Creator: LilyPond "
+		 (lilypond-version)
+		 "\n"
 		 "%%BoundingBox: "
 		 (string-join (map ly:number->string bbox) " ") "\n"
 		 "%%Orientation: "
@@ -157,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: "
@@ -187,7 +193,10 @@
    "%%EndSetup\n"))
 
 (define-public (munge-lily-font-name name)
-  (regexp-substitute/global #f "([eE]mmentaler|[aA]ybabtu)"
+  ;; 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)
@@ -234,7 +243,7 @@
       (format
        (if (string? name)
 	   "(~a) (r) file .loadfont\n"
-	   "% fontfile ~a could not be found\n")
+	   "% can't find font file: ~a\n")
        name))
 
     (let* ((font (car font-name-filename))
@@ -245,17 +254,16 @@
       (cons
        (munge-lily-font-name name)
        (cond
-	((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+	((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 (_ "don't know how to embed ~S=~S") name file-name)
+	 (ly:warning (_ "can't embed ~S=~S") name file-name)
 	  "")))))
 
-  ;; ugh.  posix /windows/mingw? 
-  (define (path-join a b)
+  (define (dir-join a b)
     (if (equal? a "")
 	b
 	(string-append a "/" b)))
@@ -271,62 +279,63 @@
 	((dir-name  (tmpnam))
 	 (files '())
 	 (status 0)
-	 (embed ""))
+	 (embed #f))
 
 
-      (display (list filename name))
       (mkdir dir-name #o700)
 
-      (set! status (system
-		    (format "cd ~a && fondu -force ~a" dir-name filename)))
-
-      (if (!= status 0)
-	  (ly:error "Fondu failed."))
+      (set! status (ly:system
+		    (format "cd ~a && fondu -force '~a'" dir-name filename)))
       
       (set! files (dir-listing dir-name))
 
       (for-each
        (lambda (f)
-	 (if (string-match (string-append name "\\.") f)
+	 (if (and (not embed)
+		  (string-match (string-append name "\\.") f))
 	     (set! embed
-		   (font-file-as-ps-string name (path-join dir-name f))))
+		   (font-file-as-ps-string name (dir-join dir-name f))))
 	     
 	 (if (or (equal? "." f) 
 		 (equal? ".." f))
 	     #t
-	     (delete-file (path-join dir-name f))))
+	     (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" file-name))
+       ((and file-name (string-match "\\.pfa" downcase-file-name))
 	(cached-file-contents file-name))
-       ((and file-name (string-match "\\.pfb" file-name))
+       ((and file-name (string-match "\\.pfb" downcase-file-name))
 	(ly:pfb->pfa file-name))
-       ((and file-name (string-match "\\.ttf" file-name))
+       ((and file-name (string-match "\\.ttf" downcase-file-name))
 	(ly:ttf->pfa file-name))
-       ((and file-name (string-match "\\.otf" file-name))
+       ((and file-name (string-match "\\.otf" downcase-file-name))
 	(ps-embed-cff (ly:otf->cff file-name) name 0))
-       ((and file-name (string-match "\\.ttf" file-name))
-	(ly:ttf->pfa file-name))
        (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))
-	   )
-
+	   (bare-file-name (ly:find-file file-name)))
+      
       (cons
        (munge-lily-font-name name)
        (cond
-	((string-match "([eE]mmentaler|[Aa]ybabtu)" file-name)
+	((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
 	 (cached-file-contents
 	  (format "~a.pfa" (munge-lily-font-name file-name))))
 	((and
@@ -377,9 +386,13 @@
 	    (uniq-list
 	     (sort (apply append all-font-names)
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
-	   ;; ttftool/fopencookie is broken on Windows,
-	   ;; possibly a stack corruption bug.
-	   (pfas (map load-font font-names)))
+
+
+	   (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?
@@ -399,7 +412,12 @@
 
 (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))
@@ -420,7 +438,7 @@
     (display "%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)
     (postprocess-output book framework-ps-module filename
-			 (completize-formats (ly:output-formats)))))
+			 (ly:output-formats))))
 
 (if (not (defined? 'nan?))
     (define (nan? x) #f))
@@ -440,7 +458,12 @@
 	  (max (1+ (car box)) (caddr box))
 	  (max (1+ (cadr box)) (cadddr box)))))
 
-  (let* ((outputter (ly:make-paper-outputter (format "~a.eps" filename) "ps"))
+  (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))
@@ -472,46 +495,43 @@
 
     ;; skip booktitles.
     (if (and
-	 (not
-	  (cdr (assoc
-	       'preview-include-book-title
-	       (ly:get-option 'command-line-settings))))
-	 (< 1 (length systems))
-	 (ly:paper-system-title? (list-ref systems 0))
-	 (ly:paper-system-title? (list-ref systems 1)))
+	 (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
-	    (ly:paper-system-title? sys)
+	    (paper-system-title? sys)
 	    (not (pair? to-dump-systems))
-	    (ly:paper-system-title? (car 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 ly:paper-system-stencil (reverse to-dump-systems)))
+		     (map paper-system-stencil (reverse to-dump-systems)))
      (format "~a.preview" basename)
      #t)
 
     (postprocess-output book framework-ps-module
 			(format "~a.preview.eps" basename)
-			(completize-formats (cons "png" (ly:output-formats))))))
+			(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 ly:paper-system-title? systems))
+	     (titles (take-while paper-system-title? systems))
 	     (non-title (find (lambda (x)
-				(not (ly:paper-system-title? x))) systems))
+				(not (paper-system-title? x))) systems))
 	     (dump-me
 	      (stack-stencils Y DOWN 0.0
-			      (map ly:paper-system-stencil
+			      (map paper-system-stencil
 				   (append titles (list non-title))))))
 	(output-scopes scopes fields basename)
 	(dump-stencil-as-EPS paper dump-me
@@ -520,7 +540,7 @@
 
 	(postprocess-output book framework-ps-module
 			    (format "~a.preview.eps" basename)
-			    (completize-formats (ly:output-formats))))))
+			     (ly:output-formats)))))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (convert-to-pdf book name)
@@ -537,8 +557,7 @@
 	 (defs-resolution (ly:output-def-lookup defs 'pngresolution))
 	 (resolution (if (number? defs-resolution)
 			 defs-resolution
-			 (cdr (assoc 'resolution
-				(ly:get-option 'command-line-settings)))))
+			 (ly:get-option 'resolution)))
 	 (papersizename (ly:output-def-lookup defs 'papersizename)))
 
     (postscript->png resolution
@@ -553,3 +572,13 @@
 
 (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.
+")))