* GNUmakefile.in (web-doc): Fix typos.

* tex/lilyponddefs.tex (\lilypondspecial): Don't scan
`music-drawing-routines.ps' but emit \special{header=...} once.
* scm/tex.scm (header-end): Updated.

diff --git a/ChangeLog b/ChangeLog
index 54a5c5f3fa736c6788572b7813168abd426da4f0..c02ec7e616308050a7952da7f7c3cede81f7913d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-19  Werner Lemberg  <wl@gnu.org>
+
+       * GNUmakefile.in (web-doc): Fix typos.
+       * tex/lilyponddefs.tex (\lilypondspecial): Don't scan
+       `music-drawing-routines.ps' but emit \special{header=...} once.
+       * scm/tex.scm (header-end): Updated.
+
 2002-10-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/stem-engraver.cc (acknowledge_grob): don't crash on

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 94f0da5eaaf265e9674fa716a4bd2f29fa51a152..568118f0a9b600e1fb899e3a166c7bca864209c2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -44,10 +44,10 @@ doc: run-reqs
        $(MAKE) -C Documentation
 
 web-doc: web-reqs
-       $(MAKE) out=www -C LILYPOND_BOOK_FORMAT=tex-html input/regression/ WWW
-       $(MAKE) out=www -C LILYPOND_BOOK_FORMAT=tex-html input/template/ WWW
-       $(MAKE) out=www -C LILYPOND_BOOK_FORMAT=tex-html input/test/ WWW
-       $(MAKE) out=www -C LILYPOND_BOOK_FORMAT=tex-html Documentation WWW
+       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/regression/ WWW
+       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/template/ WWW
+       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/test/ WWW
+       $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C Documentation WWW
        $(MAKE) footify
 
 pfa-fonts:

diff --git a/scm/tex.scm b/scm/tex.scm
index 9073bf6cd6dde878f254f0d7b9199077c0ad2904..09beffa9ed0c54774294e7090213475196e37da8 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -175,7 +175,7 @@
    "\\fi\n"
    "\\outputscale = \\lilypondpaperoutputscale\\lilypondpaperunit\n"
    "\\lilypondstart\n"
-   "\\special{\\string!\\lilypondspecial}%\n"
+   "\\lilypondspecial\n"
    "\\lilypondpostscript\n"))
 
 ;; Note: this string must match the string in ly2dvi.py!!!

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 1cf39f92d319ed03fff4ae93469919e1f8999264..8f6bae4167d6754e7fb9a707d10f7252cd76fdc9 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -125,26 +125,11 @@
 
 \newread\lilypondinput
 
-% after executing the following code, \lilypondspecial contains the
-% contents of `music-drawing-routines.ps'
-\lilypondifundefined{lilypondspecial}
-  {
-    \begingroup
-      \openin\lilypondinput music-drawing-routines.ps
-      \xdef\lilypondspecial{}
-      \lilypondloop
-        \endlinechar \lilyponddefsELC
-        \catcode`\^^M 10\relax
-        \read\lilypondinput to \lilypondspecialline
-        \expandafter\xdef\expandafter\lilypondspecial\expandafter{
-          \lilypondspecial\lilypondspecialline
-        }
-        \ifeof\lilypondinput
-      \lilypondrepeat
-      \closein\lilypondinput
-    \endgroup
-  }
-  {}
+% the following macro is executed only once
+\gdef\lilypondspecial{
+  \special{header=music-drawing-routines.ps}
+  \gdef\lilypondspecial{}
+}
 
 % the feta characters
 \input feta20