Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / scm / framework-ps.scm

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index f06424d72ca3cb844198947baa762732008891ad..5ea57cc7fc570e56d643082ae86ebf1bc0733c53 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -256,7 +256,7 @@
       (format
        (if (string? name)
           "(~a) (r) file .loadfont\n"
-          "% can't find font file: ~a\n")
+          "% cannot find font file: ~a\n")
        name))
 
     (let* ((font (car font-name-filename))
@@ -276,7 +276,7 @@
            ((string? bare-file-name)
             (ps-load-file file-name))
            (else
-            (ly:warning (_ "can't embed ~S=~S") name file-name)
+            (ly:warning (_ "cannot embed ~S=~S") name file-name)
             "")))
 
          )))
@@ -329,7 +329,7 @@
       (if (not embed)
          (begin
            (set! embed "% failed \n")
-           (ly:warning (_ "can't extract file matching ~a from ~a") name filename)))
+           (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)
@@ -346,7 +346,7 @@
        ((and file-name (string-match "\\.otf" downcase-file-name))
        (ps-embed-cff (ly:otf->cff file-name) name 0))
        (else
-       (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
+       (ly:warning (_ "do not know how to embed ~S=~S") name file-name)
        ""))))
 
     (define (mac-font? bare-file-name)
@@ -377,7 +377,7 @@
 
        (bare-file-name (font-file-as-ps-string name bare-file-name))
        (else
-        (ly:warning (_ "don't know how to embed font ~s ~s ~s")
+        (ly:warning (_ "do not know how to embed font ~s ~s ~s")
                     name file-name font))))))
        
 
@@ -482,12 +482,15 @@
                         (ly:output-formats))))
 
 (define-public (dump-stencil-as-EPS paper dump-me filename
-                                   load-fonts
-                                   )
+                                   load-fonts)
+  
   (let*
       ((xext (ly:stencil-extent dump-me X))
        (yext (ly:stencil-extent dump-me Y))
-       (left-overshoot (ly:get-option 'eps-box-padding))
+       (padding (ly:get-option 'eps-box-padding))
+       (left-overshoot (if (number? padding)
+                          (* -1 padding (ly:output-def-lookup paper 'mm))
+                          #f))
        (bbox
        (map
         (lambda (x)
@@ -537,8 +540,6 @@
                     "ps"))
 
         (port (ly:outputter-port outputter))
-
-        
         (rounded-bbox (to-bp-box bbox))
         (port (ly:outputter-port outputter))
         (header (eps-header paper rounded-bbox load-fonts)))
@@ -728,7 +729,7 @@
         )
 
     (if (equal? (basename name ".ps") "-")
-       (ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
+       (ly:warning (_ "cannot convert <stdout> to ~S" "PDF"))
        (postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
@@ -747,10 +748,10 @@
                     name)))
 
 (define-public (convert-to-dvi book name)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "DVI"))
+  (ly:warning (_ "cannot generate ~S using the postscript back-end") "DVI"))
 
 (define-public (convert-to-tex book name)
-  (ly:warning (_ "can't generate ~S using the postscript back-end") "TeX"))
+  (ly:warning (_ "cannot generate ~S using the postscript back-end") "TeX"))
 
 (define-public (convert-to-ps book name)
   #t)