Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / learning.tely

diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 16235b8b774ada44b53f47a95da1671a33d2262f..a9eb18f26fc496f68067cf777bb286fb1f59dc7a 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,31 +26,39 @@
 @omflanguage English
 @end ignore
 
-@ifnottex
-@node Top
-@top GNU LilyPond --- Learning Manual
-@end ifnottex
 
+@copying
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009 by the authors.
 
-@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
+@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
+@cartouche
+This file provides an introduction to GNU LilyPond version
+@version{}.
 
-@c  This produces the unified index
-@syncodeindex fn cp
-@syncodeindex vr cp
+For more information about how this fits with the other
+documentation, or to read this manual in other formats, see
+@rgeneral{Manuals}.
+@end cartouche
+@end macro
 
 
+@c TITLE PAGE
+@ifnottex
+@node Top
+@top GNU LilyPond --- Learning Manual
+@end ifnottex
+
 @finalout
 
 @titlepage
@@ -57,70 +67,29 @@ This document is also available as a
 @titlefont{Learning Manual}
 @author The LilyPond development team
 
+@vskip 100pt
 
-Copyright @copyright{} 1999--2009 by the authors
+@introText{}
 
-@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 0pt plus 1filll
+@c @vskip 20pt
 
-@vskip 20pt
+@insertcopying{}
 
 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
+@c TOC -- non-tex
 
 @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.
+@introText{}
 
 @menu
-* Preface::                        Preface.
-* Introduction::                   What, Why, How.
-* Tutorial::                       A tutorial introduction.
-* Fundamental concepts::           Basic concepts required for reading the rest of this manual.
+* Introduction::                   Basics of typesetting with LilyPond.
+* Common notation::                Writing very commmon 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
 
@@ -129,22 +98,42 @@ Appendices
 * GNU Free Documentation License:: License of this document.
 * LilyPond index::
 @end menu
+
+
+@ignore
+@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
+@end ignore
+
 @end ifnottex
 
+
+@c TOC - tex
 @contents
 
 
-@include learning/preface.itely
+@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/working.itely
 
 @include learning/templates.itely
 @include learning/scheme-tutorial.itely
 @include fdl.itexi
 
+
 @node LilyPond index
 @appendix LilyPond index