Web build: improve website target.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 7fdb79671f58b64ee91db17b7befab764e238348..133f09854a03b0c6d62fa0684a8fb521e9a808c0 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -98,12 +98,13 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
 ifeq ($(out),www)
-website: $(outdir)/web.texi
-       mkdir -p $(outdir)/upload/
+website: $(outdir)/web.texi $(XREF_MAPS_DIR)/web.xref-map $(outdir)/version.itexi $(outdir)/pictures/
+       mkdir -p $(outdir)/website/
        $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version \
-               --output=$(outdir)/upload/ $(outdir)/web.texi
-       cp $(top-src-dir)/Documentation/css/*.css $(outdir)/upload/
-       #cd out-website && ln -sf ../$(outdir)/pictures pictures
+               --output=$(outdir)/website/ $(outdir)/web.texi
+       cp $(top-src-dir)/Documentation/css/*.css $(outdir)/website/
+       cd $(outdir)/website && ln -sf ../../pictures/$(outdir) pictures
+       cd $(outdir)/website && ln -sf ../../web/examples/$(outdir) examples
 endif
 
 

diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 5ba7eefd8702923c69a360321bc821f731ce2514..39696ef36565787b7e4ccc10f0a2f92692c69e51 100644 (file)
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -596,58 +596,107 @@ the latest binary:
 
 @subheading Manuals
 
+@divClass{keep-bullets}
+@itemize
+
+@item
 Learning:
+
 @manualDevelLearningSplit
-@manualDevelLearningBig
-@manualDevelLearningPdf
+@* @manualDevelLearningBig
+@* @manualDevelLearningPdf
 
+@item
 Glossary:
+
 @manualDevelGlossarySplit
+
 @manualDevelGlossaryBig
+
 @manualDevelGlossaryPdf
 
+@item
 Essay:
+
 @manualDevelEssaySplit
+
 @manualDevelEssayBig
+
 @manualDevelEssayPdf
 
 
+@c separate introduction, regular, infrequent manuals
+@smallspace
+
+@item
 Notation:
+
 @manualDevelNotationSplit
+
 @manualDevelNotationBig
+
 @manualDevelNotationPdf
 
+@item
 Usage:
+
 @manualDevelUsageSplit
+
 @manualDevelUsageBig
+
 @manualDevelUsagePdf
 
+@item
 Snippets:
+
 @manualDevelSnippetsSplit
+
 @manualDevelSnippetsBig
+
 @manualDevelSnippetsPdf
 
 
+@c separate introduction, regular, infrequent manuals
+@smallspace
+
+@item
 Web:
+
 @manualDevelWebSplit
+
 @manualDevelWebBig
+
 @manualDevelWebPdf
 
+@item
 Changes:
+
 @manualDevelChangesSplit
+
 @manualDevelChangesBig
+
 @manualDevelChangesPdf
 
+@item
 Extend:
+
 @manualDevelExtendingSplit
+
 @manualDevelExtendingBig
+
 @manualDevelExtendingPdf
 
+@item
 Internals:
+
 @manualDevelInternalsSplit
+
 @manualDevelInternalsBig
+
 @manualDevelInternalsPdf
 
+@end itemize
+@divEnd
 @divEnd
 
 
@@ -667,21 +716,21 @@ them.  For more information about different jobs, see
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{../contributor/index.html, Contributor's guide (split HTML)}:
+@item
+@manualDevelContributorSplit{}:
 the manual is split between many HTML pages.
 @*@ @  @emph{(small download for each page)}
 
-@item @uref{../contributor-big-page.html, Contributor's guide (big HTML)}:
+@item
+@manualDevelContributorBig{}:
 read this manual as one huge HTML page.
 @*@ @  @emph{(large single download, 500 kb)}
 
-@item @uref{../contributor.pdf, contributor.pdf}:
+@item
+@manualDevelContributorPdf{}:
 download as a PDF file.
 @*@ @  @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, contributor.info}:
-@c GNU info format for documentation.  TODO, link broken.
-
 @end itemize
 @divEnd
 @divEnd

diff --git a/Documentation/web/manuals.itexi b/Documentation/web/manuals.itexi
index 095fc0ccaaddc355d842b81b2249a436dadcabc7..dbb59efe05ba27948c854216d20bd859718c55f3 100644 (file)
--- a/Documentation/web/manuals.itexi
+++ b/Documentation/web/manuals.itexi
@@ -10,7 +10,7 @@
 @unnumbered Manuals
 
 @divClass{heading-center}
-@heading Documentation for LilyPond @version
+@heading Documentation for LilyPond @versionStable
 
 @divEnd