Docs: abstract title page setup into a macro.

diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index ec1954e12ade0315dc26f72310008ce25cd9cbe2..4cc96c144006eb47e8f1d9286eb1224b696b4d72 100644 (file)
--- a/Documentation/contributor.texi
+++ b/Documentation/contributor.texi
@@ -5,98 +5,37 @@
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
+
 @setfilename lilypond-contributor.info
-@settitle GNU LilyPond Contributor's Guide
+@settitle LilyPond Contributor's Guide
 @documentencoding UTF-8
 @documentlanguage en
 
+@macro manualIntro
+This manual documents contributing to GNU LilyPond version
+@version{}.  It discusses technical issues and policies that
+contributors should follow.
+@end macro
+
 @include macros.itexi
 
-@afourpaper
 
-@ifnottex
-@node Top
-@top GNU LilyPond --- Contributor's Guide
-@chapheading The music typesetter
-@end ifnottex
+@c don't remove this comment.
+@ignore
+@omfcreator LilyPond Development Team
+@omfdescription Contributor's Guide of the LilyPond music engraving system
+@omftype program usage
+@omfcategory Applications|Publishing
+@omflanguage English
+@end ignore
 
 
-@ifhtml
-@ifclear bigpage
-This document is also available as a
-@uref{source/Documentation/contributor.pdf,PDF} and as
-@c FIXME: update @uref{} stuff.
-@uref{source/Documentation/contributor-big-page.html,one big page}.
-@end ifclear
-@ifset bigpage
-This document is also available as a
-@uref{source/Documentation/devel/contributor.pdf,PDF} and as a
-@uref{source/Documentation/devel/contributor/index.html,HTML indexed multiple pages}.
-@end ifset
-@end ifhtml
-
-
-@iftex
-@exampleindent 0
-@finalout
-
-@titlepage
-@title LilyPond
-@subtitle The music typesetter
-@titlefont{Contributor's Guide}
-@author The LilyPond development team
-
-Copyright @copyright{} 1999--2008 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''.
-@end quotation
-
-@vskip 20pt
-
-For LilyPond version
-@end titlepage
-@end iftex
-
-@copying
-Copyright @copyright{} 1999--2008 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''.
-@end quotation
-@end copying
+@lilyTitlePage{Learning Manual}
 
-@ifnottex
-This file documents contributing to GNU LilyPond.
-
-Copyright 1999--2008 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''.
-@end quotation
-@end ifnottex
 
+@c TOC -- non-tex
 @ifnottex
 
-More information can be found at
-@uref{http://@/www@/.lilypond@/.org/}.  The website contains
-on-line copies of this and other documentation.
-
 @menu
 * Starting with git::
 * Compiling LilyPond::
@@ -108,10 +47,13 @@ on-line copies of this and other documentation.
 * Programming work::
 * Release work::
 @end menu
+
+@docMain
 @end ifnottex
 
 @contents
 
+
 @include contributor/git-starting.itexi
 @include contributor/compiling.itexi
 @include contributor/doc-work.itexi

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 0150a32f45cd7ea803ba88b0b94c2cd32fc4fcd4..f9077706e1c280c6c1f8a11025c43cb3a08564c6 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -60,11 +60,71 @@ documentation, or to read this manual in other formats, see
 @rgeneral{Manuals}.
 
 If you are missing any manuals, the complete documentation can be
-found at @uref{http://@/www@/.lilypond@/.org/}.
+found at @w{@uref{http://@/www@/.lilypond@/.org/}}.
 @end cartouche
 @end macro
 
 
+@macro lilyTitlePage{TITLE}
+@c  This produces the unified index
+@syncodeindex fn cp
+@syncodeindex vr cp
+
+@afourpaper
+
+@copying
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 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''.
+@end quotation
+@end copying
+
+
+@c TITLE PAGE
+@ifnottex
+@node Top
+@top LilyPond --- \TITLE\
+
+@cartouche
+@manualIntro{}
+@end cartouche
+@end ifnottex
+
+@finalout
+
+@titlepage
+@title LilyPond
+@subtitle The music typesetter
+@titlefont{\TITLE\}
+@author The LilyPond development team
+
+@vskip 60pt
+
+@cartouche
+@manualIntro{}
+@end cartouche
+
+@vskip 40pt
+
+@docMain{}
+
+@vskip 0pt plus 1filll
+
+@insertcopying{}
+
+For LilyPond version @version{}
+@end titlepage
+
+@end macro
+
+
 @c   ***** Headings in a doc subsection *****
 
 @c The next macro is a dummy currently since texinfo doesn't