X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Flilypond-learning.tely;h=cb0c89f1fccba85d76b04cc8998d4ddb239ff7a7;hb=d31248d7770fb5770c2caacfb3547984bf8dcdc3;hp=f37ba4dd0dcbaffd500f3b0ec4cd3288d6a6ba88;hpb=ea0a02af122c42417cbe73cdd2b6966fedc2afa6;p=lilypond.git

diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index f37ba4dd0d..cb0c89f1fc 100644
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -10,30 +10,37 @@
 @documentencoding UTF-8
 @documentlanguage en
 
-@iftex
+@include macros.itexi
+
 @afourpaper
-@c don't replace quotes with directed quotes
-@tex
-\gdef\SETtxicodequoteundirected{Foo}
-\gdef\SETtxicodequotebacktick{Bla}
-@end tex
-@end iftex
 
 
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
-@omfdescription User manual of the LilyPond music engraving system
+@omfdescription Learning Manual of the LilyPond music engraving system
 @omftype program usage
 @omfcategory Applications|Publishing
 @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/user/lilypond-learning.pdf,PDF} and as
 @uref{source/Documentation/user/lilypond-learning-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond-learning.pdf,PDF} and as
+@uref{source/Documentation/user/lilypond-learning/index.html,HTML indexed multiple pages}.
+@end ifset
 @end ifhtml
 
 
@@ -51,7 +58,7 @@ This document is also available as a
 @author The LilyPond development team
 
 
-Copyright @copyright{} 1999--2007 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -64,25 +71,11 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2007 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -95,9 +88,9 @@ Free Documentation License''.
 @end copying
 
 @ifnottex
-This file documents GNU LilyPond program usage.
+This file documents GNU LilyPond for beginners.
 
-Copyright 1999--2007 by the authors
+Copyright 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -110,14 +103,9 @@ Free Documentation License''.
 @end ifnottex
 
 @ifnottex
-@node Top
-@top GNU LilyPond --- learning manual
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
-
-This is the program usage manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+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
@@ -130,13 +118,14 @@ of this and other documentation.
 * Preface::                        Preface.
 * Introduction::                   What, Why, How.
 * Tutorial::                       A tutorial introduction.
-* Putting it all together::        More explanation about LilyPond
-* concepts.
-* Working on LilyPond projects::   Discusses real-life usage.
+* Fundamental concepts::           Basic concepts required for reading the rest of this manual.
 * 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
@@ -145,15 +134,15 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include preface.itely
 @include introduction.itely
 @include tutorial.itely
-@include putting.itely
-@include working.itely
+@include fundamental.itely
 @include tweaks.itely
+@include working.itely
 
+@include templates.itely
+@include scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index