Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 9095c1a9b903be15d57e3180b2dbd824bfb05226..bf794c3a74d67e81138ad6b8f1b3ea4d1c0097a0 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -115,8 +115,7 @@
        "page-width output-scale lily-output-units mul mul 0 translate 90 rotate\n"
        "")
     "%%EndPageSetup\n"
-    
-    "true setstrokeadjust\n"
+
     "gsave 0 paper-height translate "
     "set-ps-scale-to-lily-scale "
     "\n"))
@@ -456,7 +455,7 @@
         (port (ly:outputter-port outputter)))
 
     (if (ly:get-option 'dump-signatures)
-       (write-system-signatures basename (ly:paper-book-systems book) 1))
+       (write-system-signatures basename (ly:paper-book-systems book) 0))
   
     (output-scopes scopes fields basename)
     (display (file-header paper page-count #t) port)
@@ -590,20 +589,12 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (landscape (ly:output-def-lookup defs 'landscape))
-        (output-scale (ly:output-def-lookup defs 'output-scale))
-        (convert (lambda (x) (* x output-scale (/ (ly:bp 1)))))
-        
-        (paper-width (convert (ly:output-def-lookup defs 'paper-width)))
-        (paper-height (convert (ly:output-def-lookup defs 'paper-height)))
-
-        (w (if landscape paper-height paper-width))
-        (h (if landscape paper-width paper-height))
-        )
+        (papersizename (ly:output-def-lookup defs 'papersizename)))
 
     (if (equal? (basename name ".ps") "-")
        (ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-       (postscript->pdf w h name))))
+       (postscript->pdf (if (string? papersizename) papersizename "a4")
+                        name))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -611,13 +602,10 @@
         (resolution (if (number? defs-resolution)
                         defs-resolution
                         (ly:get-option 'resolution)))
-        (paper-width (ly:output-def-lookup defs 'paper-width))
-        (paper-height (ly:output-def-lookup defs 'paper-height))
-        (output-scale (ly:output-def-lookup defs 'output-scale)))
+        (papersizename (ly:output-def-lookup defs 'papersizename)))
 
     (postscript->png resolution
-                    (* paper-width output-scale (/ (ly:bp 1)))
-                    (* paper-height output-scale (/ (ly:bp 1)))
+                    (if (string? papersizename) papersizename "a4")
                     name)))
 
 (define-public (convert-to-dvi book name)