Merge branch 'lilypond/translation' of ssh://pacovila@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 765bd4aff14c58efd9975298da541a818ef53f38..c17b4d5c43adbb0071c463b87a091c9f541d702b 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


@@ -93,9 +96,9 @@ in your own music!  For more information about the display of
 examples in the manual, see @ref{How to read the manual}.}
 
 @cindex case sensitive
 examples in the manual, see @ref{How to read the manual}.}
 
 @cindex case sensitive

-In addition, LilyPond input is @strong{case sensitive}.  @code{
-@{ c d e @}} is valid input; @code{@{ C D E @}} will produce an
-error message.
+In addition, LilyPond input is @strong{case sensitive}.
+@w{@code{@{ c d e @}}} is valid input; @w{@code{@{ C D E @}}} will
+produce an error message.

 
 @smallspace
 
 
 @smallspace
 


@@ -117,11 +120,11 @@ first.  After this, LilyPond will be much faster!}
 
 @subsubheading MacOS X
 
 
 @subsubheading MacOS X
 

-If you double click @code{LilyPond.app}, it will open with an
+If you double click @command{LilyPond.app}, it will open with an

 example file.  Save it, for example, to @file{test.ly} on your
 example file.  Save it, for example, to @file{test.ly} on your

-Desktop, and then process it with the menu command @code{Compile >
-Typeset File}.  The resulting PDF file will be displayed on your
-screen.
+Desktop, and then process it with the menu command
+@w{@code{Compile > Typeset File}}.  The resulting PDF file will be
+displayed on your screen.

 
 For future use of LilyPond, you should begin by selecting @q{New}
 or @q{Open}.  You must save your file before typesetting it.  If
 
 For future use of LilyPond, you should begin by selecting @q{New}
 or @q{Open}.  You must save your file before typesetting it.  If


@@ -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:
 


