X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=e39b245233bdb9b82d9a393fc72b7cba5f876067;hb=69d06539ea9a4a30269ca94547a79c47cf21cc30;hp=d3a0891ff2708d7c4f064fa152f2f96bd4d8c839;hpb=b92389ba1303ec1492c26a4266ceb8f9f78b6114;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index d3a0891ff2..e39b245233 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -12,6 +12,8 @@
 	     (ice-9 string-fun)
 	     (ice-9 format)
 	     (guile)
+	     (scm page)
+	     (scm paper-system)
 	     (srfi srfi-1)
 	     (srfi srfi-13)
 	     (lily))
@@ -22,11 +24,8 @@
 ;;(define pdebug stderr)
 (define (pdebug . rest) #f)
 
-(define mm-to-bigpoint
-  (/ 72 25.4))
-
 (define-public (ps-font-command font)
-  (let* ((name (munge-lily-font-name (ly:font-file-name font)))
+  (let* ((name (ly:font-file-name font))
 	 (magnify (ly:font-magnification font)))
 
     (string-append
@@ -43,8 +42,7 @@
   (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"))
+      "/" command " { /" fontname " " (ly:number->string scaling) " output-scale div selectfont } bind def\n"))
 
   (define (standard-tex-font? x)
     (or (equal? (substring x 0 2) "ms")
@@ -53,7 +51,7 @@
   (define (font-load-command font)
     (let* ((specced-font-name (ly:font-name font))
 	   (fontname (if specced-font-name
-			 (munge-lily-font-name specced-font-name)
+			  specced-font-name
 			 (ly:font-file-name font)))
 	   (command (ps-font-command font))
 
@@ -61,7 +59,7 @@
 	   (plain (ps-font-command font))
 	   (designsize (ly:font-design-size font))
 	   (magnification (* (ly:font-magnification font)))
-	   (ops (ly:output-def-lookup paper 'outputscale))
+	   (ops (ly:output-def-lookup paper 'output-scale))
 	   (scaling (* ops magnification designsize)))
 
       ;; Bluesky pfbs have UPCASE names (sigh.)
@@ -95,42 +93,41 @@
 
   (string-append
    "/lily-output-units "
-     (number->string mm-to-bigpoint)
+     (number->string (/ (ly:bp 1)))
      " def %% millimeter\n"
-   (output-entry "staff-line-thickness" 'linethickness)
-   (output-entry "line-width" 'linewidth)
+   (output-entry "staff-line-thickness" 'line-thickness)
+   (output-entry "line-width" 'line-width)
    (output-entry "paper-size" 'papersizename)
-   (output-entry "staff-height" 'staffheight)	;junkme.
+   (output-entry "staff-height" 'staff-height)	;junkme.
    "/output-scale "
-     (number->string (ly:output-def-lookup layout 'outputscale))
+     (number->string (ly:output-def-lookup layout 'output-scale))
      " def\n"
-   (output-entry "page-height" 'vsize)
-   (output-entry "page-width" 'hsize)))
+   (output-entry "page-height" 'paper-height)
+   (output-entry "page-width" 'paper-width)))
 
 (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"
-
+    (format "%%Page: ~a ~a\n" page-number page-number)
     "%%BeginPageSetup\n"
     (if landscape?
 	"page-width output-scale lily-output-units mul mul 0 translate 90 rotate\n"
 	"")
     "%%EndPageSetup\n"
-
-    "start-page { "
+    
+    "true setstrokeadjust\n"
+    "gsave 0 paper-height translate "
     "set-ps-scale-to-lily-scale "
     "\n"))
   (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
+  (ly:outputter-dump-string outputter "stroke grestore \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 (munge-lily-font-name (ly:font-name font)))))
+	(list  (ly:font-name font))))
 
   (let* ((fonts (ly:paper-fonts paper))
 	 (names (apply append (map extract-names fonts))))
@@ -158,7 +155,26 @@
 		 (supplies-or-needs paper load-fonts?)
 		 "%%EndComments\n"))
 
-(define (page-header paper page-count load-fonts?)
+(define (ps-document-media paper) 
+ (let* ((w (/ (*
+	       (ly:output-def-lookup paper 'output-scale)
+	       (ly:output-def-lookup paper 'paper-width)) (ly:bp 1)))
+	(h (/ (*
+	       (ly:output-def-lookup paper 'paper-height)
+	       (ly:output-def-lookup paper 'output-scale))
+	    (ly:bp 1)))
+	(landscape? (eq? (ly:output-def-lookup paper 'landscape) #t)))
+  (format "%%DocumentMedia: ~a ~$ ~$ ~a ~a ~a\n"
+   (ly:output-def-lookup paper 'papersizename)
+   (if landscape? h w)
+   (if landscape? w h)
+   80  ;; weight
+   "()" ;; color
+   "()"  ;; type
+  )))
+
+
+(define (file-header paper page-count load-fonts?)
   (string-append "%!PS-Adobe-3.0\n"
 		 "%%Creator: LilyPond "
 		 (lilypond-version)
@@ -170,34 +186,31 @@
 		 (if (eq? (ly:output-def-lookup paper 'landscape) #t)
 		     "Landscape\n"
 		     "Portrait\n")
-		 "%%DocumentPaperSizes: "
-		 (ly:output-def-lookup paper 'papersizename) "\n"
+		 (ps-document-media paper)
 		 (supplies-or-needs paper load-fonts?)
 		 "%%EndComments\n"))
 
 (define (procset file-name)
-  (string-append
-   (format
+  (format
     "%%BeginResource: procset (~a) 1 0
 ~a
 %%EndResource
 "
-    file-name (cached-file-contents file-name))))
+    file-name (cached-file-contents file-name)))
+
+(define (embed-document file-name)
+  (format "%%BeginDocument: ~a
+~a
+%%EndDocument
+" 
+    file-name (cached-file-contents file-name)))
 
-(define (setup paper)
+(define (setup-variables paper)
   (string-append
    "\n"
-   "%%BeginSetup\n"
    (define-fonts paper)
    (output-variables paper)
-   "%%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*
@@ -227,7 +240,6 @@
 	   (string-length binary-data)))
 	 (footer "\n%%EndData
 %%EndResource
-%%EOF
 %%EndResource\n"))
 
     (string-append
@@ -252,16 +264,21 @@
 	   (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)
-	  "")))))
+       name
+       
+       (if (mac-font? bare-file-name)
+	   (handle-mac-font name bare-file-name)
+	   (cond
+	    ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+	     (ps-load-file (ly:find-file
+			    (format "~a.otf"  file-name))))
+	    ((string? bare-file-name)
+	     (ps-load-file file-name))
+	    (else
+	     (ly:warning (_ "can't embed ~S=~S") name file-name)
+	     "")))
+
+	  )))
 
   (define (dir-join a b)
     (if (equal? a "")
@@ -320,7 +337,7 @@
 	
       (cond
        ((and file-name (string-match "\\.pfa" downcase-file-name))
-	(cached-file-contents file-name))
+	(embed-document 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))
@@ -330,7 +347,15 @@
        (else
 	(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
 	""))))
-      
+
+    (define (mac-font? bare-file-name)
+      (and
+       (eq? PLATFORM 'darwin)
+       bare-file-name
+       (or
+	(string-match "\\.dfont" bare-file-name)
+	(= (stat:size (stat bare-file-name)) 0))))
+
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
 	   (name (cadr font-name-filename))
@@ -338,19 +363,10 @@
 	   (bare-file-name (ly:find-file file-name)))
       
       (cons
-       (munge-lily-font-name 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))
+
+	((mac-font? bare-file-name)
 	 (handle-mac-font name bare-file-name))
 
 	((and font (cff-font? font))
@@ -400,6 +416,7 @@
 	   (pfas (map font-loader font-names)))
       pfas))
 
+  (display "%%BeginProlog\n" port)
   (if load-fonts?
       (for-each
        (lambda (f)
@@ -408,12 +425,18 @@
 	 (display "\n%%EndFont\n" port))
        (load-fonts paper)))
 
-  (display (setup paper) port)
+  (display (setup-variables paper) port)
 
   ;; adobe note 5002: should initialize variables before loading routines.
   (display (procset "music-drawing-routines.ps") port)
   (display (procset "lilyponddefs.ps") port)
-  (display "init-lilypond-parameters\n" port))
+
+  (if (not (ly:get-option 'point-and-click))
+      (display "/mark_URI { pop pop pop pop pop } bind def\n" port)) 
+
+  (display "%%EndProlog\n" port)
+  
+  (display "%%BeginSetup\ninit-lilypond-parameters\n%%EndSetup\n\n" port))
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.ps" basename))
@@ -424,44 +447,53 @@
 		     (open-file filename "wb")
 		     "ps"))
 	 (paper (ly:paper-book-paper book))
-	 (pages (ly:paper-book-pages book))
+	 (systems (ly:paper-book-systems book))
+	 (page-stencils (map page-stencil (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))
+	 (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
+	 (page-count (length page-stencils))
 	 (port (ly:outputter-port outputter)))
 
+    (if (ly:get-option 'dump-signatures)
+	(write-system-signatures basename (ly:paper-book-systems book) 1))
+  
     (output-scopes scopes fields basename)
-    (display (page-header paper page-count #t) port)
+    (display (file-header paper page-count #t) port)
+
+    
+    ;; don't do BeginDefaults PageMedia: A4 
+    ;; not necessary and wrong
+    
+
     (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)
+     page-stencils)
 
     (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?)
-  (define (mm-to-bp-box mmbox)
-    (let* ((scale (ly:output-def-lookup paper 'outputscale))
+  (define (to-bp-box mmbox)
+    (let* ((scale (ly:output-def-lookup paper 'output-scale))
 	   (box (map
 		 (lambda (x)
-		   (inexact->exact
-		    (round (* x scale mm-to-bigpoint)))) mmbox)))
-
-    (list (car box) (cadr box)
+		   (if (or (nan? x) (inf? x))
+		       0
+		       (inexact->exact
+			(round (/ (* x scale) (ly:bp 1)))))) mmbox)))
+      
+    (list (car box)
+	  (cadr box)
 	  (max (1+ (car box)) (caddr box))
-	  (max (1+ (cadr box)) (cadddr box)))))
+	  (max (1+ (cadr box)) (cadddr box))
+	  )))
 
   (let* ((outputter (ly:make-paper-outputter
 		     ;; FIXME: better wrap open/open-file,
@@ -469,6 +501,8 @@
 		     ;; MINGW hack: need to have "b"inary for embedding CFFs
 		     (open-file (format "~a.eps" filename) "wb")
 		     "ps"))
+
+	 (left-overshoot -3)
 	 (port (ly:outputter-port outputter))
 	 (xext (ly:stencil-extent dump-me X))
 	 (yext (ly:stencil-extent dump-me Y))
@@ -480,31 +514,34 @@
 		     (equal? (format #f "~S" x) "+#.#")
 		     (equal? (format #f "~S" x) "-#.#"))
 		 0.0 x))
-	   ;; set left of X to 0, to prevent barnumbers
-	   ;; from sticking out of margin.
-	   (list 0.0 (car yext) (cdr xext) (cdr yext))))
-	 (rounded-bbox (mm-to-bp-box bbox))
+
+	   ;; the left-overshoot is to make sure that
+	   ;; bar numbers  stick out of margin uniformly.
+	   ;;
+	   (list (min left-overshoot (car xext))
+		 (car yext) (cdr xext) (cdr yext))))
+	 (rounded-bbox (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)
+    (display "gsave set-ps-scale-to-lily-scale \n" port)
     (ly:outputter-dump-stencil outputter dump-me)
-    (display "} stop-system\n%%Trailer\n%%EOF\n" port)
+    (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)))
 
 (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))
+	 (scale (ly:output-def-lookup paper 'output-scale))
 	 (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))
+	 (ly:prob-property (car systems) 'is-book-title #f))
 
 	(set! systems (cdr systems)))
 
@@ -527,12 +564,13 @@
     (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))
+	     (scale (ly:output-def-lookup paper 'output-scale))
 	     (titles (take-while paper-system-title? systems))
 	     (non-title (find (lambda (x)
 				(not (paper-system-title? x))) systems))
@@ -552,11 +590,14 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
+	 (paper-width (ly:output-def-lookup defs 'paper-width))
+	 (paper-height (ly:output-def-lookup defs 'paper-height))
+	 (output-scale (ly:output-def-lookup defs 'output-scale)))
 
     (if (equal? (basename name ".ps") "-")
 	(ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-	(postscript->pdf (if (string? papersizename) papersizename "a4")
+	(postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
+			 (* paper-height output-scale (/ (ly:bp 1)))
 			 name))))
 
 (define-public (convert-to-png book name)
@@ -565,10 +606,13 @@
 	 (resolution (if (number? defs-resolution)
 			 defs-resolution
 			 (ly:get-option 'resolution)))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
+	 (paper-width (ly:output-def-lookup defs 'paper-width))
+	 (paper-height (ly:output-def-lookup defs 'paper-height))
+	 (output-scale (ly:output-def-lookup defs 'output-scale)))
 
     (postscript->png resolution
-		     (if (string? papersizename) papersizename "a4")
+		     (* paper-width output-scale (/ (ly:bp 1)))
+		     (* paper-height output-scale (/ (ly:bp 1)))
 		     name)))
 
 (define-public (convert-to-dvi book name)