Merge fix.

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

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index a1358c9506a0f0992a82bcfa97499599599cacdf..38c085a48edf60c25df89dc8d1a62cb280529680 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -47,10 +47,10 @@
    (string-encode-integer
     (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
 
-(define (font-load-command bookpaper font)
+(define (font-load-command paper font)
   (let* ((coding-alist (ly:font-encoding-alist font))
-        (font-encoding (assoc-get 'output-name coding-alist))
-        )
+        (font-encoding (assoc-get 'output-name coding-alist)))
+    
     (string-append
      "\\font\\lilypond" (tex-font-command font) "="
      (ly:font-filename font)
@@ -58,33 +58,34 @@
      (ly:number->string (inexact->exact
                         (round (* 1000
                                   (ly:font-magnification font)
-                                  (ly:bookpaper-outputscale bookpaper)))))
+                                  (ly:paper-outputscale paper)))))
      "\n"
      "\\def\\" (tex-font-command font) "{%\n"
      ;; UGH.  Should be handled via alist.
      (if (equal? "Extended-TeX-Font-Encoding---Latin" font-encoding)
-        "  \\fontencoding{T1}\\selectfont"
+        "  \\lilypondfontencoding{T1}"
         "  ")
      "\\lilypond" (tex-font-command font)
      "}\n"
      )))
 
 
-(define (define-fonts bookpaper)
+(define (define-fonts paper)
   (string-append
    ;; UGH. FIXME.   
    "\\def\\lilypondpaperunit{mm}\n"
    (tex-number-def "lilypondpaper" 'outputscale
                   (number->string (exact->inexact
-                                   (ly:bookpaper-outputscale bookpaper))))
+                                   (ly:paper-outputscale paper))))
    (tex-string-def "lilypondpaper" 'papersize
-                  (eval 'papersize (ly:output-def-scope bookpaper)))
+                  (eval 'papersize (ly:output-def-scope paper)))
+   ;; paper/layout?
    (tex-string-def "lilypondpaper" 'inputencoding
-                  (eval 'inputencoding (ly:output-def-scope bookpaper)))
+                  (eval 'inputencoding (ly:output-def-scope paper)))
 
    (apply string-append
-         (map (lambda (x) (font-load-command bookpaper x))
-              (ly:bookpaper-fonts bookpaper)))))
+         (map (lambda (x) (font-load-command paper x))
+              (ly:paper-fonts paper)))))
 
 (define (header-to-file fn key val)
   (set! key (symbol->string key))
@@ -122,9 +123,13 @@
       (string-append "\\def\\" prefix (symbol->tex-key key)
                     "{" (sanitize-tex-string str) "}%\n")))
 
-(define (header bookpaper page-count classic?)
-  (let ((scale (ly:output-def-lookup bookpaper 'outputscale)))
-
+(define (header paper page-count classic?)
+  (let ((scale (ly:output-def-lookup paper 'outputscale))
+       (texpaper (string-append
+                  (ly:output-def-lookup paper 'papersizename)
+                  "paper"))
+       (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))))
+    
     (string-append
      "% Generated by LilyPond "
      (lilypond-version) "\n"
@@ -139,12 +144,15 @@
 
      (tex-string-def
       "lilypondpaper" 'linewidth
-      (ly:number->string (* scale (ly:output-def-lookup bookpaper 'linewidth))))
-
+      (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth))))
+     "\\def\\lilyponddocumentclassoptions{"
+     texpaper
+     (if  landscape? ",landscape" "")
+      "}%\n"
      (tex-string-def
       "lilypondpaper" 'interscoreline
       (ly:number->string
-       (* scale (ly:output-def-lookup bookpaper 'interscoreline)))))))
+       (* scale (ly:output-def-lookup paper 'interscoreline)))))))
 
 (define (header-end)
   (string-append
@@ -178,20 +186,20 @@
        "}\\vss\n}\n\\vfill\\lilypondpagebreak\n")))
 
 (define-public (output-framework outputter book scopes fields basename )
-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))
         (pages (ly:paper-book-pages book))
         (last-page (car (last-pair pages)))
         (with-extents
-         (eq? #t (ly:output-def-lookup bookpaper 'dump-extents)))
+         (eq? #t (ly:output-def-lookup paper 'dump-extents)))
         )
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
-      (header bookpaper (length pages) #f)
-      (define-fonts bookpaper)
+      (header paper (length pages) #f)
+      (define-fonts paper)
       (header-end)))
-    (ly:outputter-dump-string outputter "\\nopagebreak")
+    (ly:outputter-dump-string outputter "\\lilypondnopagebreak")
     (for-each
      (lambda (page) (dump-page outputter page (eq? last-page page) with-extents))
      pages)
@@ -213,7 +221,7 @@
 
 (define-public (output-classic-framework
                outputter book scopes fields basename)
-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
     (for-each
@@ -221,10 +229,10 @@
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME
-      (header bookpaper (length lines) #f)
+      (header paper (length lines) #f)
       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)
-      (define-fonts bookpaper)
+      (define-fonts paper)
       (header-end)))
 
     (for-each
@@ -234,17 +242,17 @@
 
 (define-public (output-preview-framework
                outputter book scopes fields basename )
-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book)))
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME
-      (header bookpaper (length lines) #f)
+      (header paper (length lines) #f)
       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)
-      (define-fonts bookpaper)
+      (define-fonts paper)
       (header-end)))
 
     (dump-line outputter (car lines) #t)
@@ -253,7 +261,7 @@
 
 (define-public (convert-to-pdf book name)
   (let*
-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))
        (size (ly:output-def-lookup defs 'papersize)))
 
     (postscript->pdf (if (string? size) size "a4")
@@ -264,7 +272,7 @@
 
 (define-public (convert-to-png book name)
   (let*
-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))
        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png
@@ -273,18 +281,26 @@
      )))
 
 (define-public (convert-to-ps book name)
-  (let*
-      ((cmd (string-append "dvips -u+ec-mftrace.map -u+lilypond.map -Ppdf "
-                          (basename name ".tex"))))
-
+  (let* ((paper (ly:paper-book-paper book))
+        (papersize (ly:output-def-lookup paper 'papersizename))
+        (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
+        (cmd (string-append "dvips -t " papersize
+                            (if landscape? " -t landscape " " ") 
+                            "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
+                            (basename name ".tex"))))
+    
     (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
     (newline (current-error-port))
     (system cmd)))
 
 (define-public (convert-to-dvi book name)
   (let*
-      ((cmd (string-append "latex \\\\nonstopmode \\\\input " name)))
+      ((curr-extra-mem (string->number (regexp-substitute/global #f " *%.*\n?"
+                                                                (ly:kpathsea-expand-variable "$extra_mem_top")
+                                                                'pre "" 'post)))
+       (cmd (string-append "latex \\\\nonstopmode \\\\input " name)))
 
+    (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
     (newline (current-error-port))
     (display (format #f (_ "Invoking ~S") cmd) (current-error-port))
     (newline (current-error-port))