Doc build: move general.texi back into a subdir.

- also add index.html.in to redirect into general/
  ("temporary" hack, pending better reorg of the build process)
- TODO: rename general.texi to web.texi

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 4e4bf89aa604c6302f6a49dad22f7d4190e2f35a..f91b178e8fda8664f50cf738e9703557c0b851a6 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -56,7 +56,7 @@ TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
-TOPDIR_HTML_MANUALS = general
+TOPDIR_HTML_MANUALS = 
 UNSPLITTED_HTML_MANUALS =
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
  $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
@@ -64,8 +64,7 @@ NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\
  $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual)))
 
 OUT_HTML_FILES = $(UNSPLITTED_HTML_MANUALS:%=$(outdir)/%.html)\
- $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html)\
- $(TOPDIR_HTML_MANUALS:%=$(outdir)/index.html)
+ $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html)
 DEEP_HTML_FILES = $(NOT_TOPDIR_HTML_MANUALS:%=$(outdir)/%/index.html)
 
 # Symlinks to refer to external source documents from split and non-split HTML
@@ -74,7 +73,7 @@ source-links = $(outdir)/source\
 
 # Other out files
 
-HTML_PAGE_NAMES= translations
+HTML_PAGE_NAMES= translations index
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
 MAIN_INFO_DOC = lilypond-notation
@@ -97,11 +96,11 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 ### Web site idiosyncrases
 
-$(outdir)/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(outdir)/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
+$(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
+$(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
 
-$(outdir)/index.html: $(outdir)/general.texi
-       $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/general.texi
+#$(outdir)/general/index.html:
+#      $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/general.texi
 
 ###########
 ### Targets
@@ -145,9 +144,6 @@ ifeq ($(out),www)
 local-WWW-1: $(OUT_TEXINFO_MANUALS) $(PDF_FILES) info
 
 local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES)
-       # fix links from other manuals to general
-       find $(outdir) -name "*.html" | xargs sed -i 's/..\/general\//..\//'
-       ls $(outdir)/*.html | xargs sed -i 's/<a href=\"..\//<a href=\"/'
 endif
 
 

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 83e4d0f723b398e9c18ac42c569793bfd1a431aa..db65589dad2de15a7dc21d1abc8e0e48cfad0508 100644 (file)
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -179,8 +179,8 @@ UNTRANSLATED NODE: IGNORE ME
 @macro exampleImage{IMAGE-FILE}
 @html
 <div class="float-center">
-  <a class="clickable" href="general/examples/\IMAGE-FILE\.png">
-    <img src="general/examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
+  <a class="clickable" href="examples/\IMAGE-FILE\.png">
+    <img src="examples/\IMAGE-FILE\-small.png" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     (click to enlarge)
@@ -200,8 +200,8 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
 <div class="float-\POSITION\">
-  <a class="clickable" href="pictures/\CLICK-FILE\.\CLICK-EXT\">
-    <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+  <a class="clickable" href="../pictures/\CLICK-FILE\.\CLICK-EXT\">
+    <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     \MORE-TEXT\
@@ -209,7 +209,7 @@ UNTRANSLATED NODE: IGNORE ME
 </div>
 @end html
 @iftex
-@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@image{../pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
@@ -218,10 +218,10 @@ UNTRANSLATED NODE: IGNORE ME
 
 @macro imageFloat{IMAGE-FILE, EXT, POSITION}
 @html
-<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
-@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@image{../pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\EXT\}
@@ -231,11 +231,11 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageId{ID, IMAGE-FILE, EXT, ALT}
 @html
 <div id="\ID\">
-  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
+  <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @end html
 @iftex
-@image{pictures/\IMAGE-FILE\,,,\ALT\}
+@image{../pictures/\IMAGE-FILE\,,,\ALT\}
 @end iftex
 @ifinfo
 @image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}

diff --git a/Documentation/css/lilypond-web.css b/Documentation/css/lilypond-web.css
index 600cd71d3fd11acb416b5b627288dd039a034976..858e15159ba58e85bd9ea6e455979db695d45eeb 100644 (file)
--- a/Documentation/css/lilypond-web.css
+++ b/Documentation/css/lilypond-web.css
@@ -15,7 +15,7 @@ body {
   max-width: 70em;
   font-size: 95%;
   line-height: 1.5;
-  background: #fff url(pictures/background-image.png) no-repeat 0 0;
+  background: #fff url(../pictures/background-image.png) no-repeat 0 0;
   text-align: justify;
   padding: 0;
   margin: 0 auto;
@@ -67,7 +67,7 @@ div#tocframe {
   top: 0;
   left: 0;
   right: 0;
-  background: #6aec7c url(pictures/nav-bg.png) repeat-x top left;
+  background: #6aec7c url(../pictures/nav-bg.png) repeat-x top left;
   max-width: 70em;
   font-size: 100%;
   line-height: 1;
@@ -92,7 +92,7 @@ div#tocframe {
 
 #tocframe > ul:first-child > li:first-child a {
   text-indent: -999em;
-  background: #6aec7c url(pictures/lily-home-nav-bg.png) no-repeat 50% 50%;
+  background: #6aec7c url(../pictures/lily-home-nav-bg.png) no-repeat 50% 50%;
   width: 9%;
   /* css3 no go yet? */
   border-bottom-left-radius: 30px;
@@ -101,19 +101,19 @@ div#tocframe {
 }
 
 #tocframe > ul:first-child > li:first-child a:hover {
