* scm/backend-library.scm (output-scopes, header-to-file): Move

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

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 28c53d66de79a08f3686bb1946c531c884939170..fb853c9f7d995fa7b930686fa1b4c59cd13b36df 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-module (scm framework-eps))
 
@@ -23,23 +23,19 @@
 (define (dump-stencils-as-EPSes stencils book basename)
   (define paper (ly:paper-book-paper book))
   (define (dump-infinite-stack-EPS stencils)
-    (let*
-       ((dump-me (stack-stencils Y DOWN 2.0 stencils)))
-      (dump-stencil-as-EPS paper dump-me basename #t)
-      ))
+    (let* ((dump-me (stack-stencils Y DOWN 2.0 stencils)))
+      (dump-stencil-as-EPS paper dump-me basename #t)))
 
   (define (dump-stencils-as-separate-EPS stencils count)
     (if (pair? stencils)
-       (let*
-           ((line (car stencils))
-            (rest (cdr stencils)))
+       (let* ((line (car stencils))
+              (rest (cdr stencils)))
          (dump-stencil-as-EPS
           paper
           line (format "~a-~a" basename count)
-          #f)
-
-         (dump-stencils-as-separate-EPS rest (1+ count))
-         )))
+          (ly:output-def-lookup paper 'force-eps-font-include))
+         
+         (dump-stencils-as-separate-EPS rest (1+ count)))))
   
   (let* ((tex-system-name (format "~a-systems.tex" basename))
         (texi-system-name (format "~a-systems.texi" basename))
@@ -56,25 +52,23 @@
                                 basename (1+ c)) texi-system-port))
              (iota (length stencils)))
 
-    (display "@c eof" texi-system-port)
-    (display "% eof" tex-system-port)
+    (display "@c eof - 'eof' is a Makefile marker; don't remove. " texi-system-port)
+    (display "% eof - 'eof' is Makefile marker; don't remove. " tex-system-port)
     
     (dump-infinite-stack-EPS stencils))
     (postprocess-output book framework-eps-module
                        (format "~a.eps" basename) (ly:output-formats)))
 
-(define-public (output-classic-framework
-               basename book scopes fields)
-
+(define-public (output-classic-framework basename book scopes fields)
+  (output-scopes scopes fields basename)
   (dump-stencils-as-EPSes
    (map ly:paper-system-stencil (ly:paper-book-systems book))
    book
    basename))
 
 (define-public (output-framework basename book scopes fields)
-  (dump-stencils-as-EPSes (ly:paper-book-pages book)
-                         book
-                         basename))
+  (output-scopes scopes fields basename)
+  (dump-stencils-as-EPSes (ly:paper-book-pages book) book basename))
   
 
 ; redefine to imports from framework-ps