Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 01a09a5a8765c7ddc9a7964c8a9389e7a279f5bd..930ac51bf1141577bc80a23285adea40203e45d0 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.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-eps))
 
@@ -13,6 +13,8 @@
             (ice-9 format)
             (guile)
             (scm framework-ps)
+            (scm paper-system)
+            (scm page)
             (scm output-ps)
             (srfi srfi-1)
             (srfi srfi-13)
@@ -54,9 +56,8 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment."
               (rest (cdr stencils)))
 
          (dump-stencil-as-EPS
-          paper
-          line (format "~a-~a" basename count)
-          (ly:output-def-lookup paper 'force-eps-font-include))
+          paper line (format "~a-~a" basename count)
+          (ly:get-option 'eps-font-include))
          
          (dump-stencils-as-separate-EPS rest (1+ count)))))
 
@@ -94,8 +95,13 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment."
     (postprocess-output book framework-eps-module
                        (format "~a.eps" basename) (ly:output-formats)))
 
+
+
 (define-public (output-classic-framework basename book scopes fields)
   (output-scopes scopes fields basename)
+
+  (if (ly:get-option 'dump-signatures)
+      (write-system-signatures basename (ly:paper-book-systems book) 0))
   
   (dump-stencils-as-EPSes
    (map paper-system-stencil (ly:paper-book-systems book))
@@ -104,7 +110,8 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment."
 
 (define-public (output-framework basename book scopes fields)
   (output-scopes scopes fields basename)
-  (dump-stencils-as-EPSes (ly:paper-book-pages book) book basename))
+  (dump-stencils-as-EPSes
+   (map page-stencil (ly:paper-book-pages book)) book basename))
   
 
 ; redefine to imports from framework-ps