release: 1.5.29

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

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 1599e9c98c521908ef8c6f256028976933a1a96c..c4690beb7a505b604991c67785de5482aa60df6c 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -2,10 +2,13 @@
 
 @c TODO: LilyPond LilyPond LilyPond
 
-
 @node Tutorial
 @chapter Tutorial
-  
+
+@html
+<!--- @@WEB-TITLE@@=Tutorial --->
+@end html
+
 @menu
 * First steps::                 Music language of LilyPond
 * Simple legend::               Small table of music language symbols
@@ -834,10 +837,12 @@ at @uref{http://www.ghostscript.com}.
 @unnumberedsubsec Windows users
 Windows users start the terminal by clicking on the LilyPond icon.
 Notepad is sufficient for editing the LilyPond file. Viewing the PS file
-can be done with @code{gsview32 test.ps}.  Viewing DVI files can be done
-with @code{yap test.dvi}.  The "print" button in Yap will print files.
-You can also print from the command line by executing @code{gsview32 /s
-test.ps}
+can be done with @code{gsview32 test.ps}.@footnote{ You can also view
+DVI files with @code{yap test.dvi}, but unfortunately the postscript
+interaction seems broken, meaning that you will not see slurs or beams
+in the Yap window.}  You can also print from the command line by
+executing @code{gsview32 /s test.ps}
+
 
 
 @node The first real tune
@@ -1037,7 +1042,7 @@ note have real pitch @code{g'}.  The @code{8} represents an eight note.
 @end example 
 Two more notes, with pitch @code{a} and @code{b}.  Because their
 duration is the same as the @code{g,8}, there is no need to enter the
-duration, but you may enter it anyway, i.e., @code{a4 b4}
+duration, but you may enter it anyway, i.e., @code{a8 b8}
 @separate
 @example 
 
@@ -1830,7 +1835,7 @@ viola = \notes \relative c' \context Voice = viola {
 
 oboes = \notes \relative c'' \context Voice = oboe {
     \stemUp s4  g8. b,16 c8 r <e'8.^\p g> <f16 a>
-    \grace { <e8( g> } <d4 )f> <c2 e>
+    \grace <e8( g> <d4 )f> <c2 e>
     \times 2/3 { <d8 \< f> <e g> <f a> }
     <
         { \times 2/3 { a8 g c } \! c2 }
@@ -1845,7 +1850,7 @@ oboes = \notes \relative c'' \context Voice = oboe {
         }
     >
     \stemBoth
-    \grace { <c,8( e> } <)b8. d8.-\trill> <c16 e> | 
+    \grace <c,8( e> <)b8. d8.-\trill> <c16 e> | 
     [<d ( f> < )f8. a>] <)b,8 d> r [<d16( f> <f8. )a>] <b,8 d> r  |
     [<c16( e>  < )e8. g>] <c8 e,>
 }
@@ -1990,13 +1995,11 @@ these notes are indeed processed by precisely one context with
 defined above. 
 @separate
 @example 
-\grace { <e8 g> } < d4 f> <c2 e> 
+\grace <e8 g> < d4 f> <c2 e> 
 @end example
 @cindex @code{\grace}
 @cindex ornaments
 @cindex grace notes
-
-[FIXME]
 @code{\grace} introduces grace notes.  It takes one argument, in this
 case a chord.
 
@@ -2055,9 +2058,8 @@ We can't share stems with the other voice, so we have to create a new
 it from the other context.  Stems go down in this voice.
 @separate
 @example 
-\grace @{  
+\grace
 @end example
-[FIXME]
 @cindex Grace context
 When a grace section is processed, a @code{Grace} context is
 created. This context acts like a miniature score of its own.  It has
@@ -2088,7 +2090,7 @@ This ends the two-part section.
 @separate
 @example 
 \stemBoth
-\grace { <c,8( e> } <)b8. d8.-\trill> <c16 e> |  
+\grace <c,8( e> <)b8. d8.-\trill> <c16 e> |  
 @end example
 @cindex trill
 @cindex stemBoth
@@ -2388,7 +2390,7 @@ When naming the tuning of the french horn, we'll need a piece of text
 with a flat sign.  LilyPond has a mechanism for font selection and
 kerning called Scheme markup text (See @ref{Text markup}).  The flat
 sign is taken from the music font, and its name is @code{accidentals--1}
-(The sharp sign is called @code{accidentals-1}).  The default font is
+(The natural sign is called @code{accidentals-0}).  The default font is
 too big for text, so we select a relative size of @code{-2}.
 
 @separate