X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=f2001a8ad409033f9d39412a18977770bcc92c06;hb=f28f870dbd356da530ce1a89bc9accec0494e237;hp=619659af2d16d42ae266fd7f36159a636a629f79;hpb=1c15d1069850deac96e4c70928661564d8ec96df;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 619659af2d..f2001a8ad4 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,9 +13,15 @@
 @documentlanguage en
 @afourpaper
 
+@c `Web' was imported 2009-08-05 with git commit b938d71...
+@c @macro copyrightDeclare
+@c Copyright @copyright{} 2009--2010 by the authors.
+@c @end macro
+
 @set FDL
 @set web
 @include macros.itexi
+@include weblinks.itexi
 
 @afourpaper
 
@@ -27,17 +34,16 @@
 @omflanguage English
 @end ignore
 
-@c `Web' was imported 2009-08-05 with git commit b938d71...
 @copying
-Copyright @copyright{} 2009 by the authors.
+Copyright @copyright{} 2009--2010 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''.
+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
 
@@ -154,6 +160,7 @@ Read more in our @ref{Introduction}!
 
 @contents
 
+@allowcodebreaks false
 
 @c ****************** GENERAL STUFF FOR INFO ************
 @ignore
@@ -198,49 +205,53 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @macro docLinks{name,base,refLink,split,big,bigsize,pdf,pdfsize}
 @subheading Read it
 
-@itemize
+@docLinksBare{\name\,\base\,\refLink\,\split\,\big\,\bigsize\,\pdf\,\pdfsize\}
 
-@c normal case, special online case
+@end macro
+
+
+@macro docLinkSplit{name,base,webLink}
 @ifclear web_version
-  @item \refLink\:
+  @uref{../\base\/index.html, \name\ (split HTML)}
 @end ifclear
 @ifset web_version
-  @c we assume that the online web version will be split html
-  @item \split\:
+  \webLink\
 @end ifset
-read this manual in the same format as this one.
-
-@end itemize
-
-@subheading All formats
-
-@divClass{keep-bullets}
-@itemize
+@end macro
 
+@macro docLinkBig{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\/index.html, \name\ (split HTML)}:
+  @uref{../\base\-big-page.html, \name\ (big HTML)}
 @end ifclear
 @ifset web_version
-  @item \split\
+  \webLink\
 @end ifset
-  the manual is split between many HTML pages.
-  @*@ @ @emph{(small download for each page)}
+@end macro
 
+@macro docLinkPdf{name,base,webLink}
 @ifclear web_version
-  @item @uref{../\base\-big-page.html, \name\ (big HTML)}:
+  @uref{../\base\.pdf, \base\.pdf}
 @end ifclear
 @ifset web_version
-  @item \big\
+  \webLink\
 @end ifset
+@end macro
+
+
+@macro docLinksBare{name,base,refLink,split,big,bigsize,pdf,pdfsize}
+
+@divClass{keep-bullets}
+@itemize
+
+@item @docLinkSplit{\name\,\base\,\split\} @minus{}
+  the manual is split between many HTML pages.
+  @*@ @ @emph{(small download for each page)}
+
+@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\)}