]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4648f32)
Doc: [web] Make texi2html notice non-constant, refactor cut-and-paste coding.
authorJan Nieuwenhuizen <janneke@gnu.org>
Sat, 10 Apr 2010 07:59:15 +0000 (09:59 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Sat, 10 Apr 2010 07:59:15 +0000 (09:59 +0200)
This gives nice and clean error/warning feedback per language.

Documentation/lilypond-texi2html.init patch | blob | history
make/website.make patch | blob | history

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index b943c3aabbb4348104db9d7f8c551e7d042ca8a1..343847826b9ceaef32a9ddcb757cc535760fd708 100644 (file)
--- 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 02e6b198d07d1741dedfaf7cafec357c8b3a6905..8aaba370600c28a068ef9a57d4ee233ea447993f 100644 (file)
--- 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" \
Debian packaging of lilypond