X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=83c64820e566d0b1cc48d1514d121d81a410ecc3;hb=fe8aacbb90f6b230f5712396c205d097338f5def;hp=52ce2e982c162c84c68ae8a9dc190f0a8b27cbaf;hpb=0109409b34b17adf6e6c2a88584997ffa98286d1;p=lilypond.git

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 52ce2e982c..83c64820e5 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex	
@@ -11,6 +11,8 @@
 (use-modules (ice-9 regex)
 	     (ice-9 string-fun)
 	     (ice-9 format)
+	     (scm page)
+	     (scm paper-system)
 	     (guile)
 	     (srfi srfi-1)
 	     (srfi srfi-13)
@@ -89,7 +91,7 @@
 			(inexact->exact
 			 (round (* 1000
 				   (ly:font-magnification font)
-				   (ly:paper-outputscale paper)))))))
+				   (ly:paper-output-scale paper)))))))
 	     sub-fonts)))))
 
 (define (simple-font-load-command paper font)
@@ -100,7 +102,7 @@
     (inexact->exact
      (round (* 1000
 	       (ly:font-magnification font)
-	       (ly:paper-outputscale paper))))))
+	       (ly:paper-output-scale paper))))))
 
 (define (font-load-command paper font)
   (if (pair? (ly:font-sub-fonts font))
@@ -111,14 +113,14 @@
   (string-append
    ;; UGH. FIXME.
    "\\def\\lilypondpaperunit{mm}%\n"
-   (tex-number-def "lilypondpaper" 'outputscale
+   (tex-number-def "lilypondpaper" 'output-scale
 		   (number->string (exact->inexact
-				    (ly:paper-outputscale paper))))
+				    (ly:paper-output-scale paper))))
    (tex-string-def "lilypondpaper" 'papersize
 		   (eval 'papersizename (ly:output-def-scope paper)))
    ;; paper/layout?
-   (tex-string-def "lilypondpaper" 'inputencoding
-		   (eval 'inputencoding (ly:output-def-scope paper)))
+   (tex-string-def "lilypondpaper" 'input-encoding
+		   (eval 'input-encoding (ly:output-def-scope paper)))
 
    (apply string-append
 	  (map (lambda (x) (font-load-command paper x))
@@ -131,7 +133,7 @@
 		     "{" (sanitize-tex-string str) "}%\n")))
 
 (define (header paper page-count classic?)
-  (let ((scale (ly:output-def-lookup paper 'outputscale))
+  (let ((scale (ly:output-def-lookup paper 'output-scale))
 	(texpaper (string-append
 		   (ly:output-def-lookup paper 'papersizename)
 		   "paper"))
@@ -149,16 +151,13 @@
 	 "")
 
      (tex-string-def
-      "lilypondpaper" 'linewidth
-      (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth))))
+      "lilypondpaper" 'line-width
+      (ly:number->string (* scale (ly:output-def-lookup paper 'line-width))))
      "\\def\\lilyponddocumentclassoptions{"
      (sanitize-tex-string texpaper)
      (if landscape? ",landscape" "")
      "}%\n"
-     (tex-string-def
-      "lilypondpaper" 'interscoreline
-      (ly:number->string
-       (* scale (ly:output-def-lookup paper 'interscoreline)))))))
+     )))
 
 (define (header-end)
   (string-append
@@ -193,7 +192,7 @@
   (let* ((filename (format "~a.tex" basename))
 	 (outputter  (ly:make-paper-outputter (open-file filename "wb") "tex"))
 	 (paper (ly:paper-book-paper book))
-	 (pages (ly:paper-book-pages book))
+	 (page-stencils (map page-stencil (ly:paper-book-pages book)))
 	 (last-page (car (last-pair pages)))
 	 (with-extents
 	  (eq? #t (ly:output-def-lookup paper 'dump-extents))))
@@ -201,14 +200,14 @@
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
-      (header paper (length pages) #f)
+      (header paper (length page-stencils) #f)
       (define-fonts paper)
       (header-end)))
     (ly:outputter-dump-string outputter "\\lilypondnopagebreak\n")
     (for-each
      (lambda (page)
        (dump-page outputter page (eq? last-page page) with-extents))
-     pages)
+     page-stencils)
     (ly:outputter-dump-string outputter "\\lilypondend\n")
     (ly:outputter-close outputter)
     (postprocess-output book framework-tex-module filename
@@ -291,23 +290,27 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
-    (postscript->pdf (if (string? papersizename) papersizename "a4")
+	 (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)))
+    (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
+		     (* paper-height output-scale (/ (ly:bp 1)))
 		     (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
 	 (resolution (ly:output-def-lookup defs 'pngresolution))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
+	 (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)))
     (postscript->png
      (if (number? resolution)
 	 resolution
 	 (ly:get-option 'resolution))
 
-     (if (string? papersizename)
-	 papersizename
-	 "a4")
-     
+     (* paper-width output-scale (/ (ly:bp 1)))
+     (* paper-height output-scale (/ (ly:bp 1)))
+
      (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)