(convert-to-dvi): use max of current

extra_mem_top and 1M.

diff --git a/ChangeLog b/ChangeLog
index 1259cccbdb4322f5d05a39497d1103cf2e62d0a4..e6d7bebe0b62b83c037cdb66145762a2348b2c4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/framework-tex.scm (convert-to-dvi): use max of current
+       extra_mem_top and 1M.
+
        * lily/kpath.cc (LY_DEFINE): ly_kpathsea_expand_variable. New
        function.
 

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 6a5bfe6b1ce3c2468561cfee77baf0c557e9f6ae..8e2c65b63508754a1663575911aaddbb7f224533 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -283,10 +283,12 @@
 
 (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)))
 
-    (if (not (string? (getenv "extra_mem_top")))
-       (setenv "extra_mem_top" "1000000"))
+    (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))

diff --git a/scm/lily.scm b/scm/lily.scm
index 9f173777a0e83c72d8bd6eae1fa14348671adbb6..6dbdbc02b6b370dfdf1e2da7c2baa49a4bb05f64 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -19,6 +19,7 @@
             (srfi srfi-1)  ; lists
             (srfi srfi-13)) ; strings
 
+
 ; my display
 
 (define-public (myd k v) (display k) (display ": ") (display v) (display ", "))