X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=5d140400b1cc673b95a28027e3a4a1a1c1e09a34;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=5cd0b97beb9f45dee5a1ab83ffda427055cdc7c8;hpb=495ad7977162deff8c18761cd8f8e2233dcdb89b;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 5cd0b97beb..5d140400b1 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -3,7 +3,8 @@
     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.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @setfilename web.info
@@ -12,16 +13,11 @@
 @documentlanguage en
 @afourpaper
 
-@c `Web' was imported 2009-08-05 with git commit b938d71...
-@c @macro copyrightDeclare
-@c Copyright @copyright{} 2009 by the authors.
-@c @end macro
-
 @set FDL
 @set web
 @include macros.itexi
+@include weblinks.itexi
 
-@afourpaper
 
 @c don't remove this comment.
 @ignore
@@ -32,8 +28,22 @@
 @omflanguage English
 @end ignore
 
+@c `Web' was born 2003-03-30 with this commit:
+@c Initial revision
+@c author: Han-Wen Nienhuys
+@c commit: d189a2119004c2f75da2020ea2ed36d817582fc5
+
+@c @macro copyrightDeclare
+@c Copyright @copyright{} 2003--2015 by the authors.
+@c @end macro
+
 @copying
-Copyright @copyright{} 2009 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
+@c bump the required version.  -gp
+This file documents the LilyPond website.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this
@@ -46,6 +56,27 @@ License''.
 @end copying
 
 
+@c Info files are no longer installed in a subdirectory, images are
+@c expected to be found in lilypond/ subdirectory.
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning).  Start here.
+* Music Glossary: (music-glossary).               For non-English users.
+* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
+* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
+* LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
+* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+* LilyPond Website: (lilypond-web).    Preview of new website.
+* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
+* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
+* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
+* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
+* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
+@end direntry
+
+
 @c TITLE PAGE
 @ifnottex
 @node Top
@@ -91,10 +122,11 @@ For LilyPond version @version{}
 @divId{quickSummary}
 @subheading What is LilyPond?
 
-LilyPond is an open-source music engraving program, devoted to
-producing the highest-quality sheet music possible.  This free
-software brings the aesthetics of traditionally engraved music to
-computer printouts.
+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
+software and part of the @uref{http://gnu.org,GNU Project}.
+
 
 @divClass{align-right}
 Read more in our @ref{Introduction}!
@@ -120,6 +152,44 @@ Read more in our @ref{Introduction}!
 @ifclear web_version
   @c do nothing
 @end ifclear
+@ifset web_version
+  @c make the box:
+@divId{wildCardBox}
+@subheading Pondings
+@divId{wildCardText}
+
+@divEnd
+@divEnd
+@end ifset
+
+@html
+
+<script language="JavaScript" type="text/javascript">
+  function loadXMLDoc(dname)
+    {
+      if (window.XMLHttpRequest)
+        {
+          xhttp=new XMLHttpRequest();
+        }
+      else
+        {
+          xhttp=new ActiveXObject("Microsoft.XMLHTTP");
+        }
+      xhttp.open("GET",dname,false);
+      xhttp.send();
+      return xhttp.responseXML;
+    }
+
+  var xmlDoc = loadXMLDoc("tweets.xml");
+  var tweets = xmlDoc.getElementsByTagName("tweet");
+  var index = Math.floor(Math.random() * tweets.length);
+  var tweet = tweets[index];
+  var text = tweet.childNodes[0];
+  document.getElementById("wildCardText").innerHTML = text.nodeValue;
+</script>
+
+@end html
+
 @ifset web_version
   @c make the box:
 @divId{latestVersion}
@@ -158,6 +228,7 @@ Read more in our @ref{Introduction}!
 
 @contents
 
+@allowcodebreaks false
 
 @c ****************** GENERAL STUFF FOR INFO ************
 @ignore
@@ -172,83 +243,46 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
   * List all commands in direntry.
 
-@c  * lilypond: (lilypond-application)Running LilyPond.      Invoking the
-@c    LilyPond  program.
 @end ignore
 
-@c Info files are no longer installed in a subdirectory, images are
-@c expected to be found in lilypond/ subdirectory.
-@dircategory GNU LilyPond --- the music typesetter
-@direntry
-* LilyPond Learning Manual: (lilypond-learning).  Start here.
-* Music Glossary: (music-glossary).               For non-English users.
-* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
-* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
-* LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
-* LilyPond Application Usage: (lilypond-application). Installing and running applications.
-* LilyPond Website: (lilypond-general).    Preview of new website.
-* abc2ly: (lilypond-application)Invoking abc2ly.      Importing ABC.
-* convert-ly: (lilypond-application)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-application)Invoking etf2ly.      Importing Finale.
-* lilypond-book: (lilypond-application)LilyPond-book. Integrating text and music.
-* midi2ly: (lilypond-application)Invoking midi2ly.    Importing MIDI.
-* musicxml2ly: (lilypond-application)Invoking musicxml2ly.  Importing MusicXML.
-@end direntry
-
-
 @c FIXME: this still doesn't solve the broken links in pdf and big
 @c        html; we'll need a bunch of @iftext and stuff in here. -gp
 @c ****************** SPECIAL MACROS FOR WEB MANUAL ************
 @macro docLinks{name,base,refLink,split,big,bigsize,pdf,pdfsize}
