From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 21 Mar 2008 14:02:24 +0000 (+0100)
Subject: Try to make the doc build with texi2html
X-Git-Tag: release/2.11.58-1~32^2~191
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3527e994fe657034eae51617ae269cff10d6f31;p=lilypond.git

Try to make the doc build with texi2html
---

diff --git a/config.make.in b/config.make.in
index 4d714c3d3f..da0123311f 100644
--- a/config.make.in
+++ b/config.make.in
@@ -126,6 +126,7 @@ LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@
 LN = @LN@
 LN_S = @LN_S@
 MAKEINFO_PROGRAM = @MAKEINFO@
+TEXI2HTML_PROGRAM = @TEXI2HTML@
 METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
 MSGFMT = @MSGFMT@
diff --git a/configure.in b/configure.in
index b15a0b0de0..b9e427a66e 100644
--- a/configure.in
+++ b/configure.in
@@ -128,7 +128,8 @@ AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
 CPPFLAGS="$save_CPPFLAGS"
 
 
-STEPMAKE_MAKEINFO(REQUIRED, 4.11)
+# We check for makeinfo below, too. Really duplicate that check?
+## STEPMAKE_MAKEINFO(REQUIRED, 4.11)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
@@ -176,6 +177,7 @@ STEPMAKE_GUILE(OPTIONAL)
 STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.79)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
new file mode 120000
index 0000000000..69081df507
--- /dev/null
+++ b/lilypond-texi2html.init
@@ -0,0 +1 @@
+../lilypond-texi2html.init
\ No newline at end of file
diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 1f4865d009..1964e38334 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,9 +1,15 @@
 $(outdir)/%/index.html: $(outdir)/%.texi
 	mkdir -p $(dir $@)
-	-$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	ifneq "$(ISOLANG)" ""
+		TEXI2HTML_LANG=--lang=$(ISOLANG)
+	endif
+	-$(TEXI2HTML) --I=$(outdir) --output=$(outdir)/$* --split=section $(TEXI2HTML_LANG) $<
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi
-	-$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
+	ifneq "$(ISOLANG)" ""
+		TEXI2HTML_LANG=--lang=$(ISOLANG)
+	endif
+	-$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $< 
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
 	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index c0a2db5733..8dbc19f835 100644
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -11,6 +11,9 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
 MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
+TEXI2HTML_FLAGS += --init-file=$(top-src-dir)/lilypond-texi2html.init --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
+TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
+
 TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
 TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
 
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 88a4fe47a2..9197cdfd87 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -33,11 +33,13 @@ endif
 $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep
 	$(MAKEINFO) -I$(outdir) --output=$@ $<
 
+
+# TODO: Pass -D bigpage to texi2html
 $(outdir)/%-big-page.html: $(outdir)/%.texi
-	$(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
+	$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $< 
 
 $(outdir)/%.html: $(outdir)/%.texi
-	$(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+	$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $<
 
 $(outdir)/%.html.omf: %.texi
 	$(call GENERATE_OMF,html)
@@ -50,7 +52,7 @@ $(outdir)/%.ps.gz.omf: %.texi
 
 $(outdir)/%/index.html: $(outdir)/%.texi
 	mkdir -p $(dir $@)
-	$(MAKEINFO) -I $(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	$(TEXI2HTML) --I=$(outdir) --output=$(dir $@) $(TEXI2HTML_LANG) --split=section $<
 
 $(outdir)/%.pdf: $(outdir)/%.texi
 	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 4ee7cefa47..c9c9c49e73 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -15,6 +15,8 @@ TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
+TEXI2HTML_FLAGS = 
+TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
 
 # info stuff
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))