* lily/lily-parser.cc (LY_DEFINE): Remove "Now " from message.

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

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 671eca81b86cafe7eb19e9c7a3daa4f88bc7cd85..a7ecaae9967ea72784f7f82981b1f7998e24ae4b 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -202,13 +202,11 @@
 (define (dump-line putter line last?)
   (ly:outputter-dump-string
    putter
-   (string-append "\\lybox{"
-                 (ly:number->string
-                  (interval-length (ly:paper-system-extent line X)))
-                 "}{"
-                 (ly:number->string
-                  (interval-length (ly:paper-system-extent line Y)))
-                 "}{%\n"))
+   (format "\\lybox{~a}{~a}{%\n"
+          (ly:number->string
+           (max 0 (interval-end (ly:paper-system-extent line X))))
+          (ly:number->string
+           (interval-length (ly:paper-system-extent line Y)))))
 
   (ly:outputter-dump-stencil putter (ly:paper-system-stencil line))
   (ly:outputter-dump-string
@@ -269,7 +267,7 @@
     (postscript->png
      (if (number? resolution)
         resolution
-        (ly:get-option 'preview-resolution))b
+        (ly:get-option 'resolution))
      (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)
@@ -290,17 +288,16 @@
 
                             (if (ly:get-option 'verbose)
                                 " "
-                                " 2>&1 1>& /dev/null ")
-                            )))
+                                " 2>&1 1>& /dev/null "))))
 
     (if (ly:get-option 'verbose)
        (begin 
          (newline (current-error-port))
-
-         (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+         (format (current-error-port) (_ "Invoking ~S") cmd)
          (newline (current-error-port)))
-       (display (format #f "Converting to `~a.ps'...\n" base) (current-error-port))
-       )
+       (begin
+         (format (current-error-port) (_ "Converting to `~a.ps'...") base)
+         (newline (current-error-port))))
     (system cmd)))
 
 (define-public (convert-to-dvi book name)
@@ -315,16 +312,16 @@
               "latex \\\\nonstopmode \\\\input " name
               (if (ly:get-option 'verbose)
                   " "
-                  " 2>&1 1>& /dev/null ")
-
-              )))
+                  " 2>&1 1>& /dev/null "))))
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
     (if (ly:get-option 'verbose)
        (begin 
          (newline (current-error-port))
-         (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
+         (format (current-error-port) (_ "Invoking ~S") cmd)
          (newline (current-error-port)))
-       (format (current-error-port) "Converting to `~a.dvi'...\n" base))
+       (begin
+         (format (current-error-port) (_ "Converting to `~a.dvi'...") base)
+         (newline (current-error-port))))
 
     ;; fixme: set in environment?
     (if (ly:get-option 'safe)