X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb.texi;h=5cd0b97beb9f45dee5a1ab83ffda427055cdc7c8;hb=1250bccd52cc74203c10f7815008bd47635fcf83;hp=e4058478bbc4c03c54930e6f00e7463f4b6c7b44;hpb=bd7f9b9e91e42e55acaa3f934ea8048ff449dc9f;p=lilypond.git

diff --git a/Documentation/web.texi b/Documentation/web.texi
index e4058478bb..5cd0b97beb 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -12,6 +12,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
@@ -27,17 +32,16 @@
 @omflanguage English
 @end ignore
 
-@c `Web' was imported 2009-08-05 with git commit b938d71...
 @copying
 Copyright @copyright{} 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''.
+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
 
@@ -113,7 +117,11 @@ Read more in our @ref{Introduction}!
 
 @divEnd
 
-
+@ifclear web_version
+  @c do nothing
+@end ifclear
+@ifset web_version
+  @c make the box:
 @divId{latestVersion}
 @subheading Quick links
 
@@ -132,6 +140,7 @@ Read more in our @ref{Introduction}!
 @ref{Development, Manuals @versionDevel}
 
 @divEnd
+@end ifset
 
 
 @ifnottex
@@ -191,6 +200,9 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @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
@@ -206,6 +218,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 read this manual in the same format as this one.
 
 @end itemize
+@end ignore
 
 @subheading All formats
 
@@ -216,7 +229,7 @@ read this manual in the same format as this one.
   @item @uref{../\base\/index.html, \name\ (split HTML)}:
 @end ifclear
 @ifset web_version
-  @item \split\
+  @item \split\:
 @end ifset
   the manual is split between many HTML pages.
   @*@ @ @emph{(small download for each page)}
@@ -225,7 +238,7 @@ read this manual in the same format as this one.
   @item @uref{../\base\-big-page.html, \name\ (big HTML)}:
 @end ifclear
 @ifset web_version
-  @item \big\
+  @item \big\:
 @end ifset
   read this manual as one huge HTML page.
   @*@ @ @emph{(large single download, \bigsize\)}
@@ -234,7 +247,7 @@ read this manual in the same format as this one.
   @item @uref{../\base\.pdf, \base\.pdf}:
 @end ifclear
 @ifset web_version
-  @item \pdf\
+  @item \pdf\:
 @end ifset
   download as a PDF file.
   @*@ @ @emph{(large single download, \pdfsize\)}
@@ -246,6 +259,17 @@ read this manual in the same format as this one.
 @end macro
 
 
+@c don't add any extra spaces in this macro -gp
+@macro ifWebLinks{webLink,normalLink}
+@ifclear web_version
+  \normalLink\:
+@end ifclear
+@ifset web_version
+  \webLink\:
+@end ifset
+@end macro
+
+
 @include web/introduction.itexi
 @include web/download.itexi
 @include web/manuals.itexi