From: fred Date: Wed, 27 Mar 2002 01:19:05 +0000 (+0000) Subject: lilypond-1.4.1 X-Git-Tag: release/1.5.59~635 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=24b17bd6e633bcc82bd51e10dd8f0d7efa7e2cb0;p=lilypond.git lilypond-1.4.1 --- diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 46149c1f5f..0dd22f2f2e 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -21,10 +21,9 @@ local-WWW: copy-for-me txt-to-html $(outdir)/regression-test.ps.gz $(outdir)/reg copy-for-me: $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true +OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES))) + +# cd $(outdir) rule gets bit hairy for --srcdir configure builds txt-to-html: - $(foreach a, $(README_TOP_FILES), \ - echo "" > $(outdir)/$(a).html;\ - cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\ - echo "" >> $(outdir)/$(a).html\ - && ) true + $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES) $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(README_TOP_FILES))) diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index f02cd2c461..183762facc 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -13,7 +13,8 @@ default: local-doc #urg default local-WWW target uses footify before its time; # must add footify with txt-to-html target -local-WWW: $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) $(OUT_HTMLFILES) txt-to-html +OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS))) +local-WWW: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html copy-for-me: $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true @@ -22,9 +23,5 @@ $(outdir)/%.txt: % cp $< $@ txt-to-html: - $(foreach a, $(TEXTS),\ - echo "" > $(outdir)/$(a).html;\ - cat $(outdir)/$(a).txt >> $(outdir)/$(a).html;\ - echo "" >> $(outdir)/$(a).html\ - && ) true + $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES) $(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(TEXTS))) diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index e3a24669aa..186ae7507b 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -13,8 +13,7 @@ This document describes how to build LilyPond on Unix platforms. It is also known to run and compile on Windows NT/95/98 as well. More information on this topic can be found at the -@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/, LilyPond on Windows -page}. +@uref{http://www.lilypond.org/gnu-windows/, LilyPond on Windows page}. @html diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 7f91a261de..2e0cf50d2c 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -50,12 +50,6 @@ default: info: $(INFO_FILES) -# The new pretest version of makeinfo, 4.0a splits html files into their own -# directory. Available from -# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz -SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a|b)') - - # Generic rule using % twice not possible? # $(outdir)/%/%.html: $(outdir)/%.texi $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi @@ -70,20 +64,24 @@ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-interna -cp -f $(outdir)/lilypond-internals/index.html $@ $(deep-footify) $(shell find $(outdir)/$(*F)/*.html) -ifneq ($(SPLITTING_MAKEINFO),) + +ifeq ($(SPLITTING_MAKEINFO),yes) DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html -else +local-WWW: rm-deep-symlinks -DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html - -local-WWW: deep-symlinks +rm-deep-symlinks: + cd $(outdir) && rm -f lilypond lilypond-internals; true +else +DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html # Links referred to by Documentation index -LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html +LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html + +local-WWW: deep-symlinks deep-symlinks: cd $(outdir) && rm -f lilypond && ln -s . lilypond diff --git a/aclocal.m4 b/aclocal.m4 index 2fed2f24e9..f363f48a1c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -537,6 +537,32 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [ AC_CHECK_FUNCS(gettext) ]) +AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ + AC_CHECK_PROGS(MAKEINFO, makeinfo, error) + if test "$MAKEINFO" != "error"; then + AC_MSG_CHECKING(whether makeinfo can split html by @node) + mkdir -p out + makeinfo --html --output=out/split < out/foe.html, + # -o is a bit overkill? + # outfile = os.path.basename (os.path.splitext(a)[0]) + '.html' + outfile = os.path.splitext(a)[0] + '.html' try: os.unlink(outfile) @@ -12,10 +15,10 @@ for a in sys.argv[1:]: pass s = r""" - -%s - -""" % open (a).read () +

+%s
+

+""" % open (a).read () open (outfile, 'w').write (s)