From: John Mandereau Date: Tue, 6 Feb 2007 21:01:48 +0000 (+0100) Subject: Rename foo.html big-page HTML Info docs to foo-big-page.html X-Git-Tag: release/2.10.17-1^2~23 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9781734d42a99060b83b92b00af946defb01325d;p=lilypond.git Rename foo.html big-page HTML Info docs to foo-big-page.html fixes foo/ vs. foo.html conflict in content negotiation --- diff --git a/Documentation/index.html.in b/Documentation/index.html.in index 11c99de056..09b45844b6 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -1,4 +1,10 @@ + LilyPond @TOPLEVEL_VERSION@ Documentation @@ -25,7 +31,7 @@
-

LilyPond documentation

+

LilyPond documentation

@@ -45,9 +51,6 @@ Tutorial
(start here) -
  • - Tutoriel en français -
    (for French-speaking users) @@ -69,7 +72,7 @@
    • User manual -(in one big page ~ 4 Mb, +(in one big page ~ 4 Mb, in PDF)
      (everything about LilyPond) @@ -83,7 +86,7 @@ in PDF)
      (for advanced users)
    • Glossary -(in one big page ~ 1 Mb, +(in one big page ~ 1 Mb, in PDF)
      (for non-English users) @@ -94,7 +97,7 @@ in PDF)
      • Program reference - (in one big page ~ 1 Mb) + (in one big page ~ 1 Mb)
        (definitions for tweaking) @@ -136,5 +139,9 @@ in PDF) +

        NOTE: like every HTML page in this + documentation, you can find at bottom links to translations of + this page in other languages. +

        diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index abf2c23852..c9a139ec14 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -15,8 +15,8 @@ OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png) OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\ $(ITELY_FILES:%.itely=$(outdir)/%.texi) -HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\ - $(outdir)/lilypond-internals.html +HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\ + $(outdir)/lilypond-internals-big-page.html # todo: add latex. PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf) @@ -155,8 +155,8 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_E # # One big page manual # -$(outdir)/lilypond.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) - $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< +$(outdir)/lilypond-big-page.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) + $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< # # The split internals reference @@ -168,8 +168,8 @@ $(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi # # One big page internals reference # -$(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi - $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< +$(outdir)/lilypond-internals-big-page.html: $(outdir)/lilypond-internals.texi + $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< # # The split glossary diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index 0274641da2..2242b6aeb8 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -53,15 +53,27 @@ @c @inforef{\NAME\,,lilypond-internals}@c @c using @ref without punctuation is OK without for formats other than info -@c annoying parentheses stripped by add-html-footer.py +@ifset bigpage + @macro internalsref{NAME} @vindex \NAME\ -@ref{\NAME\,,,lilypond-internals} +@ref{\NAME\,,,lilypond-internals-big-page} @end macro -@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly} -@macro inputfileref{DIR,NAME} -@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c +@macro rglos{NAME} +@vindex \NAME\ +@ref{\NAME\,,,music-glossary-big-page} +@end macro + +@end ifset + + +@ifclear bigpage + +@c annoying parentheses stripped by add-html-footer.py +@macro internalsref{NAME} +@vindex \NAME\ +@ref{\NAME\,,,lilypond-internals} @end macro @c annoying parentheses stripped by add-html-footer.py @@ -70,6 +82,14 @@ @ref{\NAME\,,,music-glossary} @end macro +@end ifclear + + +@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly} +@macro inputfileref{DIR,NAME} +@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c +@end macro + @c to get decent quotes in `foo' @macro q{TEXT} @html diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 5cf8c2d011..8dbd7167f9 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -4,6 +4,9 @@ $(outdir)/%.info: $(outdir)/%.texi $(MAKEINFO) -I $(outdir) --output=$@ $< +$(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 $< + $(outdir)/%.html: $(outdir)/%.texi $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<