Imported Upstream version 2.19.47

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 8221e5eab35229e1e2f2e558ed1ca46e1ca3c152..a4041196789c989d7f7a5616cdd1c8ecd10b876c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -248,27 +248,32 @@
 (define check-conflict-and-embed-cff
   (let ((font-list '()))
     (lambda (name file-name font-index)
-      (let* ((name-symbol (string->symbol name))
-             (args-filename-offset
-              (cons file-name (ly:get-cff-offset file-name font-index)))
-             (found-filename-offset (assq name-symbol font-list)))
-        (if found-filename-offset
-            (begin
-              (if (equal? args-filename-offset (cdr found-filename-offset))
-                  (ly:debug
-                   (_ "CFF font `~a' already embedded, skipping.")
-                   name)
-                  (ly:warning
-                   (_ "Different CFF fonts which have the same name `~a' has been detected. The font cannot be embedded.")
-                   name))
-              "")
-            (begin
-              (ly:debug
-               (_ "Embedding CFF font `~a'")
-               name)
-              (set! font-list
-                    (acons name-symbol args-filename-offset font-list))
-              (ps-embed-cff (ly:otf->cff file-name font-index) name 0)))))))
+      (if name
+          (let* ((name-symbol (string->symbol name))
+                 (args-filename-offset
+                  (cons file-name (ly:get-cff-offset file-name font-index)))
+                 (found-filename-offset (assq name-symbol font-list)))
+            (if found-filename-offset
+                (begin
+                  (if (equal? args-filename-offset (cdr found-filename-offset))
+                      (ly:debug
+                       (_ "CFF font `~a' already embedded, skipping.")
+                       name)
+                      (ly:warning
+                       (_ "Different CFF fonts which have the same name `~a' has been detected. The font cannot be embedded.")
+                       name))
+                  "")
+                (begin
+                  (ly:debug (_ "Embedding CFF font `~a'.") name)
+                  (set! font-list
+                        (acons name-symbol args-filename-offset font-list))
+                  (ps-embed-cff (ly:otf->cff file-name font-index) name 0))))
+          (begin
+            (ly:debug (_ "Initializing embedded CFF font list."))
+            (set! font-list '()))))))
+
+(define (initialize-font-embedding)
+  (check-conflict-and-embed-cff #f #f #f))
 
 (define (write-preamble paper load-fonts? port)
   (define (internal-font? font-name-filename)
@@ -283,16 +288,19 @@
 
   (define (load-font-via-GS font-name-filename)
     (define (is-collection-font? file-name)
-      (let ((port (open-file file-name "rb")))
-        (if (eq? (read-char port) #\t)
-            (if (eq? (read-char port) #\t)
-                (if (eq? (read-char port) #\c)
-                    (if (eq? (read-char port) #\f)
-                        #t
-                        #f)
-                    #f)
-                #f)
-            #f)))
+      (let* ((port (open-file file-name "rb"))
+             (retval
+              (if (eq? (read-char port) #\t)
+                  (if (eq? (read-char port) #\t)
+                      (if (eq? (read-char port) #\c)
+                          (if (eq? (read-char port) #\f)
+                              #t
+                              #f)
+                          #f)
+                      #f)
+                  #f)))
+        (close-port port)
+        retval))
 
     (define (ps-load-file file-name)
       (if (string? file-name)
@@ -320,7 +328,7 @@
        ((and (string? bare-file-name)
              (eq? (ly:get-font-format bare-file-name font-index) 'CFF)
              (is-collection-font? bare-file-name))
-        (ly:warning (_ "Font ~a cannot be loaded via Ghostscript because it is an OpenType/CFF (OTC) font.")
+        (ly:warning (_ "Font ~a cannot be loaded via Ghostscript because it is an OpenType/CFF Collection (OTC) font.")
                     name)
         (load-font font-name-filename))
        ((and (string? bare-file-name)
@@ -575,6 +583,7 @@ mark {ly~a_stream} /CLOSE pdfmark
          (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
          (page-count (length page-stencils))
          (port (ly:outputter-port outputter)))
+    (initialize-font-embedding)
     (if (ly:get-option 'clip-systems)
         (clip-system-EPSes basename book))
     (if (ly:get-option 'dump-signatures)
@@ -655,6 +664,7 @@ mark {ly~a_stream} /CLOSE pdfmark
          (rounded-bbox (to-rounded-bp-box bbox))
          (port (ly:outputter-port outputter))
          (header (eps-header paper rounded-bbox load-fonts)))
+    (initialize-font-embedding)
     (display header port)
     (write-preamble paper load-fonts port)
     (display "/mark_page_link { pop pop pop pop pop } bind def\n" port)