Doc: minor fixes for new title pages.

2 files changed, 27 insertions, 66 deletions

diff --git a/Documentation/essay.tely b/Documentation/essay.tely
index 5f6bd57d58..a396d823e6 100644
--- a/Documentation/essay.tely
+++ b/Documentation/essay.tely
@@ -16,6 +16,8 @@ This essay discusses automatic music engraving functions within
 GNU LilyPond version @version{}.
 @end macro
 
+@c TODO: we shouldn't need this!
+@set web
 @include macros.itexi
 
 @afourpaper
@@ -41,6 +43,8 @@ GNU LilyPond version @version{}.
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
+
+@docMain
 @end ifnottex
 
 
diff --git a/Documentation/snippets.tely b/Documentation/snippets.tely
index 3e2b7cec59..ecbc288c75 100644
--- a/Documentation/snippets.tely
+++ b/Documentation/snippets.tely
@@ -1,41 +1,11 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
+
 @setfilename lilypond-snippets.info
 @settitle LilyPond snippets
 @documentencoding UTF-8
 @documentlanguage en
 
-@iftex
-@afourpaper
-@end iftex
-
-@c This disables @lydoctitle definition in common-macros.itexi
-@set snippets-sections
-
-@include macros.itexi
-
-@ifnothtml
-@macro lydoctitle{TEXT}
-@unnumberedsec \TEXT\
-@end macro
-@end ifnothtml
-
-@ifhtml
-@macro lydoctitle{TEXT}
-@node \TEXT\
-@unnumberedsec \TEXT\
-@end macro
-@end ifhtml
-
-@finalout
-
-@titlepage
-@title LilyPond
-@subtitle The music typesetter
-@titlefont{Snippets}
-@author LilyPond Snippet Repository contributors
-
-@vskip 20pt
-
+@macro manualIntro
 This document shows a selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
 (LSR). It is in the public domain.
@@ -46,8 +16,8 @@ LSR web site and database, and the University of Milano for hosting LSR.
 Please note that this document is not an exact subset of LSR: some
 snippets come from @file{input/new} LilyPond sources directory, and
 snippets from LSR are converted through @command{convert-ly}, as LSR is
-based on a stable LilyPond version, and this document is for version
-@c @value{version}.
+based on a stable LilyPond version, and this document is for
+version @version{}.
 
 Snippets are grouped by tags; tags listed in the table of contents match
 a section of LilyPond notation manual.  Snippets may have several tags,
@@ -56,48 +26,32 @@ and not all LSR tags may appear in this document.
 In the HTML version of this document, you can click on the file name
 or figure for each example to see the corresponding input file.
 
-@end titlepage
+@end macro
 
-@iftex
-@contents
-@end iftex
+@c This disables @lydoctitle definition in common-macros.itexi
+@set snippets-sections
 
-@ifnottex
-@node Top
-@top GNU LilyPond --- Snippets List
+@include macros.itexi
+
+@ifnothtml
+@macro lydoctitle{TEXT}
+@unnumberedsec \TEXT\
+@end macro
+@end ifnothtml
 
 @ifhtml
-@ifclear bigpage
-This document is also available as a
-@uref{source/Documentation/snippets.pdf,PDF} and as
-@uref{source/Documentation/snippets-big-page.html,one big page}.
-@end ifclear
-@ifset bigpage
-This document is also available as a
-@uref{source/Documentation/snippets.pdf,PDF} and as
-@uref{source/Documentation/snippets/index.html,HTML indexed multiple pages}.
-@end ifset
+@macro lydoctitle{TEXT}
+@node \TEXT\
+@unnumberedsec \TEXT\
+@end macro
 @end ifhtml
 
-This document shows a selected set of LilyPond snippets from the
-@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
-(LSR). It is in the public domain.
-
-Please note that it is not an exact subset of LSR: some snippets come
-from @file{Documentation/snippets/new} LilyPond sources directory, and
-snippets from LSR are converted through @command{convert-ly}, as LSR is
-based on a stable LilyPond version, and this document is for version
-@version{}.
 
-Snippets are grouped by tags; tags listed in the table of contents match
-a section of LilyPond notation manual.  Snippets may have several tags,
-and not all LSR tags may appear in this document.
+@lilyTitlePage{Snippets}
 
-In the HTML version of this document, you can click on the file name
-or figure for each example to see the corresponding input file.
-@end ifnottex
 
 @c maybe generate/update @menu and @includes automatically? --jm
+@ifnottex
 @menu
 Musical notation
 * Pitches::
@@ -130,6 +84,9 @@ Other collections
 * Templates::
 @end menu
 
+@docMain
+@end ifnottex
+
 @contents