From f9a103dea488ebe808760556c7db7217d3c59355 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 10 Apr 2010 09:59:15 +0200 Subject: [PATCH] Doc: [web] Make texi2html notice non-constant, refactor cut-and-paste coding. This gives nice and clean error/warning feedback per language. --- Documentation/lilypond-texi2html.init | 2 +- make/website.make | 31 ++++++--------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init index b943c3aabb..343847826b 100644 --- a/Documentation/lilypond-texi2html.init +++ b/Documentation/lilypond-texi2html.init @@ -566,7 +566,7 @@ $Texi2HTML::Config::DOCTYPE = ' "lilypond-web.css", TITLE => "Patrick McCarty's design"} diff --git a/make/website.make b/make/website.make index 02e6b198d0..8aaba37060 100644 --- a/make/website.make +++ b/make/website.make @@ -60,20 +60,7 @@ website-version: $(CREATE_WEBLINKS) $(top-src-dir) > $(OUT)/weblinks.itexi website-xrefs: website-version - $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \ - -I $(OUT) -o $(OUT) --split=node \ - $(top-src-dir)/Documentation/web.texi - # normal manuals - for m in $(MANUALS); do \ - b=`basename "$$m" .texi`; \ - d=`basename "$$b" .tely`; \ - $(EXTRACT_TEXI_FILENAMES) \ - -I $(top-src-dir)/Documentation/ \ - -I $(top-src-dir)/Documentation/"$$d"/ \ - -I $(OUT) -o $(OUT) "$$m" ; \ - done - # translations - for l in $(WEB_LANGS); do \ + for l in '' $(WEB_LANGS); do \ $(EXTRACT_TEXI_FILENAMES) \ -I $(top-src-dir)/Documentation/ \ -I $(top-src-dir)/Documentation/"$$l" \ @@ -96,22 +83,16 @@ website-xrefs: website-version website-texinfo: website-version website-xrefs - $(TEXI2HTML) --prefix=index \ - --split=section \ - --I=$(top-src-dir)/Documentation/ \ - --I=$(OUT) \ - --init-file=$(texi2html-init-file) \ - -D web_version \ - --output=$(OUT)/website/ \ - $(top-src-dir)/Documentation/web.texi - # translations - for l in $(WEB_LANGS); do \ + for l in '' $(WEB_LANGS); do \ + if test -n "$$l"; then \ + langopt=--lang="$$l"; \ + fi; \ $(TEXI2HTML) --prefix=index \ --split=section \ --I=$(top-src-dir)/Documentation/"$$l" \ --I=$(top-src-dir)/Documentation/ \ --I=$(OUT) \ - --lang="$$l" \ + $$langopt \ --init-file=$(texi2html-init-file) \ -D web_version \ --output=$(OUT)/"$$l" \ -- 2.39.2