Merge branch 'master' into dev/texi2html

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

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 79194e9192a49d26ef304bc83677459fdc320c2d..b1683d51c2398a9fca54262c4ef88707656f203c 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.38"
+@c \version "2.11.51"
 
 @ignore
 Tutorial guidelines:  (different from policy.txt!)
@@ -177,7 +177,7 @@ You will see something resembling:
 
 @example
 lilypond test.ly
-GNU LilyPond 2.12.0
+GNU LilyPond @version{}
 Processing `test.ly'
 Parsing...
 Interpreting music...
@@ -504,7 +504,7 @@ comments:
   are ignored, since they are in a
   block comment.
 
-  g g f f e e d d c2
+  f f e e d d c2
 %@}
 @end example
 
@@ -518,7 +518,7 @@ LilyPond input must be surrounded by @{ @} marks or a
 @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
+displayed input, but you @strong{must} add the
 @w{@code{\relative c'' @{ @}}} like this:
 
 @example
@@ -560,7 +560,6 @@ cut-&-pastable section} to the bottom of the file.
 
 @seealso
 
-
 There are more tips for constructing input files in
 @ref{Suggestions for writing LilyPond input files}.  But it might be
 best to read through the rest of the tutorial first.
@@ -1425,8 +1424,9 @@ two dashes, resulting in a centered hyphen between the syllables.
 Here is an example showing this and everything we have learned so
 far about aligning lyrics to notes.
 
-@c FIXME: noragged-right
-@lilypond[verbatim,quote]
+@c no ragged-right here because otherwise the hyphens get lost,
+@c but the example is long enough to avoid looking strange.
+@lilypond[verbatim,quote,noragged-right]
 <<
   \relative c' {
     \key g \major
@@ -1452,8 +1452,7 @@ Here's an example from Rossini's @notation{Figaro}, where
 
 @c no ragged-right here because otherwise the hyphens get lost,
 @c but the example is long enough to avoid looking strange.
-@c FIXME: noragged-right
-@lilypond[verbatim,quote]
+@lilypond[verbatim,quote,noragged-right]
 <<
   \relative c' {
     \clef bass