X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=0eb622fe48d56d184ab341e28ee429d3e40ff055;hb=5ae46f750bfb3a947d4adc26044560da54c21e17;hp=67ceda359efdc3b90f84aff87b689c3b8d98a3be;hpb=8245df4f448c4c740f8c2fab9c680dfc4f595d60;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 67ceda359e..0eb622fe48 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,36 +2,43 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
 ;;; this is still too big a mess.
 
-(use-modules (ice-9 regex)
-	     (ice-9 string-fun)
-	     (ice-9 format)
+(use-modules (ice-9 string-fun)
 	     (guile)
+	     (scm page)
+	     (scm paper-system)
 	     (srfi srfi-1)
 	     (srfi srfi-13)
+	     (scm clip-region)
 	     (lily))
 
+(define (format dest . rest)
+  (if (string? dest)
+      (apply simple-format (cons #f (cons dest rest)))
+      (apply simple-format (cons dest rest))))
 
 (define framework-ps-module (current-module))
 
 ;;(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
      "magfont"
-     (string-regexp-substitute "[ /%]" "_" name)
+     (ly:string-substitute
+      " " "_"
+      (ly:string-substitute
+       "/" "_"
+       (ly:string-substitute
+	"%" "_" name)))
      "m" (string-encode-integer (inexact->exact (round (* 1000 magnify)))))))
 
 (define (tex-font? fontname)
@@ -43,17 +50,12 @@
   (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 (standard-tex-font? x)
-    (or (equal? (substring x 0 2) "ms")
-	(equal? (substring x 0 2) "cm")))
+      "/" command " { /" fontname " " (ly:number->string scaling) " output-scale div selectfont } bind def\n"))
 
   (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,13 +63,9 @@
 	   (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.)
-      ;; FIXME - don't support Bluesky?
-      (if (standard-tex-font? fontname)
-	  (set! fontname (string-upcase fontname)))
       (if (equal? fontname "unknown")
 	  (display (list font fontname)))
       (define-font plain fontname scaling)))
@@ -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)))
+  (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
+  )))
+
+
+(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
@@ -239,12 +251,14 @@
 (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))
+    (define (ps-load-file file-name)
+      (if (string? file-name)
+	  (if (string-contains file-name (ly:get-option 'datadir))
+	      (begin
+		(set! file-name (ly:string-substitute (ly:get-option 'datadir) "" file-name))
+		(format "lilypond-datadir (~a) concatstrings (r) file .loadfont" file-name))
+	      (format "(~a) (r) file .loadfont\n" file-name))
+	  (format "% cannot find font file: ~a\n" file-name)))
 
     (let* ((font (car font-name-filename))
 	   (name (cadr font-name-filename))
@@ -252,16 +266,24 @@
 	   (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
+	    ((or (string-startswith file-name "Emmentaler")
+		 (string-startswith file-name "emmentaler")
+		 (string-startswith file-name "aybabtu")
+		 (string-startswith file-name "Aybabtu"))
+	     (ps-load-file (ly:find-file
+			    (format "~a.otf"  file-name))))
+	    ((string? bare-file-name)
+	     (ps-load-file file-name))
+	    (else
+	     (ly:warning (_ "cannot embed ~S=~S") name file-name)
+	     "")))
+
+	  )))
 
   (define (dir-join a b)
     (if (equal? a "")
@@ -281,32 +303,37 @@
 	 (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))))
+	 (let*
+	     ((full-name  (dir-join dir-name f)))
+	   
+	   (if (and (not embed)
+		    (equal? 'regular (stat:type (stat full-name)))
+		    (equal? name (ly:ttf-ps-name full-name)))
+	       
+	       (set! embed
+		     (font-file-as-ps-string name full-name)))
+	   
+	   (if (or (equal? "." f) 
+		   (equal? ".." f))
+	       #t
+	       (delete-file full-name))))
+
+
        files)
       (rmdir dir-name)
 
       (if (not embed)
 	  (begin
 	    (set! embed "% failed \n")
-	    (ly:warning (_ "can't extract file matching ~a from ~a") name filename)))
+	    (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)
@@ -314,18 +341,26 @@
 	  ((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))
+       ((and file-name (string-endswith downcase-file-name ".pfa"))
+	(embed-document file-name))
+       ((and file-name (string-endswith downcase-file-name ".pfb"))
 	(ly:pfb->pfa file-name))
-       ((and file-name (string-match "\\.ttf" downcase-file-name))
+       ((and file-name (string-endswith downcase-file-name ".ttf"))
 	(ly:ttf->pfa file-name))
-       ((and file-name (string-match "\\.otf" downcase-file-name))
+       ((and file-name (string-endswith downcase-file-name ".otf"))
 	(ps-embed-cff (ly:otf->cff file-name) name 0))
        (else
-	(ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+	(ly:warning (_ "do not know how to embed ~S=~S") name file-name)
 	""))))
-      
+
+    (define (mac-font? bare-file-name)
+      (and
+       (eq? PLATFORM 'darwin)
+       bare-file-name
+       (or
+	(string-endswith  bare-file-name ".dfont")
+	(= (stat:size (stat bare-file-name)) 0))))
+
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
 	   (name (cadr font-name-filename))
@@ -333,19 +368,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))
@@ -355,7 +381,7 @@
 
 	(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")
+	 (ly:warning (_ "do not know how to embed font ~s ~s ~s")
 		     name file-name font))))))
 	
 
