Revert "unstaged change from master"

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

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 765bd4aff14c58efd9975298da541a818ef53f38..0bd1a99c4ff0d4517d0de97d0e54fd1cbe565b54 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -7,6 +7,8 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 

+@c \version "2.11.38"
+

 @ignore
 Tutorial guidelines:  (different from policy.txt!)
 - unless you have a really good reason, use either
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
 - unless you have a really good reason, use either


@@ -52,20 +54,21 @@ This section gives a basic introduction to working with LilyPond.
 @menu
 * Compiling a file::            
 * Simple notation::             
 @menu
 * Compiling a file::            
 * Simple notation::             

-* Working on text files::       
-* How to read the manual::      
+* Working on input files::
+* How to read the manual::

 @end menu
 
 
 @node Compiling a file
 @subsection Compiling a file
 
 @end menu
 
 
 @node Compiling a file
 @subsection Compiling a file
 

-@qq{Compiling} is the term used for processing an input text file
+@qq{Compiling} is the term used for processing an input file

 in LilyPond format to produce a file which can be printed and
 in LilyPond format to produce a file which can be printed and

-(optionally) a MIDI file which can be played.  The first example
-shows what a simple input text file looks like.
+(optionally) a MIDI file which can be played.  LilyPond input
+files are simple text files.  The first example
+shows what a simple input file looks like.

 
 

-To create sheet music, we write a text file that specifies the
+To create sheet music, we write an input file that specifies the

 notation.  For example, if we write:
 
 @example
 notation.  For example, if we write:
 
 @example


@@ -153,7 +156,7 @@ also produces a @file{.log} file that contains some information on
 what LilyPond has done to the file.  If any errors occur, please
 examine this file.
 
 what LilyPond has done to the file.  If any errors occur, please
 examine this file.
 

-@subsubheading Unix
+@subsubheading UNIX

 
 Create a text file called @file{test.ly} and enter:
 
 
 Create a text file called @file{test.ly} and enter:
 


@@ -260,7 +263,7 @@ to enter most melodies.  Let us see how this relative calculation
 works in practice.  Starting from a B, which is on the middle line
 in a treble clef, you can reach a C, D and E within 3 staff spaces
 going up, and an A, G and F within 3 staff spaces going down.  So
 works in practice.  Starting from a B, which is on the middle line
 in a treble clef, you can reach a C, D and E within 3 staff spaces
 going up, and an A, G and F within 3 staff spaces going down.  So

-if the note following a B is a C, D or F it will be assumed to be
+if the note following a B is a C, D or E it will be assumed to be

 above the B, and an A, G or F will be assumed to be below.
 
 @lilypond[verbatim,quote,ragged-right]
 above the B, and an A, G or F will be assumed to be below.
 
 @lilypond[verbatim,quote,ragged-right]


@@ -410,8 +413,8 @@ Notation Reference: @ruser{Writing pitches},
 @ruser{Time signature}, @ruser{Clef}.
 
 
 @ruser{Time signature}, @ruser{Clef}.
 
 

-@node Working on text files
-@subsection Working on text files
+@node Working on input files
+@subsection Working on input files

 
 LilyPond input files are similar to source files in many common
 programming languages.  They are case sensitive, and white-space
 
 LilyPond input files are similar to source files in many common
 programming languages.  They are case sensitive, and white-space


@@ -512,7 +515,7 @@ comments:
 @subsection How to read the manual
 
 LilyPond input must be surrounded by @{ @} marks or a
 @subsection How to read the manual
 
 LilyPond input must be surrounded by @{ @} marks or a

-@code{\relative c'' @{ ... @}}, as we saw in @ref{Working on text
+@code{\relative c'' @{ ... @}}, as we saw in @ref{Working on input

 files}.  For the rest of this manual, most examples will omit
 this.  To replicate the examples, you may copy and paste the
 displayed input but you @strong{must} add the @code{\relative c''
 files}.  For the rest of this manual, most examples will omit
 this.  To replicate the examples, you may copy and paste the
 displayed input but you @strong{must} add the @code{\relative c''


@@ -559,7 +562,7 @@ cut-&-pastable section} to the bottom of the file.
 
 
 There are more tips for constructing input files in
 
 
 There are more tips for constructing input files in

-@ref{Suggestions for writing LilyPond files}.  But it might be
+@ref{Suggestions for writing LilyPond input files}.  But it might be

 best to read through the rest of the tutorial first.
 
 
 best to read through the rest of the tutorial first.
 
 


@@ -711,7 +714,7 @@ d4( c16) cis( d e c cis d) e( d4)
 @cindex phrasing slurs
 @subheading Phrasing slurs
 
 @cindex phrasing slurs
 @subheading Phrasing slurs
 

-Music Glossary: @rglos{slurs}, @rglos{phrasing}.
+Music Glossary: @rglos{slur}, @rglos{phrasing}.

 
 Slurs to indicate longer @notation{phrasing} can be entered with
 @code{\(} and @code{\)}.  You can have both @notation{slurs}
 
 Slurs to indicate longer @notation{phrasing} can be entered with
 @code{\(} and @code{\)}.  You can have both @notation{slurs}


@@ -1030,10 +1033,9 @@ different amount of space.  LilyPond does not care how much (or
 little) space there is at the beginning of a line, but indenting
 LilyPond code like this makes it much easier for humans to read.
 
 little) space there is at the beginning of a line, but indenting
 LilyPond code like this makes it much easier for humans to read.
 

-@c FIXME: number of backslashes?!  works in html but not pdf.

 @warning{each note is relative to the previous note in
 the input, not relative to the @code{c''} in the initial
 @warning{each note is relative to the previous note in
 the input, not relative to the @code{c''} in the initial

-@code{\\relative} command.}
+@code{@bs{}relative} command.}

 
 
 @subheading Simultaneous music expressions: single staff
 
 
 @subheading Simultaneous music expressions: single staff


@@ -1090,7 +1092,7 @@ expression, so @math{-(4+5)} is a bigger expression.
 
 Time signatures entered in one staff affects all other staves by
 default.  On the other hand, the key signature of one staff does
 
 Time signatures entered in one staff affects all other staves by
 default.  On the other hand, the key signature of one staff does

-@emph{not} affect other staves.  This different default behaviour
+@emph{not} affect other staves.  This different default behavior

 is because scores with transposing instruments are more common
 than polyrhythmic scores.
 
 is because scores with transposing instruments are more common
 than polyrhythmic scores.
 


@@ -1585,7 +1587,7 @@ The @code{\version} statement records the version of LilyPond that
 was used to write the file:
 
 @example
 was used to write the file:
 
 @example

-\version "2.11.38"
+\version @w{"@version{}"}

 @end example
 
 @noindent
 @end example
 
 @noindent


@@ -1607,7 +1609,7 @@ main music expression; the @code{\header} block is usually placed
 underneath the @ref{Version number}.
 
 @example
 underneath the @ref{Version number}.
 
 @example

-\version "2.11.38"
+\version @w{"@version{}"}

 \header @{
   title = "Symphony"
   composer = "Me"
 \header @{
   title = "Symphony"
   composer = "Me"