Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / user / tutorial.itely

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index d4d9ebfaa670e53d8ffb1b2bb810c7a91a9572c8..ee0ee87abe533fe4a032da4def61b059b6bfe5e3 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1,14 +1,11 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
-@c
-@c Translation of GIT committish: <FILL-IN-HEAD-COMMITTISH>
-@c
-@c When revising a translation, copy the HEAD committish of the
-@c version that you are working on.  Use
-@c
-@c   git-rev-list HEAD | head -1
-@c
-@c to discover that.
+@ignore
+    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.
+@end ignore
 
 @c TODO:
 @c   * more details about running lilypond; error messages,
@@ -76,8 +73,8 @@ commands for quick reference.
 @section First steps
 
 The first example demonstrates how to enter the most elementary piece
-of music, a @rglos{scale}.  A @rglos{note} can be entered by typing its
-name, from @samp{a} through @samp{g}.  So, if you enter
+of music, a @rglos{scale}.  A @rglos{note} can be entered by typing
+its name, from @samp{a} through @samp{g}.  So, if you enter
 
 @example
 @{
@@ -94,12 +91,11 @@ c' d' e' f' g' a' b' c''
 }
 @end lilypond
 
-@emph{Warning:}  Every piece of LilyPond input needs to have
-@{curly braces@} placed around the input.  The braces should be
-also be surrounded by a space unless
-they are at the beginning or end of a line to avoid ambiguities.  These
-may be omitted in examples in this manual, but don't forget them in
-your own music!
+@emph{Warning:} Every piece of LilyPond input needs to have @{curly
+braces@} placed around the input.  The braces should be also be
+surrounded by a space unless they are at the beginning or end of a
+line to avoid ambiguities.  These may be omitted in examples in this
+manual, but don't forget them in your own music!
 
 @cindex Case sensitive
 In addition, LilyPond input is case sensitive.  @code{ @{ c d e @} } is
@@ -112,26 +108,25 @@ valid input; @code{ @{ C D E @} } will produce an error message.
 In this section we will explain what commands to run
 and how to view or print the output.
 
-@unnumberedsubsec MacOS X
+@unnumberedsubsubsec MacOS X
 
 If you double click LilyPond.app, it will open with an example
 file. Save it, for example, to @file{test.ly} on your Desktop, and
 then process it with the menu command @samp{Compile > Typeset File}.
 The resulting PDF file will be displayed on your screen.
 
-Be warned that the first time you ever run lilypond 
-will take a minute or two, because
-all of the system fonts have to be analyzed first.
+Be warned that the first time you ever run lilypond will take a minute
+or two, because all of the system fonts have to be analyzed first.
 
 For future use of LilyPond, you should begin by selecting "New"
 or "Open".
 
-@unnumberedsubsec Windows
+@unnumberedsubsubsec Windows
 
 On Windows, start up a text-editor@footnote{Any simple or
-programmer-oriented editor will do, for example Notepad.  Do not use a
-word processor, since these insert formatting codes that will confuse
-LilyPond.} and enter
+programmer-oriented editor with UTF-8 support will do, for example
+Notepad.  Do not use a word processor, since these insert formatting
+codes that will confuse LilyPond.} and enter
 
 @verbatim
 { c' e' g' c'' }
@@ -142,7 +137,7 @@ called @file{test.ly.TXT}.  Double clicking @file{test.ly} will process
 the file and show the resulting PDF file.
 
 
-@unnumberedsubsec Unix
+@unnumberedsubsubsec Unix
 
 Begin by opening a terminal window and starting a text editor.  For
 example, you could open an xterm and execute
@@ -178,9 +173,9 @@ Layout output to `test.ps'...
 Converting to `test.pdf'...
 @end example
 
-@cindex DVI file
+@cindex PDF file
 @cindex Viewing music
-@cindex xdvi
+
 @noindent
 The result is the file @file{test.pdf} which you can print or view
 with the standard facilities of your operating system.@footnote{If
@@ -192,12 +187,11 @@ available package for viewing and printing PDF and PostScript files.}
 @node Second steps
 @section Second steps
 
-@emph{Remember:} Every piece of LilyPond input needs to
-have @{curly braces@} placed around the input.
-The braces should be surrounded by a space unless
-they are at the beginning or end of a line to avoid ambiguities.
-For the rest of this manual, most examples will
-omit these braces, but don't forget them in your own music!
+@emph{Remember:} Every piece of LilyPond input needs to have @{curly
+braces@} placed around the input.  The braces should be surrounded by
+a space unless they are at the beginning or end of a line to avoid
+ambiguities.  For the rest of this manual, most examples will omit
+these braces, but don't forget them in your own music!
 
 @c will be removed once the tutorial either explains \relative or
 @c examples are fixed so they don't use it.  -gp