X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=3081e4d3c8c01606492c1abd3a3bed374f991a8d;hb=HEAD;hp=ed1f1ffefbbc1d332fa0d105a019b45ddbb48faa;hpb=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index ed1f1ffefb..3081e4d3c8 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -34,11 +34,11 @@
 @c commit: d189a2119004c2f75da2020ea2ed36d817582fc5
 
 @c @macro copyrightDeclare
-@c Copyright @copyright{} 2003--2014 by the authors.
+@c Copyright @copyright{} 2003--2015 by the authors.
 @c @end macro
 
 @copying
-Copyright @copyright{} 2003--2014 by the authors.
+Copyright @copyright{} 2003--2015 by the authors.
 
 @c next line is necessary for broken pre-4.13 texinfo's
 @c install-info, so leave it there until we officially
@@ -120,8 +120,6 @@ For LilyPond version @version{}
 @c @im ageId{cmws,web-snippet-alpha.png,Catchy Musical Web Snippet}
 
 @divId{quickSummary}
-@subheading What is LilyPond?
-
 LilyPond is a music engraving program, devoted to producing the
 highest-quality sheet music possible.  It brings the aesthetics of
 traditionally engraved music to computer printouts.  LilyPond is free
@@ -134,34 +132,100 @@ Read more in our @ref{Introduction}!
 @divEnd
 @divEnd
 
-@divClass{separator}
+
+@divId{homepage-main}
+
+@divClass{column-center-top}
+
+@subheading Beautiful Sheet Music
+
+@c This example image is the image from the website version of the essay
+@c manual, downloaded to the pictures directory for use on the home page.
+@c Large version is generated manually from ly file in pictures directory.
+@divId{homepage-example-image-wrapper}
+@imageClickable{bwv861-lilypond,png,,bwv861-lilypond-large,png,center}
 @divEnd
 
+@ifclear web_version
+  @c no anchor links, just text
+
+LilyPond is a powerful and flexible tool for engraving tasks of
+all kinds, for example classical music (like the example above by J.S.
+Bach), complex notation, early music, modern music, tablature,
+vocal music, lead sheets, educational materials, large
+orchestral projects, customized output, and even Schenker graphs.
+
+@end ifclear
+@ifset web_version
+  @c anchor links, link to individual examples by their <a> tag
+  @c Translators should use the localized anchor name
+  @c (e.g. examples.html#Musica-Antica)
+  @c to be found in out-www/web/examples.LL.html
+
+LilyPond is a powerful and flexible tool for engraving tasks of
+all kinds, for example
+@uref{examples.html#Classical-Music, classical music}
+(like the example above by J.S. Bach),
+@uref{examples.html#Complex-Notation, complex notation},
+@uref{examples.html#Early-Music, early music},
+@uref{examples.html#Modern-Music, modern music},
+@uref{examples.html#Tablature, tablature},
+@uref{examples.html#Vocal-Music, vocal music},
+@uref{examples.html#Lead-Sheets, lead sheets},
+@uref{examples.html#Educational-Applications, educational materials},
+@uref{examples.html#Large-Projects, large orchestral projects},
+@uref{examples.html#Customized-Output, customized output},
+and even
+@uref{examples.html#Schenker-Graphs, Schenker graphs}.
+
+@end ifset
+
+Browse our gallery of @ref{Examples} and be inspired!
+
+@divEnd
 
-@divId{news}
+@divClass{column-center-middle-color2}
+@subheading News
 
 @c TODO: generate this automatically, including RSS feed.
-@include web/news-front.itexi
+@include web/news-headlines.itexi
+
+@ref{News, More news...}
 
-@divClass{float-right}
-(@ref{Old news})
 @divEnd
 
 @divEnd
 
+
 @ifclear web_version
   @c do nothing
 @end ifclear
 @ifset web_version
-  @c make the box:
-@divId{wildCardBox}
+  @c make the side bar:
+@divId{homepage-sidebar}
+@subheading Stable Release
+
+@c TODO: javascript to detect OS and suggest download?
+
+@ref{Download, Download @versionStable}
+
+@ref{Manuals, Manuals @versionStable}
+
+@subheading Unstable Release
+
+@ref{Development, Download @versionDevel}
+
+@ref{Development, Manuals @versionDevel}
+
 @subheading Pondings
-@divId{wildCardText}
+@divId{pondingsText}
 
 @divEnd
+
 @divEnd
 @end ifset
 
+
 @html
 
 <script language="JavaScript" type="text/javascript">
@@ -185,33 +249,11 @@ Read more in our @ref{Introduction}!
   var index = Math.floor(Math.random() * tweets.length);
   var tweet = tweets[index];
   var text = tweet.childNodes[0];
-  document.getElementById("wildCardText").innerHTML = text.nodeValue;
+  document.getElementById("pondingsText").innerHTML = text.nodeValue;
 </script>
 
 @end html
 
-@ifset web_version
-  @c make the box:
-@divId{latestVersion}
-@subheading Quick links
-
-@c TODO: javascript to detect OS and suggest download?
-
-@subsubheading Stable
-
-@ref{Download, Download @versionStable}
-
-@ref{Manuals, Manuals @versionStable}
-
-@subsubheading Unstable
-
-@ref{Development, Download @versionDevel}
-
-@ref{Development, Manuals @versionDevel}
-
-@divEnd
-@end ifset
-
 
 @ifnottex