X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Flearning.tely;h=ee5464d3422c5e3c66e93697cbdcd694a4317229;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=16235b8b774ada44b53f47a95da1671a33d2262f;hpb=1c859650b6ff11a7dbe829328fd5cae3816b9231;p=lilypond.git

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 16235b8b77..ee5464d342 100644
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -3,16 +3,33 @@
     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
 
-@include macros.itexi
+@macro manualIntro
+This file provides an introduction to LilyPond version
+@version{}.
+@end macro
 
-@afourpaper
+@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 don't remove this comment.
@@ -24,127 +41,45 @@
 @omflanguage English
 @end ignore
 
-@ifnottex
-@node Top
-@top GNU LilyPond --- Learning Manual
-@end ifnottex
-
-
-@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
-
-
-@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
 
+@lilyTitlePage{Learning Manual}
 
-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
-
+@c TOC -- non-tex
 @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 @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.
 
 @menu
-* Preface::                        Preface.
-* Introduction::                   What, Why, How.
-* Tutorial::                       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.
-* Working on LilyPond projects::   Discusses real-life usage.
 
 Appendices
 
 * Templates::                      Ready-made templates.
-* Scheme tutorial::                Programming inside LilyPond.
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
+
+@docMain
 @end ifnottex
 
+
+@c TOC - tex
 @contents
 
+@allowcodebreaks false
+
+@c INCLUDES
 
-@include learning/preface.itely
-@include learning/introduction.itely
 @include learning/tutorial.itely
+@include learning/common-notation.itely
 @include learning/fundamental.itely
 @include learning/tweaks.itely
-@include learning/working.itely
 
 @include learning/templates.itely
-@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
+
 @node LilyPond index
 @appendix LilyPond index