Web: import recent changes from web-gop.

diff --git a/Documentation/general.texi b/Documentation/general.texi
index e81f4d9f3177fce0c4414e81b60dd7ccb06d13c3..9ccac7e9529be00ff0933c44e1d4206d0462a24d 100644 (file)
--- a/Documentation/general.texi
+++ b/Documentation/general.texi
@@ -16,22 +16,18 @@
 
 @afourpaper
 
-@ifnottex
-@node Top
-@top
-@chapheading
-@end ifnottex
-
-
-@finalout
+@c don't remove this comment.
+@ignore
+@omfcreator Graham Percival and Patrick McCarty
+@omfdescription General info about the LilyPond music engraving system
+@omftype program usage
+@omfcategory Applications|Publishing
+@omflanguage English
+@end ignore
 
-@titlepage
-@title LilyPond
-@c @subtitle The music typesetter
-@titlefont{New Website}
-@author The LilyPond development team
 
-Copyright @copyright{} 1999--2009 by the authors
+@copying
+Copyright @copyright{} 2009 by the authors.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -41,24 +37,40 @@ with no Invariant Sections.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
 @end quotation
+@end copying
+
+
+@c TITLE PAGE
+@ifnottex
+@node Top
+@top LilyPond... music notation for everyone
+@end ifnottex
 
-@vskip 20pt
 
-For LilyPond version 
+@c hack for texi2html, bleh -gp
+@ifnothtml
+
+@finalout
+
+@titlepage
+@title LilyPond
+@subtitle The music typesetter
+@titlefont{General Information}
+@author The LilyPond development team
+
+@vskip 0pt plus 1filll
+@c @vskip 20pt
+
+@insertcopying{}
+
+For LilyPond version @version{}
 @end titlepage
+@end ifnothtml
+@c end hack for texi2html
 
-@copying
-Copyright @copyright{} 1999--2009 by the authors
 
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
-@end quotation
-@end copying
+@c ************************ WEBSITE START ***************
+
 
 @divId{pageHeader}
 @heading LilyPond
@@ -74,22 +86,13 @@ Free Documentation License''.
 @subheading What is LilyPond?
 
 LilyPond is an open-source music engraving program, devoted to
-producing the highest-quality sheet music possible.  We bring the
-aesthetics of traditionally engraved music to computer printouts.
-
-LilyPond is Free Software and part of the
-@uref{http://@/www@/.gnu@/.org/, GNU} project.
+producing the highest-quality sheet music possible.  This free
+software brings the aesthetics of traditionally engraved music to
+computer printouts.
 
 @divClass{align-right}
 Read more in our @ref{Introduction}!
 
-@c For this to work, essay needs to be split like we are
-@c   --split=node --node-files
-@c This and more in our @ressaynamed{Engraving, essay}.
-@c Possibly, node Top always works?
-@c This and more in our @ressaynamed{Top, essay}.
-This and more in our @ref{automated-engraving,,Essay,essay,Essay}.
-
 @divEnd
 @divEnd
 
@@ -99,8 +102,6 @@ FIXME: process news items like the old web site:
 select first 4 items to insert here, and generate
 RSS.
 
-@include news-front.itexi
-
 @divClass{float-right}
 (@ref{Old news})
 @divEnd
@@ -128,6 +129,8 @@ RSS.
 @divEnd
 
 
+@ifnottex
+
 @divClass{hide}
 @menu
 * Introduction::     Start here to creating sheet music.
@@ -137,6 +140,8 @@ RSS.
 @end menu
 @divEnd
 
+@end ifnottex
+
 @contents
 
 

diff --git a/Documentation/general/community.itexi b/Documentation/general/community.itexi
index 0cdedaee31e7fde40e74918072bc1dae0a1c7319..74db1e3a0aadae05a552c6ca8aca16cd777bb6f3 100644 (file)
--- a/Documentation/general/community.itexi
+++ b/Documentation/general/community.itexi
@@ -81,10 +81,10 @@ discussing LilyPond.
 @divClass{column-left-bottom}
 @subheading User Discussions and Help
 
-@subsubheading User mailist: @code{lilypond-user@@gnu.org}
+@subsubheading User mailing list: @code{lilypond-user@@gnu.org}
 
-This mailist is the main place for users to discuss and help each
-other.
+This mailing list is the main place for users to discuss and help
+each other.
 
 @quotation
 @uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,
@@ -118,6 +118,7 @@ be useful for others would better be posted to one of the mailing lists.
 
 @subsubheading Other languages
 
+@quotation
 @uref{http://es.groups.yahoo.com/group/lilypond-es,
 Spanish yahoo group}
 
@@ -128,10 +129,11 @@ German forum}
 Portugese group}
 
 @uref{http://lists.gnu.org/mailman/listinfo/lilypond-user-fr,
-French mailist}
+French mailing list}
 
 @uref{http://www.lilypondforum.nl/,
 Dutch forum}
