diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2010-04-10 09:59:15 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2010-04-10 09:59:15 +0200 |
| commit | f9a103dea488ebe808760556c7db7217d3c59355 (patch) | |
| tree | f7772f67f7cc8f5720daacd3a3d84b1cfe5e9d1f | |
| parent | 4648f322f632200b7f44cd61d8462910ce18d49a (diff) | |
Doc: [web] Make texi2html notice non-constant, refactor cut-and-paste coding.
This gives nice and clean error/warning feedback per language.
| -rw-r--r-- | Documentation/lilypond-texi2html.init | 2 | ||||
| -rw-r--r-- | 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 = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Tran ); sub web_settings() { - print STDERR "Initializing settings for web site\n"; + print STDERR "Initializing settings for web site: [$Texi2HTML::THISDOC{current_lang}]\n"; $Texi2HTML::Config::BODYTEXT = ""; @Texi2HTML::Config::CSS_REFS = ( {FILENAME => "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" \ |