From: hanwen <hanwen>
Date: Wed, 6 Oct 2004 23:21:55 +0000 (+0000)
Subject: (convert-to-dvi): use max of current
X-Git-Tag: release/2.3.24^2~80
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e843da47aa2c6bf852a4a6abddcca515e49bd671;p=lilypond.git

(convert-to-dvi): use max of current
extra_mem_top and 1M.
---

diff --git a/ChangeLog b/ChangeLog
index 1259cccbdb..e6d7bebe0b 100644
--- 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 6a5bfe6b1c..8e2c65b635 100644
--- 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 9f173777a0..6dbdbc02b6 100644
--- 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 ", "))