+@end quotation
 
 @divEnd
 
@@ -144,9 +146,9 @@ Dutch forum}
 The easiest way to keep touch is by reading our community
 newsletter, the @uref{http://news.lilynet.net/, LilyPond Report}.
 
-@subsubheading Releases mailist: @code{info-lilypond@@gnu.org}
+@subsubheading Releases mailing list: @code{info-lilypond@@gnu.org}
 
-This mailist is a low-volume, read-only list which receives
+This mailing list is a low-volume, read-only list which receives
 notifications of new releases.
 
 @quotation
@@ -170,7 +172,7 @@ archive3}
 @divClass{column-right-bottom}
 @subheading Developer Discussion
 
-@subsubheading Developer mailist: @code{lilypond-devel@@gnu.org}
+@subsubheading Developer mailing list: @code{lilypond-devel@@gnu.org}
 
 Most developer discussion takes place on this list.  Patches
 should be sent here.
@@ -191,7 +193,7 @@ send to lilypond-devel with gmane}
 @end quotation
 
 
-@subsubheading Bug mailist: @code{bug-lilypond@@gnu.org}
+@subsubheading Bug mailing list: @code{bug-lilypond@@gnu.org}
 
 Bug-specific discussion takes place here.
 
@@ -216,8 +218,6 @@ guidelines for @ref{Bug reports}.}
 
 
 
-
-
 @node Tiny examples
 @unnumberedsec Tiny examples
 

diff --git a/Documentation/general/introduction.itexi b/Documentation/general/introduction.itexi
index 8e687864ee5c1f52b8e36ca70d773a427dacd82b..df6ccbc2120ddab6339f753ac8ffadb1c74f0c9a 100644 (file)
--- a/Documentation/general/introduction.itexi
+++ b/Documentation/general/introduction.itexi
@@ -40,6 +40,9 @@ Impress friends and colleagues with sharp sheet music!
 @item
 @ref{Freedom}: LilyPond is Free Software.
 
+@item
+@ref{Background}: Our computational aesthetics.
+
 @end itemize
 @divEnd
 
@@ -65,19 +68,23 @@ Impress friends and colleagues with sharp sheet music!
 @item
 @ref{Text input}: You write music as @emph{text}?!
 
+@item
+@ref{Alternate input}: Other ways of working with LilyPond.
+
 @end itemize
 @divEnd
 
 
-
 @divClass{hide}
 @menu
 * Features::                    What can LilyPond do?
 * Examples::                    I want to see some music!
 * Freedom::                     Freedom and the GPL.
+* Background::                  Computational aesthetics.
 * Productions::                 Real-life use of LilyPond.
 * Testimonials::                What do people say about it?
 * Text input::                  You write music as text?!
+* Alternate input::             Other ways of working with LilyPond.
 @end menu
 @divEnd
 
