Don't let lyrics interfere with StaffGrouper.

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 7ecfee560589ef91afb441f192cc623ac2de7b1b..fcd3604d1671337471291e26d8b561e57fe03fd4 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -240,8 +240,7 @@
   (define (internal-font? file-name)
     (or (string-startswith file-name "Emmentaler")
        (string-startswith file-name "emmentaler")
-       (string-startswith file-name "aybabtu")
-       (string-startswith file-name "Aybabtu")))
+       ))
 
   (define (load-font-via-GS font-name-filename)
     (define (ps-load-file file-name)
@@ -602,21 +601,8 @@ fonts inline."
 
 (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 'output-scale))
-        (to-dump-systems '()))
-    ;; skip booktitles.
-    (if (and (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 (paper-system-title? sys)
-              (not (pair? to-dump-systems))
-              (paper-system-title? (car to-dump-systems)))
-          (set! to-dump-systems (cons sys to-dump-systems))))
-     systems)
+        (systems (relevant-book-systems book))
+        (to-dump-systems (relevant-dump-systems systems)))
     (dump-stencil-as-EPS paper
                         (stack-stencils Y DOWN 0.0
                                         (map paper-system-stencil
@@ -627,26 +613,6 @@ fonts inline."
                        (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 'output-scale))
-            (titles (take-while paper-system-title? systems))
-            (non-title (find (lambda (x)
-                               (not (paper-system-title? x))) systems))
-            (dump-me
-             (stack-stencils Y DOWN 0.0
-                             (map paper-system-stencil
-                                  (append titles (list non-title))))))
-       (output-scopes scopes fields basename)
-       (dump-stencil-as-EPS paper dump-me
-                            (format "~a.preview" basename)
-                            #t)
-       (postprocess-output book framework-ps-module
-                           (format "~a.preview.eps" basename)
-                           (ly:output-formats)))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public (convert-to-pdf book name)
@@ -660,8 +626,8 @@ fonts inline."
         (w (if landscape paper-height paper-width))
         (h (if landscape paper-width paper-height)))
     (if (equal? (basename name ".ps") "-")
-       (ly:warning (_ "cannot convert <stdout> to ~S" "PDF"))
-       (postscript->pdf w h name))))
+       (set! name (string-append "./" name)))
+    (postscript->pdf w h name)))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -672,6 +638,8 @@ fonts inline."
         (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") "-")
+       (set! name (string-append "./" name)))
     (postscript->png resolution
                     (* paper-width output-scale (/ (ly:bp 1)))
                     (* paper-height output-scale (/ (ly:bp 1)))