Don't crash if vertical spacing is called early.

[lilypond.git] / Documentation / web.texi

diff --git a/Documentation/web.texi b/Documentation/web.texi
index aaac6c5413204c18ee87694abd0b0420c9d4efd4..5cd0b97beb9f45dee5a1ab83ffda427055cdc7c8 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -12,14 +12,15 @@
 @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
 
-@ifset web_version
-foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
-@end ifset
-
 @afourpaper
 
 @c don't remove this comment.
@@ -31,17 +32,16 @@ foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo
 @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
 
@@ -67,7 +67,7 @@ Free Documentation License''.
 @vskip 0pt plus 1filll
 @c @vskip 20pt
 
-@insertcopying{}
+@insertcopying
 
 For LilyPond version @version{}
 @end titlepage
@@ -117,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
 
@@ -136,6 +140,7 @@ Read more in our @ref{Introduction}!
 @ref{Development, Manuals @versionDevel}
 
 @divEnd
+@end ifset
 
 
 @ifnottex
@@ -182,7 +187,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 * 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.      
+* 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.
@@ -191,6 +196,80 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @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
+
+@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 itemize
+@end ignore
+
+@subheading All formats
+
+@divClass{keep-bullets}
+@itemize
+
+@ifclear web_version
+  @item @uref{../\base\/index.html, \name\ (split HTML)}:
+@end ifclear
+@ifset web_version
+  @item \split\:
+@end ifset
+  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
+  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
+  download as a PDF file.
+  @*@ @ @emph{(large single download, \pdfsize\)}
+
+@end itemize
+
+@divEnd
+
+@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