* scripts/lilypond-book.py (main): use -deps-box-padding=-3

* scm/framework-ps.scm (dump-stencil-as-EPS): use eps-box-padding,
a number.

diff --git a/ChangeLog b/ChangeLog
index ec521e356d2817058a6880974b9ad6d94b8974b9..1d96c8bcec0802a47861935d700557eaba9852ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-10-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scripts/lilypond-book.py (main): use -deps-box-padding=-3
+
+       * scm/framework-ps.scm (dump-stencil-as-EPS): use eps-box-padding,
+       a number.
+
        * scm/define-grob-properties.scm (all-user-grob-properties):
        remove outdated doc.
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 9207b181fb0ea5ef49f35c5beb500f4fe6572d73..aa0696bbc3ab1158815e3f1b690c18f87348c305 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -487,7 +487,7 @@
   (let*
       ((xext (ly:stencil-extent dump-me X))
        (yext (ly:stencil-extent dump-me Y))
-       (left-overshoot -3)
+       (left-overshoot (number? (ly:get-option 'eps-box-padding)))
        (bbox
        (map
         (lambda (x)
@@ -502,7 +502,7 @@
           ;;
           (list
            
-           (if (ly:get-option 'pad-eps-boxes) 
+           (if left-overshoot
                (min left-overshoot (car xext))
                (car xext))
            (car yext) (cdr xext) (cdr yext)))))

diff --git a/scm/lily.scm b/scm/lily.scm
index 48fcc6165775bba84cc2816bbd030f16624f3f13..807adcb4850c35a7c60c0ec47354189d02754b12 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -32,7 +32,7 @@
              (include-book-title-preview #t "include book-titles in preview images.")
              (include-eps-fonts #t "Include fonts in separate-system EPS files.")
 
-             (pad-eps-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems")
+             (eps-box-padding #f "Pad EPS bounding box left edge by this much to guarantee alignment between systems")
 
              (gui #f "running from gui; redirect stderr to log file")
              

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index bb0407956304ee6d9aae4196efcec072ba2f6598..f64deb6343354e89fd342e895737472bb80c2fee 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1802,7 +1802,7 @@ def main ():
     if global_options.verbose:
         global_options.process_cmd += " --verbose "
 
-    global_options.process_cmd += " -dread-file-list -dpad-eps-boxes "
+    global_options.process_cmd += " -dread-file-list -deps-box-padding=-3 "
 
     identify ()