* 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

diff --git a/ChangeLog b/ChangeLog
index 6919772b256d78135802d412ae50a7c7922cd3fe..3057ec3ce8089d3e4931afad92e01de31a060862 100644 (file)
--- 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 442ae200466f76dfac890400a8ef34d3bf28886a..ad0d89a61bc1f9140dc63ea56cd67516f1fa5f24 100644 (file)
--- 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 de44c4054a2df94b4a86b44d364eb4c3cfafee5d..c0f5b5ba5dc4a4eea99bf03664e17a190dc3419e 100644 (file)
--- 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 5026f6126ff8890616c40610c26a4dea6a8d4403..643a979642a860e2381377c43b068c1e6160a5d6 100644 (file)
--- 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 35dd9d9d60236a4b1b0e98d87bcf226aa46f8ce1..60e241ac16d0770cb275ffdc3991de09bdadb33a 100644 (file)
--- 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))))