-  background: #6aec7c url(pictures/lily-home-nav-hover.png) no-repeat 50% 50%;
+  background: #6aec7c url(../pictures/lily-home-nav-hover.png) no-repeat 50% 50%;
   width: 9%;
 }
 
 #tocframe > ul:first-child > li:first-child.toc_current a {
   text-indent: -999em;
-  background: url(pictures/lily-home-nav-active.png) no-repeat 50% 50%;
+  background: url(../pictures/lily-home-nav-active.png) no-repeat 50% 50%;
   width: 9%;
 }
 
 #tocframe > ul:first-child > li:first-child.toc_current a:hover {
   text-indent: -999em;
-  background: url(pictures/lily-home-nav-active.png) no-repeat 50% 50%;
+  background: url(../pictures/lily-home-nav-active.png) no-repeat 50% 50%;
   width: 9%;
 }
 
@@ -133,7 +133,7 @@ div#tocframe {
 #tocframe li form {
   float: left;
   width: 17%;
-  background: #6aec7c url(pictures/nav-bg.png);
+  background: #6aec7c url(../pictures/nav-bg.png);
   font-size: 100%;
   padding: 0.45em 0.8%;
   margin: 0;
@@ -169,17 +169,17 @@ div#tocframe {
   font-weight: bold;
   padding: 0.68em 0;
   margin: 0;
-  background: #6aec7c url(pictures/nav-bg.png);
+  background: #6aec7c url(../pictures/nav-bg.png);
 }
 
 #tocframe li a:hover {
-  background: url(pictures/nav-hover.png);
+  background: url(../pictures/nav-hover.png);
   text-decoration: underline;
 }
 
 #tocframe li.toc_current a,
 #tocframe li.toc_current a:hover {
-  background: url(pictures/nav-active.png);
+  background: url(../pictures/nav-active.png);
   color: #fff;
   text-decoration: underline;
 }
@@ -246,25 +246,25 @@ div#tocframe {
 #tocframe .toc .toc li.color1 a {
   text-decoration: none;
   background: #9ccc7c;
