* The grand 2005-2006 replace.

[lilypond.git] / scm / framework-ps.scm

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index b2d8f7c558e066bcd9635301b503e6db3279c096..54f0f1c7a25ffdf0095956bc9db23191fa104a43 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  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@cs.uu.nl>
 
 (define-module (scm framework-ps))
 
@@ -425,8 +425,6 @@
         (page-count (length pages))
         (port (ly:outputter-port outputter)))
 
-    (paper-book-write-midis book basename)
-    
     (output-scopes scopes fields basename)
     (display (page-header paper page-count #t) port)
     (write-preamble paper #t port)
@@ -477,7 +475,9 @@
                     (equal? (format #f "~S" x) "+#.#")
                     (equal? (format #f "~S" x) "-#.#"))
                 0.0 x))
-          (list (car xext) (car yext) (cdr xext) (cdr yext))))
+          ;; 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))
         (port (ly:outputter-port outputter))
         (header (eps-header paper rounded-bbox load-fonts?)))
@@ -497,26 +497,25 @@
 
     ;; 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 '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)
 
@@ -529,12 +528,12 @@
       (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