X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=a5fd02fb1c21136449ea8aaa480b7c00cf84c479;hb=9cf485743fe1f5f6e2de3d2c5e070b67055edeb7;hp=213d995c2c463a3eb7dd3897190ba192643693ca;hpb=c99eab889ab542b4a6e265ec207dba65342e39da;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 213d995c2c..a5fd02fb1c 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -164,13 +164,13 @@
 	       (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 ~a ~a\n"
-   (ly:output-def-lookup paper 'papersizename)
-   (round2 (if landscape? h w))
-   (round2 (if landscape? w h))
-   80  ;; weight
-   "()" ;; color
-   "()"  ;; type
+  (ly:format "%%DocumentMedia: ~a ~2f ~2f ~a ~a ~a\n"
+	     (ly:output-def-lookup paper 'papersizename)
+	     (if landscape? h w)
+	     (if landscape? w h)
+	     80  ;; weight
+	     "()" ;; color
+	     "()"  ;; type
   )))
 
 
@@ -433,9 +433,6 @@
   (display (procset "music-drawing-routines.ps") port)
   (display (procset "lilyponddefs.ps") 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))
@@ -447,7 +444,7 @@
 		     ;; content-mangling is always bad.
 		     ;; MINGW hack: need to have "b"inary for embedding CFFs
 		     (open-file filename "wb")
-		     "ps"))
+		     'ps))
 	 (paper (ly:paper-book-paper book))
 	 (systems (ly:paper-book-systems book))
 	 (page-stencils (map page-stencil (ly:paper-book-pages book)))
@@ -539,7 +536,7 @@
 		     ;; content-mangling is always bad.
 		     ;; MINGW hack: need to have "b"inary for embedding CFFs
 		     (open-file (format "~a.eps" filename) "wb")
-		     "ps"))
+		     'ps))
 
 	 (port (ly:outputter-port outputter))
 	 (rounded-bbox (to-bp-box bbox))
@@ -603,7 +600,7 @@
     ))
 
 
-(define (clip-system-EPSes basename paper-book)
+(define-public (clip-system-EPSes basename paper-book)
   (define do-pdf (member  "pdf" (ly:output-formats)))
 
   (define (clip-score-systems basename systems)