@@ -88,14 +95,14 @@ Impress friends and colleagues with sharp sheet music!
 
 @help{hoping to delegate this.  Desired: an enthusiastic
 attempt to sway people towards trying lilypond.  The warnings
-about writing music as text come in Crash Course, not here.  Maybe
-draw inspiration from
-http://lilypond.org/web/about/features
-and
-http://lilypond.org/web/switch/tour
-and
-http://lilypond.org/web/switch/advantages
-}
+about writing music as text come in Crash Course, not here.}
+
+Maybe draw inspiration from
+@uref{http://lilypond.org/web/about/features} and
+@uref{http://lilypond.org/web/switch/tour} and
+@uref{http://lilypond.org/web/switch/advantages}
+
+
 
 @subheading Why switch to LilyPond?
 
@@ -111,12 +118,12 @@ that results in beautifully engraved music.  All of LilyPond's
 style settings, font designs and algorithms have been inspired by
 the finest hand-engraved music.  LilyPond output has the same
 strong, balanced and elegant look as the best-engraved classical
-scores
+scores.  This is further explained in our @ref{Essay}.
 
 
-@subsubheading No fiddling
+@subsubheading Less fiddling
 
-Don't waste time with tweaking the output; LilyPond gets the
+Spend less time with tweaking the output; LilyPond gets the
 formatting correct right from the start.  It determines spacing by
 itself, and breaks lines and pages to provide a tight and uniform
 layout.  Clashes between lyrics, notes, and chords are resolved
@@ -165,7 +172,7 @@ documented in the comprehensive program reference manual.
 @subsubheading Excellent support
 
 LilyPond runs on all popular platforms: Linux, MacOS X, and
-Windows.  LilyPond comes with extensive documetation and hundreds
+Windows.  LilyPond comes with extensive documentation and hundreds
 of example files.  There is an active user community answering
 questions on the Lilypond user mailing list, while the development
 team makes sure that problems are solved quickly.
@@ -425,6 +432,34 @@ scholarships.
 @divEnd
 
 
+@divClass{column-center-bottom}
+@subheading Where now?
+
+Still not convinced?  Read about some of our users'
+@ref{Productions} and sheet music.  If you've already decided to
+try LilyPond, first read about our @ref{Text input}.
+
+FIXME: rewrite for Background.
+@divEnd
+
+
+@node Background
+@unnumberedsec Background
+
+@divClass{column-center-top}
+@subheading Background essay
+
+We have an extensive essay describing computational aesthetics:
+the art of creating beauty with a computer.  FIXME blah blah.
+
+FIXME: simplify the verbosity below.
+
+If you just want a quick introduction to LilyPond, the essay might
+be too much material to read.  If you would like to read it now,
+please progress to @ref{Essay}.
+
+@divEnd
+
 @divClass{column-center-bottom}
 @subheading Where now?
 
@@ -437,8 +472,6 @@ try LilyPond, first read about our @ref{Text input}.
 @node Productions
 @unnumberedsec Productions
 
-@help{more references to publishers who use lilypond}
-
 @divClass{column-left-top}
 @subheading Concerts
 
@@ -477,11 +510,25 @@ New York} (engraving by Nicolas Sceaux).
 @divClass{keep-bullets}
 @itemize
 
+@item
+@uref{http://www.mutopiaproject.org/index.html, Mutopia Project},
+over 1500 pieces of classical sheet music for free download, and
+the main showcase of LilyPond scores.
+
 @item
 @uref{http://www.adoromusicpub.com/, Adoro Music Publishing},
 high-quality scores of sacred music, available for immediate
 download or in traditional paper format.
+
+@item
+@uref{http://theshadylanepublishing.com/, The Shady Lane
+Publishing},
+a @qq{micro musical publishing house} whose goal is to promote a
+new form of musical economy closer to the musicians and music
+lovers.
+
 @end itemize
+
 @divEnd
 
 @divEnd
@@ -755,6 +802,76 @@ users even report that they can enter a full score in LilyPond
 faster than with a piano keyboard or mouse+GUI!  Perhaps you would
 like to review the @ref{Features}, @ref{Examples}, or
 @ref{Freedom} that LilyPond provides, or read about users'
-@ref{Productions} and @ref{Testimonials}.
+@ref{Productions} and @ref{Testimonials}.  In addition, our
+approach to the computational aesthetics of classical engraving is
+explained in our @ref{Background}.  FIXME
+@divEnd
+
+
+@node Alternate input
+@unnumberedsec Alternate input
+
+@divClass{column-center-top}
+@subheading Graphical environment: Denemo
+
+@sourceimage{logo-linux,,,}
+
+FIXME: insert text and a graphic
+
 @divEnd
 
+@divClass{column-center-top}
+@subheading Mixed environment: LilyPondTool
+
+@sourceimage{logo-linux,,,}
+@sourceimage{logo-freebsd,,,}
+@sourceimage{logo-macosx,,,}
+@sourceimage{logo-windows,,,}
+
+
+FIXME: insert text and a graphic
+
+@divEnd
+
+@divClass{column-center-top}
+@subheading Text environment: Emacs and Vim
+
+@sourceimage{logo-linux,,,}
+@sourceimage{logo-freebsd,,,}
+@sourceimage{logo-macosx,,,}
+@sourceimage{logo-windows,,,}
+
+
+FIXME: insert text and a graphic
+
+@divEnd
+
+@divClass{column-center-top}
+@subheading Other
+
+FIXME: insert text and a graphic(s)
+
+@divEnd
+
+@divClass{column-center-bottom}
+@subheading Legalese
+
+@divClass{legal}
+All logos and product images are copyright and trademark
+acknowledged.
+
+@logoLegalLinux
+
+@logoLegalFreeBSD
+
+@logoLegalMacOSX
+
+@logoLegalWindows
+
+@divEnd
+
+@divEnd
+
+
+
+