Doc: new website is the main doc page now.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index b1fa153230ff5a0a1aa835a7dfeab9aedf5f2af1..39a07a0d1d5e8c316df9ad787ef478d97d6747e8 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -68,7 +68,7 @@ source-links = $(outdir)/source\
 
 # Other out files
 
-HTML_PAGE_NAMES= index translations devel
+HTML_PAGE_NAMES= translations devel
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
 MAIN_INFO_DOC = lilypond-notation
@@ -94,6 +94,10 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 $(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
 $(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
 
+OUT_HTML_FILES += $(outdir)/index.html
+$(outdir)/index.html: $(outdir)/general/index.html
+       mv $(outdir)/general/* $(outdir)/
+
 ###########
 ### Targets
 
@@ -263,7 +267,6 @@ TRANSLATION_DIRS = general learning notation texidocs usage
 TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile)
 EXTRA_TRANSLATION_FILES =\
  dedication.itely\
- index.html.in\
  common-macros.itexi\
  macros.itexi\
  translations.html.in\

diff --git a/Documentation/css/lilypond-web.css b/Documentation/css/lilypond-web.css
index 285dc463a9ff47da5d22024db32ba185d53fb4e4..7335a4a7737ad74df2eb4ff81a63ce5c8c71a078 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;
@@ -49,7 +49,7 @@ div#tocframe {
   top: 0;
   left: 0;
   right: 0;
-  background: url(../pictures/nav-bg.png) repeat-x top left;
+  background: url(pictures/nav-bg.png) repeat-x top left;
   max-width: 70em;
   font-size: 100%;
   line-height: 1;
@@ -75,8 +75,8 @@ div#tocframe {
   text-indent: -999em;
   /* only css3 */
   /*background:  url(nav-bg.png) top left repeat-x,
-url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
-  background: url(../pictures/lily-home-nav-bg.png) no-repeat 50% 50%;
+url(pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
+  background: url(pictures/lily-home-nav-bg.png) no-repeat 50% 50%;
   width: 9%;
   /* css3 no go yet? */
   border-bottom-left-radius: 30px;
@@ -85,19 +85,19 @@ url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
 }
 
 #tocframe > ul:first-child > li:first-child a:hover {
-  background: url(../pictures/lily-home-nav-hover.png) no-repeat 50% 50%;
+  background: 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%;
 }
 
@@ -117,7 +117,7 @@ url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
 #tocframe li form {
   float: left;
   width: 17%;
-  background: url(../pictures/nav-bg.png);
+  background: url(pictures/nav-bg.png);
   font-size: 100%;
   padding: 0.5em 0.8%;
   margin: 0;
@@ -153,17 +153,17 @@ url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
   font-weight: bold;
   padding: 0.71em 0;
   margin: 0;
-  background: url(../pictures/nav-bg.png);
+  background: 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:#000;
   text-decoration: underline;
 }
@@ -229,25 +229,25 @@ url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
 #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 */
@@ -256,62 +256,62 @@ url(../pictures/lily-home.png) no-repeat 50% 50%, #582007;*/
 
 #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) */
@@ -417,7 +417,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;
   /* border-bottom: 10px solid #5b7f64; */