@@ -246,7 +249,7 @@ example, the first note -- the @code{d} -- is the closest D to
 middle C.
 
 By adding (or removing) quotes @code{'} or commas @code{,} from
 middle C.
 
 By adding (or removing) quotes @code{'} or commas @code{,} from

-the @code{\relative c' @{} command, we can change the starting
+the @w{@code{\relative c' @{}} command, we can change the starting

 octave:
 
 @lilypond[verbatim,quote,ragged-right]
 octave:
 
 @lilypond[verbatim,quote,ragged-right]


@@ -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]


@@ -296,7 +299,7 @@ comma @code{,} to the note name.
 To change a note by two (or more!) octaves, we use multiple
 @code{''} or @code{,,} -- but be careful that you use two single
 quotes @code{''} and not one double quote @code{"}@tie{}!  The
 To change a note by two (or more!) octaves, we use multiple
 @code{''} or @code{,,} -- but be careful that you use two single
 quotes @code{''} and not one double quote @code{"}@tie{}!  The

-initial value in @code{\relative c'} may also be modified like
+initial value in @w{@code{\relative c'}} may also be modified like

 this.
 @c " - keeps quotes in order for context-sensitive editor -td
 
 this.
 @c " - keeps quotes in order for context-sensitive editor -td
 


@@ -340,7 +343,7 @@ explicitly (i.e., with a number).
 Music Glossary: @rglos{rest}.
 
 A @notation{rest} is entered just like a note with the name
 Music Glossary: @rglos{rest}.
 
 A @notation{rest} is entered just like a note with the name

-@code{r}:
+@code{r}@tie{}:

 
 @lilypond[verbatim,quote,ragged-right]
 \relative c'' {
 
 @lilypond[verbatim,quote,ragged-right]
 \relative c'' {


@@ -410,14 +413,14 @@ 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
 is generally ignored.  Expressions are formed with curly braces
 
 LilyPond input files are similar to source files in many common
 programming languages.  They are case sensitive, and white-space
 is generally ignored.  Expressions are formed with curly braces

-@{ @}, and comments are denoted with @code{%} or @code{%@{ ...
-%@}}.
+@{ @}, and comments are denoted with @code{%} or
+@w{@code{%@{ ... %@}}}.

 
 If the previous sentences sound like nonsense, don't worry!  We'll
 explain what all these terms mean:
 
 If the previous sentences sound like nonsense, don't worry!  We'll
 explain what all these terms mean:


@@ -427,16 +430,16 @@ explain what all these terms mean:
 @cindex case sensitive
 @item
 @strong{Case sensitive}:
 @cindex case sensitive
 @item
 @strong{Case sensitive}:

-it matters whether you enter a letter in lower case (e.g. @code{a,
-b, s, t}) or upper case (e.g.  @code{A, B, S, T}).  Notes are
-lower case: @code{@{ c d e @}} is valid input; @code{@{ C D E @}}
-will produce an error message.
+it matters whether you enter a letter in lower case (e.g.
+@w{@code{a, b, s, t}}) or upper case (e.g.  @w{@code{A, B, S, T}}).
+Notes are lower case: @w{@code{@{ c d e @}}} is valid input;
+@w{@code{@{ C D E @}}} will produce an error message.

 
 @item
 @strong{Whitespace insensitive}:
 it does not matter how many spaces (or new lines) you add.
 
 @item
 @strong{Whitespace insensitive}:
 it does not matter how many spaces (or new lines) you add.

-@code{@{ c d e @}} means the same thing as @code{@{ c @tie{}
-@tie{} @tie{} d e @}} and:
+@w{@code{@{ c d e @}}} means the same thing as
+@w{@code{@{ c @tie{}} @tie{} @tie{} d e @}} and:

 
 @example
 @{ c                        d
 
 @example
 @{ c                        d


@@ -463,7 +466,7 @@ space unless they are at the beginning or end of a line to avoid
 ambiguities.
 
 A LilyPond command followed by a simple expression in braces (such
 ambiguities.
 
 A LilyPond command followed by a simple expression in braces (such

-as @code{\relative @{ @}}) also counts as a single music 
+as @w{@code{\relative @{ @}}}) also counts as a single music

 expression.
 
 @cindex comments
 expression.
 
 @cindex comments


@@ -512,11 +515,11 @@ 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
-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''
-@{ @}} like this:
+@w{@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
+@w{@code{\relative c'' @{ @}}} like this:

 
 @example
 \relative c'' @{
 
 @example
 \relative c'' @{


@@ -526,9 +529,9 @@ displayed input but you @strong{must} add the @code{\relative c''
 
 Why omit the braces?  Most examples in this manual can be inserted
 into the middle of a longer piece of music.  For these examples,
 
 Why omit the braces?  Most examples in this manual can be inserted
 into the middle of a longer piece of music.  For these examples,

-it does not make sense to add @code{\relative c'' @{ @}} -- you
-should not place a @code{\relative} inside another
-@code{\relative}!  If we included @code{\relative c'' @{ @}}
+it does not make sense to add @w{@code{\relative c'' @{ @}}} --
+you should not place a @code{\relative} inside another
+@code{\relative}!  If we included @w{@code{\relative c'' @{ @}}}

 around every example, you would not be able to copy a small
 documentation example and paste it inside a longer piece of your
 own.  Most people want to add material to an existing piece, so we
 around every example, you would not be able to copy a small
 documentation example and paste it inside a longer piece of your
 own.  Most people want to add material to an existing piece, so we


@@ -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.
 


@@ -1139,17 +1141,15 @@ Here is a small example:
 }
 @end lilypond
 
 }
 @end lilypond
 

-Other staff groupings are introduced with
-@code{\new GrandStaff,} suitable for orchestral
-scores, and @code{\new ChoirStaff,} suitable for
-vocal scores.  These staff groups each form another
-type of context, one that generates the brace at the
-left end of every system and also controls the extent
-of bar lines.
+Other staff groupings are introduced with @code{\new GrandStaff},
+suitable for orchestral scores, and @w{@code{\new ChoirStaff}},
+suitable for vocal scores.  These staff groups each form another
+type of context, one that generates the brace at the left end of
+every system and also controls the extent of bar lines.

 
 @seealso
 
 
 @seealso
 

-Notation Reference: @ruser{Piano music}, 
+Notation Reference: @ruser{Keyboard instruments},

 @ruser{Displaying staves}.
 
 
 @ruser{Displaying staves}.
 
 


@@ -1195,8 +1195,8 @@ slurs and beams, and the top voice has the stems up, while the
 bottom voice has them down.
 
 Entering such parts is done by entering each voice as a sequence
 bottom voice has them down.
 
 Entering such parts is done by entering each voice as a sequence

-(with @code{@{...@}}) and combining these simultaneously,
-separating the voices with @code{\\}
+(with @w{@code{@{...@}}}) and combining these simultaneously,
+separating the voices with @code{\\}:

 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 <<
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 <<


@@ -1289,9 +1289,9 @@ separating each syllable with a space.
 @end lilypond
 
 Note the curly brackets delimiting both the music and the lyrics,
 @end lilypond
 
 Note the curly brackets delimiting both the music and the lyrics,

-and the double angle brackets @code{<< ... >>} around the whole 
-piece to show that the music and lyrics are to occur at the same 
-time.
+and the double angle brackets @w{@code{<< ... >>}} around the
+whole piece to show that the music and lyrics are to occur at the
+same time.

 
 @node Aligning lyrics to a melody
 @subsection Aligning lyrics to a melody
 
 @node Aligning lyrics to a melody
 @subsection Aligning lyrics to a melody


@@ -1343,8 +1343,8 @@ multiple notes, the simplest being to add a slur across them (see
 >> 
 @end lilypond
 
 >> 
 @end lilypond
 

-Here we have also used manual beaming (the square brackets @code{[
-]} ) to generate the beaming which is customarily used with lyrics
+Here we have also used manual beaming (the square brackets
+@code{[]} ) to generate the beaming which is customarily used with lyrics

 (see @ref{Automatic and manual beams}).
 
 As an alternative to using slurs, the melismata may be indicated
 (see @ref{Automatic and manual beams}).
 
 As an alternative to using slurs, the melismata may be indicated


@@ -1585,7 +1585,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 +1607,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"