* scm/framework-ps.scm (procset): New function to define a procset resource.

(preamble): Use it.

diff --git a/ChangeLog b/ChangeLog
index 36513a4bdca3f61efb5cd47a0e1d24ae1a55e480..889d4e7a3c27eae24ec4ed35220e8198c3da8ed4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2005-01-18  Werner Lemberg  <wl@gnu.org>
 
        * scm/framework-ps.scm (ps-embed-cff): Fix DSC comments.
+       (procset): New function to define a procset resource.
+       (preamble): Use it.
 
 2005-01-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 188edf57fae01caac86c01673a46176f4d2c4b58..35813d046c7babc856bd245472e9aae5e9c1253a 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -193,6 +193,15 @@
                 (supplies-or-needs paper load-fonts?)
                 "%%EndComments\n"))
 
+(define (procset name)
+  (string-append
+   (format
+    "%%BeginResource: procset (~a) 1 0
+~a
+%%EndResource
+"
+    name (ly:gulp-file name))))
+
 (define (preamble paper load-fonts?)
   (define (load-fonts paper)
     (let* ((fonts (ly:paper-fonts paper))
@@ -232,14 +241,13 @@
 
   (list
    (output-variables paper)
-   (ly:gulp-file "music-drawing-routines.ps")
-   (ly:gulp-file "lilyponddefs.ps")
+   (procset "music-drawing-routines.ps")
+   (procset "lilyponddefs.ps")
    (if load-fonts?
-       (load-fonts paper)
-       "")
+       (load-fonts paper))
    (define-fonts paper)))
 
-(define-public (output-framework basename book scopes fields )
+(define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.ps" basename))
         (outputter  (ly:make-paper-outputter filename
                                              (ly:output-backend)))