@@ -430,7 +430,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;

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
deleted file mode 100644 (file)
index bb00901..0000000
--- a/Documentation/index.html.in
+++ /dev/null
@@ -1,148 +0,0 @@
-<html>
-<!--
-    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
-
-    When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
-!-->
-  <head>
-    <title>LilyPond @TOPLEVEL_VERSION@ documentation</title>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-    <meta name="aesop" content="links">
-    <meta name="description"
-          content="Top-level index to the standard documentation for
-                   LilyPond @TOPLEVEL_VERSION@">
-  </head>
-  
-  <body>
-    <div class="header">
-      <h1>LilyPond documentation</h1>
-    </div>
-
-    <div class="subheader">
-      <p>
-       <strong>Version @TOPLEVEL_VERSION@</strong>
-       <br>
-       <strong>@DATE@</strong>
-      </p>
-    </div>
-
-    <table id="navigation">
-      <tbody>
-        <tr>
-          <td class="left-column">
-         <ul>
-           <li>
-           <a class="title"
-href="learning/index.html">Learning Manual</a>
-(in <a class="title" href="learning-big-page.html">one big page</a> ~ 1.5 MB,
-in <a class="title" href="learning.pdf">PDF</a>)
-              <br>(start here)</li>
-
-          <li><a class="title"
-href="music-glossary/index.html">Music Glossary</a>
-(in <a class="title" href="music-glossary-big-page.html">one big page</a> ~ 500 kB,
-in <a class="title" href="music-glossary.pdf">PDF</a>)
-
-     <br>(for non-English users)</li>
-       </ul>
-         </td>
-         <td class="right-column">
-         <ul>
-                 <li>
-           <a class="title" href="changes.html">News</a>
-            <br>(changes since the previous major release)</li>
-
-<li><a class="title" href="../examples.html">Examples</a>
-     <br>(see some examples)</li>
-
-         </ul>
-         </td>
-        </tr>
-        <tr>
-          <td valign="baseline" class="left-column">
-         <ul>
-           <li>
-<a class="title" href="notation/index.html">Notation
-Reference</a>
-(in <a class="title" href="notation-big-page.html">one big page</a> ~ 4 MB,
-in <a class="title" href="notation.pdf">PDF</a>)
-     <br>(writing music in LilyPond)</li>
-
-       <li>
- <a  class="title"
-href="internals/index.html">Internals Reference</a>
- (in <a class="title" href="internals-big-page.html">one big page</a> ~ 1 MB,
-  in <a class="title" href="internals.pdf">PDF</a>)
-     <br>(definitions for tweaking)</li>
-
-  </ul>
-         </td>
-         <td valign="baseline" class="right-column">
-         <ul>
-              <li>
-           <a class="title"
-href="usage/index.html">Application Usage</a>
-(in <a class="title" href="usage-big-page.html">one big page</a>,
-in <a class="title" href="usage.pdf">PDF</a>)
-            <br>(how to install and run the program)</li>
-
-<li><a class="title"href="snippets/index.html">Snippets List</a>
-(in <a class="title" href="snippets-big-page.html">one big page</a> ~ 2MB,
-in <a class="title" href="snippets.pdf">PDF</a>)
-     <br>(Short tricks, tips, and examples)</li>
-
-       </ul>
-
-    </td>
-        <tr>
-          <td valign="baseline" class="left-column">
-       <ul>
-            <li><a class="title"  href="devel.html">Developers resources</a>
-              <br>(documentation for developers and contributors)</li>
-       </ul>
-    </td><td class="right-column">
-       <ul>
-          <li><a class="title"  href="translations.html">Translations status</a>
-          <br>(see translations progress)</li>
-       </ul>
-         </td>
-        </tr>
-        <tr>
-          <td valign="baseline" class="left-column">
-       <ul>
-
-            <li> <a class="title"  href="http://lilypond.org/">lilypond.org</a>
-              <br>(the website)</li>
-            <li>
-             <a class="title" href="http://www.gnu.org/copyleft/gpl.html">License</a>
-              <br>(the GNU GPL)</li>
-
-       </ul>
-    </td><td class="right-column">
-    <ul>
-        <li><a class="title"  href="THANKS.html">Thankyous</a>
-        <br>(to our contributors)</li>
-
-        <li><a class="title"  href="DEDICATION.html">Dedication</a>
-        <br>(by Jan and Han-Wen)</li>
-
-<li><a class="title" href="general/index.html">New website</a>
-<br>(total hack; to be replaced ASAP)</li>
-         </ul>
-         </td>
-        </tr>
-      </tbody>
-    </table>
-    <p>
-      All the documentation you read from this page is available for <strong>download</strong>.
-      <a href="http://download.linuxaudio.org/lilypond/binaries/documentation/lilypond-@TOPLEVEL_VERSION@-1.documentation.tar.bz2">Download
-       the tarball</a>.
-    </p>
-    <p>
-      Like every HTML page in this documentation, you can find at
-      bottom links to <strong>translations</strong> of this page in
-      other languages.
-    </p>
-  </body>
-</html>

diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index 2fcfd18856e18a1fa9d2cd783c5ce51265943eb4..993f0e27a1c65106cf458c7c53f352061df4881e 100644 (file)
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -43,9 +43,6 @@ $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES)
 $(outdir)/lilypond-%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
        $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
-$(outdir)/lilypond.info: $(outdir)/general.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
-
-$(outdir)/general/index.html: $(outdir)/macros.itexi $(outdir)/common-macros.itexi
+$(outdir)/index.html: $(outdir)/macros.itexi $(outdir)/common-macros.itexi
 
 .SECONDARY:

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index f0f6ed183fe45ab5f8137f60c13408ffcc11c708..cf11075ba8b9de463d24acfcaa27d7327cc20ffa 100644 (file)
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -1,4 +1,4 @@
-HTML_PAGE_NAMES = index translations
+HTML_PAGE_NAMES = translations
 HTML_FILES = $(HTML_PAGE_NAMES:%=%.html)
 OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
@@ -56,9 +56,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)/general/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
        TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
        TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
 
 TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)