diff options
| author | Graham Percival <graham@percival-music.ca> | 2009-11-27 19:52:20 +0100 |
|---|---|---|
| committer | John Mandereau <john.mandereau@gmail.com> | 2009-11-27 20:07:23 +0100 |
| commit | 469754de2c595b6dbf269f04b1a59f5705e3045f (patch) | |
| tree | b1a0e6f568a2b324b6fc8e3dfcc77b52c56e6ce3 /make/doc-i18n-root-vars.make | |
| parent | d5d1a5e919f8da004962cbe963983245f3042aa9 (diff) | |
Docs: merge the two Texi2HTML init files
Formatting for the web site is enabled through "-D web_manual"Texinfo
command line option.
Cherry-picked, squashed together by John from commits in
dev/gperciva branch:
86dd84e0ed4248e931ce6998ac94de4bd9969809
89ba33490b1dd18b69a4fcb98fea70b69841aece
8dd8d653cb43bc6b86ac014b022f9834695b24f5
f1ecf05f6b816e7f2e890a01c1f862f99f2092e9
e3fbdebeac091b8be5d1d4b186f3cdaf9aa50fdb
In addition to this merging, John made a few subsequent changes:
- use --split=subsubsection for the website, which makes
extract_texi_filenames.py generate a correct map;
- reorder Texi2HTML command line arguments to make sure the init file
catches the ones which are necessary;
- splitted HTML docs: downcase all filenames (manuals and web site),
and sections anchors (which fix the duplicate anchors issues that
makes Opera barf);
- fix translated docs map files loading.
Diffstat (limited to 'make/doc-i18n-root-vars.make')
| -rw-r--r-- | make/doc-i18n-root-vars.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index fed399b8ae..9171461c38 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -53,11 +53,11 @@ TEXI2HTML_LANG = --lang=$(ISOLANG) endif DOC_TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init -WEB_TEXI2HTML_INIT =--init-file=$(top-src-dir)/Documentation/web-texi2html.init +WEB_TEXI2HTML_INIT =-D web_manual --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init TEXI2HTML_INIT = $(DOC_TEXI2HTML_INIT) DOC_TEXI2HTML_SPLIT = --prefix=index --split=section -WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files +WEB_TEXI2HTML_SPLIT = --prefix=index --split=subsubsection --node-files TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT) $(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\ @@ -66,7 +66,7 @@ $(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\ TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT) TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR) -TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG) +TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) ########### |