From bda3ffadde29f6eab284d157c0d57aac37c45596 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 17 Sep 2006 13:52:43 +0000
Subject: [PATCH] * scm/framework-ps.scm (dump-stencil-as-EPS): naming
 pad-eps-boxes.

* scm/backend-library.scm: option naming:  gs-font-load*s*

* scm/framework-eps.scm (dump-stencils-as-EPSes): rename option to
include-eps-fonts
---
 ChangeLog               | 9 +++++++++
 ps/lilyponddefs.ps      | 4 ----
 scm/backend-library.scm | 2 +-
 scm/framework-eps.scm   | 2 +-
 scm/framework-ps.scm    | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6919772b25..3057ec3ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* scm/framework-ps.scm (dump-stencil-as-EPS): naming pad-eps-boxes.
+
+	* scm/backend-library.scm: option naming:  gs-font-load*s*
+
+	* scm/framework-eps.scm (dump-stencils-as-EPSes): rename option to
+	include-eps-fonts
+
 2006-09-17  Joe Neeman  <joeneeman@gmail.com>
 
 	* scm/define-music-types.scm (music-descriptions): remove
diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 442ae20046..ad0d89a61b 100644
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -6,10 +6,6 @@
 
 % /setgray { 1 add } bind def
 
-% To let gs load fonts from builddir, do:
-% export GS_LIB=$(pwd)/mf/out:/usr/share/texmf/fonts/type1/bluesky/cm
-
-
 /set-ps-scale-to-lily-scale {
 	lily-output-units output-scale mul dup scale
 } bind def
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index de44c4054a..c0f5b5ba5d 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -76,7 +76,7 @@
 "
 		      (search-gs)
 		      (if (ly:get-option 'verbose) "" "-q")
-		      (if (ly:get-option 'gs-font-load)
+		      (if (ly:get-option 'gs-load-fonts)
 			  " -dNOSAFER "
 			  " -dSAFER ")
 		      paper-size-string
diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 5026f6126f..643a979642 100644
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -61,7 +61,7 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment."
 
 	  (dump-stencil-as-EPS
 	   paper line system-base-name
-	   (ly:get-option 'eps-font-include))
+	   (ly:get-option 'include-eps-fonts))
 
 	  (if do-pdf
 	      (postscript->pdf  0 0  (string-append system-base-name ".eps")))
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 35dd9d9d60..60e241ac16 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -409,7 +409,7 @@
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
 
 
-	   (font-loader (if (ly:get-option 'gs-font-load)
+	   (font-loader (if (ly:get-option 'gs-load-fonts)
 			    load-font-via-GS
 			    load-font))
 			 
@@ -520,7 +520,7 @@
 	   ;;
 	   (list
 
-	    (if (ly:get-option 'eps-pad-boxes) 
+	    (if (ly:get-option 'pad-eps-boxes) 
 		(min left-overshoot (car xext))
 		(car xext))
 	    (car yext) (cdr xext) (cdr yext))))
-- 
2.39.2