* Documentation/topdocs/INSTALL.texi (Top): add GS bugfix requirement.

* scm/ps-to-png.scm: remove dir-re function.
(make-ps-images): generate page names, instead of globbing them.
This brings down LilyPond memory usage for make web by a factor
10. (backportme?)

diff --git a/ChangeLog b/ChangeLog
index 8d961e6582ef77dee3c493dacdf58cf4e016aa36..30b4e86e796cd5ab8ead271091fe54e6b505c007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/topdocs/INSTALL.texi (Top): add GS bugfix requirement.
+
        * input/regression/*.ly: formatting clean-up. Default layout
        before music expression.
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 4993a6470254f69db0160c11b94b0b0568f162da..6b3636b5da4c19ec1f7916ab8744172eda71566d 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -113,7 +113,7 @@ software
 (version 1.6.5 or newer).
 @item @uref{http://www.python.org,Python} (version 2.1 or newer).
 @item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or
-newer).
+newer)
 @end itemize
 
 @subsection Building documentation
@@ -135,6 +135,9 @@ Building the website requires some additional tools and packages
 @item ImageMagick
 @item International fonts (see input/regression/utf-8.ly for hints
 about which font packages are necessary for your platform)
+@item Ghostscript, 8.15 with the patch from
+@uref{http://bugs.ghostscript.com/show_bug.cgi?id=688154}
+
 @end itemize
 
 The HTML files can be installed into the standard documentation path

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 448515c619192b44f3727a9e620a9e33fd4637a6..bcec04b21f19b1714e2b1bc2d7cc8b2a489c25b8 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -7,18 +7,14 @@ export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 export DVIPSHEADERS:=$(builddir)/mf/out::
 
-
-
-
 the-script-dir=$(wildcard $(script-dir))
 
-
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png --header=texidoc -I $(srcdir)/input/test -dinternal-type-checking -danti-alias-factor=2 "
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png --header=texidoc -I $(srcdir)/input/test -dinternal-type-checking -danti-alias-factor=2 -dgs-font-load"
 
 
 #texi-html for www only:

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index f43c3f19c3a4bf9eb8cbaf037d7e0ce2f25e28d8..44b32714b554ad5b344d5565754e7ba5d831d685 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -13,6 +13,7 @@
  (srfi srfi-1)
  (srfi srfi-13)
  (srfi srfi-14)
+ (lily)
  )
 
 ;; gettext wrapper for guile < 1.7.2
@@ -47,7 +48,13 @@
    str))
 
 (define (gulp-file nm len)
-  (gulp-port (open-file nm "r") len))
+
+  ;; string routines barf when strlen() != string-length,.
+  ;; which may happen as side effect of read-string!/partial.
+  
+;  (gulp-port (open-file nm "r") len))
+  (ly:gulp-file nm len))
+  
 
 ;;; ARGH - cuases memory usage to explode with GUILE cvs.