Doc: rework main file of Learning.

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index f521f24db244d92e89b6ae2c40c7193a83ec8773..5ff4d89f8f3e2baf7ffa8b4e9ed0cf519d35bb2b 100644 (file)
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -11,10 +11,12 @@
 @documentlanguage en
 
 @include macros.itexi
+@c  This produces the unified index
+@syncodeindex fn cp
+@syncodeindex vr cp
 
 @afourpaper
 
-
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
@@ -24,13 +26,60 @@
 @omflanguage English
 @end ignore
 
+
+@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
+
+@macro introText
+This file provides an introduction to GNU LilyPond version
+@version{}.  For more information about how this fits with the
+other documentation, see
+FIXME FIXME FIXME
+@c @ref{About the documentation}.
+@end macro
+
+
+@c TITLE PAGE
 @ifnottex
 @node Top
 @top GNU LilyPond --- Learning Manual
+@end ifnottex
+
+@finalout
+
+@titlepage
+@title LilyPond
+@subtitle The music typesetter
+@titlefont{Learning Manual}
+@author The LilyPond development team
+
+@introText{}
+
+@vskip 0pt plus 1filll
+@c @vskip 20pt
+
+@insertcopying{}
+
+For LilyPond version @version{}
+@end titlepage
+
+
+@c TOC -- non-tex
+
+@ifnottex
+@introText{}
 
-@c * Preface::                        Preface.
-@c * Introduction::                   What, Why, How.
-@c * Working on LilyPond projects::   Discusses real-life usage.
 @menu
 * Introduction::                   Begin here.
 * Common notation::                A tutorial introduction.
@@ -44,7 +93,6 @@ Appendices
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
-@end ifnottex
 
 
 @ifhtml
@@ -60,95 +108,25 @@ This document is also available as a
 @end ifset
 @end ifhtml
 
-
-@c  This produces the unified index
-@syncodeindex fn cp
-@syncodeindex vr cp
-
-
-@finalout
-
-@titlepage
-@title LilyPond
-@subtitle The music typesetter
-@titlefont{Learning Manual}
-@author The LilyPond development team
-
-
-Copyright @copyright{} 1999--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
-
-@vskip 20pt
-
-For LilyPond version @version{}
-@end titlepage
-
-@copying
-Copyright @copyright{} 1999--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
-
-@ifnottex
-This file documents GNU LilyPond for beginners.
-
-Copyright 1999--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 ifnottex
 
-@ifnottex
-This is the Learning Manual (LM) for GNU LilyPond version @version{}.
-For more information about how this fits with the other
-documentation, see
-FIXME FIXME FIXME 
-@c @ref{About the documentation}.
-
-@cindex web site
-@cindex URL
-
-More information can be found at
-@uref{http://@/www@/.lilypond@/.org/}.  The website contains on-line copies
-of this and other documentation.
-
-@end ifnottex
 
+@c TOC - tex
 @contents
 
 
-@c @include learning/preface.itely
+@c INCLUDES
+
 @include learning/introduction.itely
 @include learning/common-notation.itely
 @include learning/fundamental.itely
 @include learning/tweaks.itely
-@c @include learning/working.itely
 
 @include learning/templates.itely
 @include learning/scheme-tutorial.itely
 @include fdl.itexi
 
+
 @node LilyPond index
 @appendix LilyPond index