(dump-stencil-as-EPS): don't hardcode left

EPS edge at 0, but take minimum with left-overshoot. This fixes
cut off system start delims.

diff --git a/ChangeLog b/ChangeLog
index 5cce661c16a8701c4af037e096098411045f967e..c750d03378bed097bbbcc6cef8a64470c0f01f89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-02-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/framework-ps.scm (dump-stencil-as-EPS): don't hardcode left
+       EPS edge at 0, but take minimum with left-overshoot. This fixes
+       cut off system start delims. 
+
        * lily/instrument-name-engraver.cc (stop_translation_timestep):
        hack: add to axis group if not added yet. This fixes hara kiri'd
        piano staves.

diff --git a/lily/paper-system.cc b/lily/paper-system.cc
index 5b26cd25088fe139653ae88003868d34bb67128a..5d3d19c513e2fe096dc7426c1242754f055d3971 100644 (file)
--- a/lily/paper-system.cc
+++ b/lily/paper-system.cc
@@ -23,7 +23,6 @@ paper_system_set_stencil (Prob *prob, Stencil s)
 
   if (is_number_pair (yext))
     {
-      
       Box b = s.extent_box();
       b[Y_AXIS] = ly_scm2interval (yext);
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 2961be4727305877323bc341cdb9b350b97c31c8..36deeee731b62ade0c7fdca4641a0a5d8b1c5c08 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -462,16 +462,21 @@
                   (inexact->exact
                    (round (* x scale mm-to-bigpoint)))) mmbox)))
 
-    (list (car box) (cadr box)
+    (list (car box)
+         (cadr box)
          (max (1+ (car box)) (caddr box))
-         (max (1+ (cadr box)) (cadddr box)))))
+         (max (1+ (cadr box)) (cadddr box))
+         )))
 
+  (display (ly:stencil-extent dump-me X))
   (let* ((outputter (ly:make-paper-outputter
                     ;; FIXME: better wrap open/open-file,
                     ;; content-mangling is always bad.
                     ;; MINGW hack: need to have "b"inary for embedding CFFs
                     (open-file (format "~a.eps" filename) "wb")
                     "ps"))
+
+        (left-overshoot -3)
         (port (ly:outputter-port outputter))
         (xext (ly:stencil-extent dump-me X))
         (yext (ly:stencil-extent dump-me Y))
@@ -483,9 +488,12 @@
                     (equal? (format #f "~S" x) "+#.#")
                     (equal? (format #f "~S" x) "-#.#"))
                 0.0 x))
-          ;; set left of X to 0, to prevent barnumbers
-          ;; from sticking out of margin.
-          (list 0.0 (car yext) (cdr xext) (cdr yext))))
+
+          ;; the left-overshoot is to make sure that
+          ;; bar numbers  stick out of margin uniformly.
+          ;;
+          (list (min left-overshoot (car xext))
+                (car yext) (cdr xext) (cdr yext))))
         (rounded-bbox (mm-to-bp-box bbox))
         (port (ly:outputter-port outputter))
         (header (eps-header paper rounded-bbox load-fonts?)))