@@ -387,14 +413,19 @@
 	     (sort (apply append all-font-names)
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
 
-
-	   (font-loader (if (ly:get-option 'gs-font-load)
+	   (font-loader (if (ly:get-option 'gs-load-fonts)
 			    load-font-via-GS
 			    load-font))
 			 
 	   (pfas (map font-loader font-names)))
       pfas))
 
+  (display "%%BeginProlog\n" port)
+
+  (format port
+	    "/lilypond-datadir where {pop} {userdict /lilypond-datadir (~a) put } ifelse"
+	    (ly:get-option 'datadir))
+  
   (if load-fonts?
       (for-each
        (lambda (f)
@@ -403,12 +434,15 @@
 	 (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))
+
+  (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))
@@ -417,125 +451,264 @@
 		     ;; 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))
-	 (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)))
 
-    (paper-book-write-midis book basename)
-    
+
+    (if (ly:get-option 'clip-systems)
+	(clip-system-EPSes basename book))
+
+    (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-public (dump-stencil-as-EPS paper dump-me filename
+				    load-fonts)
+  
+  (let*
+      ((xext (ly:stencil-extent dump-me X))
+       (yext (ly:stencil-extent dump-me Y))
+       (padding (ly:get-option 'eps-box-padding))
+       (left-overshoot (if (number? padding)
+			   (* -1 padding (ly:output-def-lookup paper 'mm))
+			   #f))
+       (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))
+
+	   ;; the left-overshoot is to make sure that
+	   ;; bar numbers  stick out of margin uniformly.
+	   ;;
+	   (list
+	    
+	    (if (number? left-overshoot)
+		(min left-overshoot (car xext))
+		(car xext))
+	    (car yext) (cdr xext) (cdr yext)))))
+
+       (dump-stencil-as-EPS-with-bbox paper dump-me filename load-fonts bbox)
+       ))
+	 
+	   
+(define-public (dump-stencil-as-EPS-with-bbox paper dump-me filename
+					      load-fonts
+					      bbox)
+  (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,
 		     ;; 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))
-	 (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))
+	 (rounded-bbox (to-bp-box bbox))
 	 (port (ly:outputter-port outputter))
-	 (header (eps-header paper rounded-bbox load-fonts?)))
+	 (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)
+    (write-preamble paper load-fonts 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 (clip-systems-to-region
+	 basename paper systems region
+	 do-pdf)
+
+  (let*
+      ((extents-system-pairs
+	(filtered-map
+	 (lambda (paper-system)
+	   (let*
+	       ((x-ext (system-clipped-x-extent
+			(paper-system-system-grob paper-system)
+			region)))
+
+	     (if x-ext
+		 (cons x-ext paper-system)
+		 #f)))
+	 
+	 systems))
+       (count 0))
+    
+    (for-each
+     (lambda (ext-system-pair)
+       (let*
+	   ((xext (car ext-system-pair))
+	    (paper-system (cdr ext-system-pair))
+	    (yext (paper-system-extent paper-system Y))
+	    (bbox (list (car  xext) (car yext)
+			(cdr xext) (cdr yext)))
+	    (filename (if (< 0 count)
+			  (format "~a-~a" basename count)
+			  basename)))
+
+	 (set! count (1+ count))
+	 (dump-stencil-as-EPS-with-bbox
+	  paper
+	  (paper-system-stencil paper-system)
+	  filename
+	  (ly:get-option 'include-eps-fonts)
+	  bbox)
+
+	 (if do-pdf
+	     (postscript->pdf  0 0  (format "~a.eps" filename)))
+	 ))
+
+     extents-system-pairs)
+    ))
+
+
+(define-public (clip-system-EPSes basename paper-book)
+  (define do-pdf (member  "pdf" (ly:output-formats)))
+
+  (define (clip-score-systems basename systems)
+    (let*
+	((layout (ly:grob-layout (paper-system-system-grob (car systems))))
+	 (regions (ly:output-def-lookup layout 'clip-regions)))
+      
+      (for-each
+       (lambda (region)
+	 (clip-systems-to-region
+	  (format "~a-from-~a-to-~a-clip"
+		  basename
+		  (rhythmic-location->file-string (car region))
+		  (rhythmic-location->file-string (cdr region)))
+	  layout systems region
+	  do-pdf))
+       
+       regions)))
+  
+
+  ;; partition in system lists sharing their layout blocks
+  (let*
+      ((systems (ly:paper-book-systems paper-book))
+       (count 0)
+       (score-system-list '()))
+
+    (fold 
+     (lambda (system last-system)
+    
+       
+       (if (not (and last-system
+		     (equal? (paper-system-layout last-system)
+			     (paper-system-layout system))))
+	   (set! score-system-list (cons '() score-system-list)))
+       
+       (if (paper-system-layout system)
+	   (set-car! score-system-list (cons system (car score-system-list))))
+
+       ;; pass value.
+       system)
+
+     #f 
+     systems)
+
+    (for-each
+     (lambda (system-list)
+       (clip-score-systems
+	(if (> count 0)
+	    (format "~a-~a" basename count)
+	    basename)
+	system-list))
+
+     score-system-list)))
+
+
 (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 '()))
 
-    (display systems)
     ;; skip booktitles.
     (if (and
-	 (not
-	  (ly:get-option 'preview-include-book-title))
-	 (< 1 (length systems))
-	 (ly:paper-system-title? (list-ref systems 0))
-	 (ly:paper-system-title? (list-ref systems 1)))
+	 (not (ly:get-option 'include-book-title-preview))
+	 (pair? systems)
+	 (ly:prob-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)
 			(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))
+	     (scale (ly:output-def-lookup paper 'output-scale))
+	     (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
@@ -545,16 +718,25 @@
 	(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)))
+	 (landscape (ly:output-def-lookup defs 'landscape))
+	 (output-scale (ly:output-def-lookup defs 'output-scale))
+	 (convert (lambda (x) (* x output-scale (/ (ly:bp 1)))))
+	 
+	 (paper-width (convert (ly:output-def-lookup defs 'paper-width)))
+	 (paper-height (convert (ly:output-def-lookup defs 'paper-height)))
+
+	 (w (if landscape paper-height paper-width))
+	 (h (if landscape paper-width paper-height))
+	 )
 
     (if (equal? (basename name ".ps") "-")
-	(ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-	(postscript->pdf (if (string? papersizename) papersizename "a4")
-			 name))))
+	(ly:warning (_ "cannot convert <stdout> to ~S" "PDF"))
+	(postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -562,27 +744,35 @@
 	 (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)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "DVI"))
+  (ly:warning (_ "cannot generate ~S using the postscript back-end") "DVI"))
 
 (define-public (convert-to-tex book name)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "TeX"))
+  (ly:warning (_ "cannot 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,
+  (ly:error (_ "\nThe PostScript backend does not support the system-by-system 
+output. For that, use the EPS backend instead,
+
+  lilypond -b eps FILE
 
-  lilypond -b eps <file>
+If have cut & pasted a lilypond fragment from a webpage, be sure
+to only remove anything before
 
-or remove the lilypond-book specific settings from the input.
+  %% ****************************************************************
+  %% Start cut-&-pastable-section
+  %% ****************************************************************
 ")))