From d74a520a62663f2cf62da51db0141099ad6a71dc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 5 Feb 2006 00:41:06 +0000 Subject: [PATCH] (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. --- ChangeLog | 4 ++++ lily/paper-system.cc | 1 - scm/framework-ps.scm | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cce661c16..c750d03378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-02-05 Han-Wen Nienhuys + * 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 5b26cd2508..5d3d19c513 100644 --- 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 2961be4727..36deeee731 100644 --- 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?))) -- 2.39.2