-  background: url(pictures/color1-bg.png) repeat-x top left;
+  background: url(../pictures/color1-bg.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color2 a {
   text-decoration: none;
   background: #bbcf81;
-  background: url(pictures/color2-bg.png) repeat-x top left;
+  background: url(../pictures/color2-bg.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color3 a {
   text-decoration: none;
   background: #dbd286;
-  background: url(pictures/color3-bg.png) repeat-x top left;
+  background: url(../pictures/color3-bg.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color4 a {
   text-decoration: none;
   background: #fad58c;
-  background: url(pictures/color4-bg.png) repeat-x top left;
+  background: url(../pictures/color4-bg.png) repeat-x top left;
 }
 
 /* having this useless style makes the perl init file easier */
@@ -272,73 +272,73 @@ div#tocframe {
   color: #000;
   text-decoration: none;
   background: #9ccc7c;
-  background: url(pictures/nav-bg-2.png) repeat-x top left;
+  background: url(../pictures/nav-bg-2.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.colorDefault a:hover {
   color: #fff;
   text-decoration: underline;
   background: #9ccc7c;
-  background: url(pictures/nav-hover-2.png) repeat-x top left;
+  background: url(../pictures/nav-hover-2.png) repeat-x top left;
 }
 #tocframe .toc .toc li.color1 a:hover {
   background: #addd8d;
-  background: url(pictures/color1-hover.png) repeat-x top left;
+  background: url(../pictures/color1-hover.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color2 a:hover {
   background: #ccdf92;
-  background: url(pictures/color2-hover.png) repeat-x top left;
+  background: url(../pictures/color2-hover.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color3 a:hover {
   background: #ece297;
-  background: url(pictures/color3-hover.png) repeat-x top left;
+  background: url(../pictures/color3-hover.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color4 a:hover {
   background: #fbe69d;
-  background: url(pictures/color4-hover.png) repeat-x top left;
+  background: url(../pictures/color4-hover.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color1.toc_current a {
   background: #beee9e;
-  background: url(pictures/color1-active.png) repeat-x top left;
+  background: url(../pictures/color1-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color1.toc_current a:hover {
   background: #beee9e;
-  background: url(pictures/color1-active.png) repeat-x top left;
+  background: url(../pictures/color1-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color2.toc_current a {
   background: #ddefa3;
-  background: url(pictures/color2-active.png) repeat-x top left;
+  background: url(../pictures/color2-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color2.toc_current a:hover {
   background: #ddefa3;
-  background: url(pictures/color2-active.png) repeat-x top left;
+  background: url(../pictures/color2-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color3.toc_current a {
   background: #fdf4a8;
-  background: url(pictures/color3-active.png) repeat-x top left;
+  background: url(../pictures/color3-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color3.toc_current a:hover {
   background: #fdf4a8;
-  background: url(pictures/color3-active.png) repeat-x top left;
+  background: url(../pictures/color3-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color4.toc_current a {
   background: #fcf7ae;
-  background: url(pictures/color4-active.png) repeat-x top left;
+  background: url(../pictures/color4-active.png) repeat-x top left;
 }
 
 #tocframe .toc .toc li.color4.toc_current a:hover {
   background: #fcf7ae;
-  background: url(pictures/color4-active.png) repeat-x top left;
+  background: url(../pictures/color4-active.png) repeat-x top left;
 }
 
 /* third level toc (unnumberedsubsec) */
@@ -443,7 +443,7 @@ div#quickSummary {
 }
 
 #quickSummary .subheading {
-  background: #fff url(pictures/summary-gradient.png) repeat-y 0 0;
+  background: #fff url(../pictures/summary-gradient.png) repeat-y 0 0;
   color: #fff;
   padding: 0 0.5em;
   margin: 0;
@@ -455,7 +455,7 @@ div#quickSummary {
 }
 
 div.separator {
-  background: transparent url(pictures/squiggle.jpg) no-repeat 40% 60%;
+  background: transparent url(../pictures/squiggle.jpg) no-repeat 40% 60%;
   height: 36px;
   clear: both;
   padding: 10px;
@@ -522,12 +522,12 @@ div#latestVersion {
 
 /* this might not work in certain browsers */
 a[name="Stable"] + h4 {
-  background: #bdee9d url(pictures/color1-bg.png) repeat-x top left;
+  background: #bdee9d url(../pictures/color1-bg.png) repeat-x top left;
 }
 
 /* this might not work in certain browsers */
 a[name="Unstable"] + h4 {
-  background: #fad58c url(pictures/color4-bg.png) repeat-x top left;
+  background: #fad58c url(../pictures/color4-bg.png) repeat-x top left;
 }
 
 #latestVersion .subsubheading {
@@ -689,7 +689,7 @@ div.float-right a.clickable {
 
 /* color1 */
 .column-center-top h3 {
-  background: #9ccc7c url(pictures/color1-bg.png) repeat-x top left;
+  background: #9ccc7c url(../pictures/color1-bg.png) repeat-x top left;
   text-align: left;
   border-bottom: 1px solid #8bbb6b;
 }
@@ -715,7 +715,7 @@ div.float-right a.clickable {
 /* color2 */
 .column-left-top h3,
 .column-left-bottom h3 {
-  background: #bbcf81 url(pictures/color2-bg.png) repeat-x top left;
+  background: #bbcf81 url(../pictures/color2-bg.png) repeat-x top left;
   border-bottom: 1px solid #aabe70;
 }
 
@@ -739,7 +739,7 @@ div.float-right a.clickable {
 /* color3 */
 .column-right-top h3,
 .column-right-bottom h3 {
-  background: #dbd286 url(pictures/color3-bg.png) repeat-x top left;
+  background: #dbd286 url(../pictures/color3-bg.png) repeat-x top left;
   border-bottom: 1px solid #cac175;
 }
 
@@ -753,7 +753,7 @@ div.float-right a.clickable {
 
 /* color4 */
 .column-center-bottom h3 {
-  background: #fad58c url(pictures/color4-bg.png) repeat-x top left;
+  background: #fad58c url(../pictures/color4-bg.png) repeat-x top left;
   text-align: left;
   border-bottom: 1px solid #e9c47b;
 }

diff --git a/Documentation/general/community.itexi b/Documentation/general/community.itexi
index 443835b00f0b84d5be5bf3e9b470d71bc8f8d8c3..8bc3e825c4393462a6ed154df3ef29cb0822961f 100644 (file)
--- a/Documentation/general/community.itexi
+++ b/Documentation/general/community.itexi
@@ -469,8 +469,8 @@ the latest binary:
 
 @subheading Manuals
 
-@help these need the automatic symlinks or something.  Maybe even
-a hard-coded url to lilypond.org/docs/2.13 or something??
+@help {these need the automatic symlinks or something.  Maybe even
+a hard-coded url to lilypond.org/docs/2.13 or something??}
 
 Learning:
 @uref{lm-html, html}
@@ -527,15 +527,15 @@ have written a manual for contributors.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{contributor/index.html, Contributor's guide (split HTML)}:
+@item @uref{../contributor/index.html, Contributor's guide (split HTML)}:
 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 @uref{../contributor-big-page.html, Contributor's guide (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{contributor.pdf, contributor.pdf}:
+@item @uref{../contributor.pdf, contributor.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
@@ -552,12 +552,10 @@ download as a PDF file.
 @divClass{keep-bullets}
 @itemize
 
-@c add an extra ../ to counteract the sed hack in the makefile
 @item @uref{../../input/regression/collated-files.html, Regression tests}:
 This releases' tests.  (also in
 @uref{../input/regression/collated-files.pdf, pdf})
 
-@c add an extra ../ to counteract the sed hack in the makefile
 @item @uref{../../input/regression/musicxml/collated-files.html,
 MusicXML Regression tests}:
 This releases' MusicXML tests.  (also in

diff --git a/Documentation/general/manuals.itexi b/Documentation/general/manuals.itexi
index 398b38c297b9e61d16d903a310749a8af57f3493..1b276d19ee3e46430f5f1c4b8bfcad07e007049a 100644 (file)
--- a/Documentation/general/manuals.itexi
+++ b/Documentation/general/manuals.itexi
@@ -167,20 +167,20 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{learning/index.html, Learning (split HTML)}:
+@item @uref{../learning/index.html, Learning (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{learning-big-page.html, Learning (big HTML)}:
+@item @uref{../learning-big-page.html, Learning (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{learning.pdf, learning.pdf}:
+@item @uref{../learning.pdf, learning.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
 @c TODO: should make links to info?
-@c @item @uref{TODO, learning.info}:
+@c @item @uref{../TODO, learning.info}:
 @c GNU info format for documentation.  link broken.
 
 @end itemize
@@ -216,19 +216,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{music-glossary/index.html, Glossary (split HTML)}:
+@item @uref{../music-glossary/index.html, Glossary (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{music-glossary-big-page.html, Glossay (big HTML)}:
+@item @uref{../music-glossary-big-page.html, Glossay (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{music-glossary.pdf, glossary.pdf}:
+@item @uref{../music-glossary.pdf, glossary.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, glossary.info}:
+@c @item @uref{../TODO, glossary.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -266,19 +266,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{essay/index.html, Essay (split HTML)}:
+@item @uref{../essay/index.html, Essay (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{essay-big-page.html, Essay (big HTML)}:
+@item @uref{../essay-big-page.html, Essay (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around ?? Mb)}
 
-@item @uref{essay.pdf, essay.pdf}:
+@item @uref{../essay.pdf, essay.pdf}:
 download as a PDF file.
 @emph{(large single download, ?? Mb)}
 
-@c @item @uref{TODO, essay.info}:
+@c @item @uref{../TODO, essay.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -316,19 +316,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{notation/index.html, Notation (split HTML)}:
+@item @uref{../notation/index.html, Notation (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{notation-big-page.html, Notation (big HTML)}:
+@item @uref{../notation-big-page.html, Notation (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{notation.pdf, notation.pdf}:
+@item @uref{../notation.pdf, notation.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, notation.info}:
+@c @item @uref{../TODO, notation.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -363,19 +363,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{usage/index.html, Usage (split HTML)}:
+@item @uref{../usage/index.html, Usage (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{usage-big-page.html, Usage (big HTML)}:
+@item @uref{../usage-big-page.html, Usage (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{usage.pdf, usage.pdf}:
+@item @uref{../usage.pdf, usage.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, lilypond-usage.info}:
+@c @item @uref{../TODO, lilypond-usage.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -418,19 +418,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{snippets/index.html, Snippets (split HTML)}:
+@item @uref{../snippets/index.html, Snippets (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{snippets-big-page.html, Snippets (big HTML)}:
+@item @uref{../snippets-big-page.html, Snippets (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{snippets.pdf, snippets.pdf}:
+@item @uref{../snippets.pdf, snippets.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, snippets.info}:
+@c @item @uref{../TODO, snippets.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -505,19 +505,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{changes/index.html, Changes (split HTML)}:
+@item @uref{../changes/index.html, Changes (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{changes-big-page.html, Changes (big HTML)}:
+@item @uref{../changes-big-page.html, Changes (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{changes.pdf, changes.pdf}:
+@item @uref{../changes.pdf, changes.pdf}:
 download as a PDF file.
 @emph{(small single download, 0.5 ?? Mb)}
 
-@c @item @uref{TODO, changes.info}:
+@c @item @uref{../TODO, changes.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -550,19 +550,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{extending/index.html, Extend (split HTML)}:
+@item @uref{../extending/index.html, Extend (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{extending-big-page.html, Extend (big HTML)}:
+@item @uref{../extending-big-page.html, Extend (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{extending.pdf, extending.pdf}:
+@item @uref{../extending.pdf, extending.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, extending.info}:
+@c @item @uref{../TODO, extending.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -607,19 +607,19 @@ read this manual in the same format as this one.
 @divClass{keep-bullets}
 @itemize
 
-@item @uref{internals/index.html, Internals (split HTML)}:
+@item @uref{../internals/index.html, Internals (split HTML)}:
 the manual is split between many HTML pages.
 @emph{(small download for each page)}
 
-@item @uref{internals-big-page.html, Internals (big HTML)}:
+@item @uref{../internals-big-page.html, Internals (big HTML)}:
 read this manual as one huge HTML page.
 @emph{(large single download, around 10? Mb)}
 
-@item @uref{internals.pdf, internals.pdf}:
+@item @uref{../internals.pdf, internals.pdf}:
 download as a PDF file.
 @emph{(large single download, 2.8 Mb)}
 
-@c @item @uref{TODO, internals.info}:
+@c @item @uref{../TODO, internals.info}:
 @c GNU info format for documentation.  TODO, link broken.
 
 @end itemize
@@ -636,7 +636,7 @@ download as a PDF file.
 
 TODO: clean up / prettify
 
-@uref{translations.html}.
+@uref{../translations.html}.
 
 @divEnd
 

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
new file mode 100644 (file)
index 0000000..2a50e9e
--- /dev/null
+++ b/Documentation/index.html.in
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- header_tag -->
+<META HTTP-EQUIV="refresh" content="0;URL=general/index.html">
+<html><body>
+Redirecting to the documentation index...
+</body></html>

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index b91500910e5b28f1e7cd513242cc8926caf8e8b7..6a91142a3d94935df87866337df8fcc9c841bb0e 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -688,7 +688,7 @@ sub lilypond_print_toc_div ($$)
     }
     my $reldir = "";
     $reldir = "../" if ($Texi2HTML::Config::SPLIT eq 'section');
-    my $uplink = $reldir."manuals.${lang}html";
+    my $uplink = $reldir."general/manuals.${lang}html";
 
     print $fh "<p class=\"toc_uplink\"><a href=\"$uplink\" 
          title=\"Documentation Index\">&lt;&lt; " .

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 09f87416df2cebba3b49f8fb6499b3af3dd44c77..55e7c349a2344499a6b84d67bacea74eb539737f 100644 (file)
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -16,7 +16,7 @@ TEXINFO_MANUALS =\
  $(TELY_FILES:%.tely=%)\
  $(TEXI_FILES:%.texi=%)
 
-TOPDIR_HTML_MANUALS = general
+TOPDIR_HTML_MANUALS = 
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
  $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
 NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\
@@ -60,9 +60,9 @@ DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
 WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
 TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
-$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
        TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
        TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
 
 TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)