-
-@c experimental removal; to be FIXME before 2.14.  -gp
-@ignore
 @subheading Read it
 
-@itemize
+@docLinksBare{\name\,\base\,\refLink\,\split\,\big\,\bigsize\,\pdf\,\pdfsize\}
 
-@c normal case, special online case
-@ifclear web_version
-  @item \refLink\:
-@end ifclear
-@ifset web_version
-  @c we assume that the online web version will be split html
-  @item \split\:
-@end ifset
-read this manual in the same format as this one.
+@end macro
 
-@end itemize
-@end ignore
 
-@subheading All formats
+@macro docLinkSplit{name,base,webLink}
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
+@end macro
+
+@macro docLinkBig{name,base,webLink}
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
+@end macro
+
+@macro docLinkPdf{name,base,webLink}
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
+@end macro
+
+
+@macro docLinksBare{name,base,refLink,split,big,bigsize,pdf,pdfsize}
 
 @divClass{keep-bullets}
 @itemize
 
-@ifclear web_version
-  @item @uref{../\base\/index.html, \name\ (split HTML)}:
-@end ifclear
-@ifset web_version
-  @item \split\:
-@end ifset
+@item @docLinkSplit{\name\,\base\,\split\} @minus{}
   the manual is split between many HTML pages.
   @*@ @ @emph{(small download for each page)}
 
-@ifclear web_version
-  @item @uref{../\base\-big-page.html, \name\ (big HTML)}:
-@end ifclear
-@ifset web_version
-  @item \big\:
-@end ifset
+@item @docLinkBig{\name\,\base\,\big\} @minus{}
   read this manual as one huge HTML page.
   @*@ @ @emph{(large single download, \bigsize\)}
 
-@ifclear web_version
-  @item @uref{../\base\.pdf, \base\.pdf}:
-@end ifclear
-@ifset web_version
-  @item \pdf\:
-@end ifset
+@item @docLinkPdf{\name\,\base\,\pdf\} @minus{}
   download as a PDF file.
   @*@ @ @emph{(large single download, \pdfsize\)}
 
@@ -270,6 +304,37 @@ read this manual in the same format as this one.
 @end macro
 
 
+@ifhtml
+@macro contactUsAbout{topic}
+
+@divClass{heading-center}
+@divClass{contactBox}
+If you are aware of any other \topic\ which could be listed here,
+please let us know by writing a message to the bug-lilypond
+mailing list. If you're not subscribed yet you can do so on the list's
+@uref{https://lists.gnu.org/mailman/listinfo/bug-lilypond,info page}
+or post directly through the
+@uref{http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs,
+gmane lilypond.bugs web interface}.
+
+@divEnd
+@divEnd
+
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro contactUsAbout{topic}
+@cartouche
+If you are aware of any other \topic\ which could be listed here,
+please let us know by following the instructions on
+@ref{Bug reports}.
+
+@end cartouche
+
+@end macro
+@end ifnothtml
+
 @include web/introduction.itexi
 @include web/download.itexi
 @include web/manuals.itexi