X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Flearning.tely;h=ee5464d3422c5e3c66e93697cbdcd694a4317229;hb=HEAD;hp=5ff4d89f8f3e2baf7ffa8b4e9ed0cf519d35bb2b;hpb=892f6a07df88fb0ed5ed1c583943b04ef245f273;p=lilypond.git

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 5ff4d89f8f..ee5464d342 100644
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -3,19 +3,34 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
+
 @setfilename lilypond-learning.info
-@settitle GNU LilyPond Learning Manual
+@settitle LilyPond Learning Manual
 @documentencoding UTF-8
 @documentlanguage en
+@afourpaper
+
+@macro manualIntro
+This file provides an introduction to LilyPond version
+@version{}.
+@end macro
+
+@c `Learning Manual' was born 1998-08-14 with this commit:
+@c release: 1.0.2
+@c author: Han-Wen Nienhuys
+@c commit: a3a44f9f3c581b6824b3a65f9039656693e09bbf
+@c   file: Documentation/tex/tutorial.yo
+
+@macro copyrightDeclare
+Copyright @copyright{} 1998--2015 by the authors.
+@end macro
 
+@set FDL
 @include macros.itexi
-@c  This produces the unified index
-@syncodeindex fn cp
-@syncodeindex vr cp
 
-@afourpaper
 
 @c don't remove this comment.
 @ignore
@@ -27,103 +42,41 @@
 @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
-
+@lilyTitlePage{Learning Manual}
 
 @c TOC -- non-tex
-
 @ifnottex
-@introText{}
 
 @menu
-* Introduction::                   Begin here.
-* Common notation::                A tutorial introduction.
-* Fundamental concepts::           Basic concepts required for reading the rest of this manual.
+* Tutorial::                       Basics of typesetting with LilyPond.
+* Common notation::                Writing very common notation.
+* Fundamental concepts::           Basic concepts required for reading the rest of the manuals.
 * Tweaking output::                Introduction to modifying output.
 
 Appendices
 
 * Templates::                      Ready-made templates.
-* Scheme tutorial::                Programming inside LilyPond.
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
 
-
-@ifhtml
-@ifclear bigpage
-This document is also available as a
-@uref{source/Documentation/learning.pdf,PDF} and as
-@uref{source/Documentation/learning-big-page.html,one big page}.
-@end ifclear
-@ifset bigpage
-This document is also available as a
-@uref{source/Documentation/learning.pdf,PDF} and as
-@uref{source/Documentation/learning/index.html,HTML indexed multiple pages}.
-@end ifset
-@end ifhtml
-
+@docMain
 @end ifnottex
 
 
 @c TOC - tex
 @contents
 
+@allowcodebreaks false
 
 @c INCLUDES
 
-@include learning/introduction.itely
+@include learning/tutorial.itely
 @include learning/common-notation.itely
 @include learning/fundamental.itely
 @include learning/tweaks.itely
 
 @include learning/templates.itely
-@include learning/scheme-tutorial.itely
 @include fdl.itexi