CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/06/09 10:14:31

Modified files:
        .              : ChangeLog 
        scm            : backend-library.scm framework-ps.scm 

Log message:
        * scm/framework-ps.scm (write-preamble): Support for -d
        gs-font-load=1: read fonts via ghostscript.
        
        * scm/backend-library.scm (postscript->pdf): Support for
        -dgs-font-load=1

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3744&tr2=1.3745&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.114&tr2=1.115&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3744 lilypond/ChangeLog:1.3745
--- lilypond/ChangeLog:1.3744   Thu Jun  9 08:07:40 2005
+++ lilypond/ChangeLog  Thu Jun  9 10:14:31 2005
@@ -1,9 +1,20 @@
+2005-06-09  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * scm/framework-ps.scm (write-preamble): Support for -d
+       gs-font-load=1: read fonts via ghostscript. 
+       
+       * scm/backend-library.scm (postscript->pdf): Support for
+       -dgs-font-load=1
+
 2005-06-09  Graham Percival  <[EMAIL PROTECTED]>
 
        * Documentation/user/global.itely: added \layout docs.
 
 2005-06-09  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+       * scm/framework-ps.scm (write-preamble): make font loading
+       switchable to GS via --define-default gs-font-load=1
+
        * lily/lily-parser-scheme.cc: add unistd.h
 
 2005-06-08  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.31 
lilypond/scm/backend-library.scm:1.32
--- lilypond/scm/backend-library.scm:1.31       Mon Jun  6 07:57:06 2005
+++ lilypond/scm/backend-library.scm    Thu Jun  9 10:14:31 2005
@@ -36,7 +36,7 @@
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
         (cmd (format #f
                      "gs\
- -dSAFER\
+ ~a\
  -dCompatibilityLevel=1.4 \
  -sPAPERSIZE=~a\
  -q\
@@ -48,6 +48,10 @@
  -c .setpdfwrite\
  -f ~S\
 "
+                     (if (assoc 'gs-font-load
+                                (ly:get-option 'command-line-settings))
+                         " -dNOSAFER "
+                         " -dSAFER ")
                      (sanitize-command-option papersizename)
                      pdf-name
                      name)))
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.114 lilypond/scm/framework-ps.scm:1.115
--- lilypond/scm/framework-ps.scm:1.114 Tue Jun  7 14:38:08 2005
+++ lilypond/scm/framework-ps.scm       Thu Jun  9 10:14:31 2005
@@ -377,9 +377,14 @@
            (uniq-list
             (sort (apply append all-font-names)
                   (lambda (x y) (string<? (cadr x) (cadr y))))))
-          ;; ttftool/fopencookie is broken on Windows,
-          ;; possibly a stack corruption bug.
-          (pfas (map load-font font-names)))
+
+
+          (font-loader (if (assoc 'gs-font-load
+                                  (ly:get-option 'command-line-settings))
+                           load-font-via-GS
+                           load-font))
+                        
+          (pfas (map font-loader font-names)))
       pfas))
 
   (if load-fonts?


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to