From bdaa122f94411762ec30823ab5fbc1082b6b3f63 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 9 Jun 2005 10:14:31 +0000
Subject: [PATCH] * 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
---
 ChangeLog               | 11 +++++++++++
 scm/backend-library.scm |  6 +++++-
 scm/framework-ps.scm    | 11 ++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8d2648045..8376ca3468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2005-06-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* 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  <gperlist@shaw.ca>
 
 	* Documentation/user/global.itely: added \layout docs.
 
 2005-06-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* 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  <hanwen@xs4all.nl>
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index c9d72d8f5d..f39ac71471 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -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)))
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index fb1c4efd50..46ede2e15a 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -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?
-- 
2.39.5