use usescons for using scons.

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 9eb9549780167b4285dc1d88a653ededb006d20f..74fa827f560ad070ba83bb3ab9a775ebcfb75c4a 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1181,7 +1181,7 @@ The command @code{\bar }@var{bartype} is a short cut for doing
 is set to a string, a bar line of that type is created.
 
 @cindex whichBar
-@cindex repeatCommands
+@cindex @code{repeatCommands}
 @cindex defaultBarType
 
 You are encouraged to use @code{\repeat} for repetitions.  See
@@ -2546,6 +2546,13 @@ c1
 }
 @end lilypond
 
+@seealso
+
+Brackets for the repeat are normally only printed over the topmost
+staff. This can be adjusted by setting the @code{voltaOnThisStaff}
+property @inputfileref{input/regression,volta-multi-staff.ly},
+@inputfileref{input/regression,volta-chord-names.ly}
+
 @refbugs
 
 A nested repeat like
@@ -2563,6 +2570,16 @@ having the @code{\alternative} belong to the inner @code{\repeat}.
 For clarity, it is advisable to use braces in such situations.
 @cindex ambiguity
 
+
+
+Timing information is not remembered at the start of an alternative,
+so after a repeat timing information must be reset by hand, for
+example by setting @code{Score.measurePosition} or entering
+@code{\partial}.  Similarly, slurs or ties are also not repeated.
+
+
+
+
 @node Repeats and MIDI
 @subsection Repeats and MIDI
 
@@ -2572,13 +2589,6 @@ For instructions on how to expand repeats for MIDI output, see the
 example file @inputfileref{input/test,unfold-all-repeats.ly}.
 
 
-@refbugs
-
-Timing information is not remembered at the start of an alternative,
-so after a repeat timing information must be reset by hand, for
-example by setting @code{Score.measurePosition} or entering
-@code{\partial}.  Similarly, slurs or ties are also not repeated.
-
 
 @node Manual repeat commands
 @subsection Manual repeat commands
@@ -3316,7 +3326,7 @@ The easiest way to add lyrics to a melody, is by appending
 
 to a melody. Here is an example,
 
-@lilypond[raggedright]
+@lilypond[raggedright,verbatim]
   \relative { \time 3/4 c2 e4 g2. }
   \newlyrics { play the game } 
 @end lilypond
@@ -3324,7 +3334,7 @@ to a melody. Here is an example,
 More stanzas can be added by adding more
 @code{\newlyrics} sections 
 
-@lilypond[raggedright]
+@lilypond[raggedright,verbatim]
   \relative { \time 3/4 c2 e4 g2. }
   \newlyrics { play the game } 
   \newlyrics { speel het spel } 
@@ -3334,7 +3344,7 @@ More stanzas can be added by adding more
 The @code{\newlyrics} keyword has three functions: it interprets the
 following words as texts instead of notes, it sets up a context for
 printing texts (the @code{Lyrics} context), and it couples the melody
-with the lyrics, so that the durations of both are aligned.
+with the lyrics, so the durations of both are aligned.
 
 These three functions can be controlled separately, and that is what
 the following sections are about.
@@ -3439,8 +3449,6 @@ The definition of lyrics mode is too complex.
 @subsection  The Lyrics context
 
 
-@c TODO: document \newlyrics
-
 Lyrics are printed by interpreting them in a @internalsref{Lyrics} context
 @example
  \context Lyrics \lyrics @dots{}
@@ -3672,24 +3680,6 @@ Program reference: Layout objects @internalsref{LyricText} and
 @internalsref{VocalName}.  Music expressions
 @internalsref{LyricEvent}.
 
-@refbugs
-
-@cindex ambiguity
-
-Input for lyrics introduces a syntactical ambiguity
- 
-@example 
-foo = bar 
-@end example 
-
-@noindent
-is interpreted as assigning a string identifier @code{\foo} such that
-it contains @code{"bar"}.  However, it could also be interpreted as
-making or a music identifier @code{\foo} containing the syllable
-`bar'.  The force the latter interpretation, use
-@example
-foo = \lyrics bar4
-@end example
 
 
 @node Ambitus
@@ -3763,6 +3753,9 @@ ambitus.
 @node Tablatures
 @section Tablatures
 
+@cindex tablature
+@cindex guitar tablature
+
 Tablature notation is used for notating music for plucked string
 instruments.  It notates pitches not by using note heads, but by
 indicating on which string and fret a note must be played.  LilyPond
@@ -3792,6 +3785,7 @@ are printed as tablature, by using @internalsref{TabStaff} and
 @end lilypond
 
 @cindex minimumFret
+@cindex fret
 
 When no string is specified, the first string that does not give a
 fret number less than @code{minimumFret} is selected. The default
@@ -4364,6 +4358,9 @@ names, for example
 }
 @end lilypond
 
+For longer instrument names, it may be useful to increase the
+@code{indent} setting in the @code{\paper} block.
+
 @seealso
 
 Program reference: @internalsref{InstrumentName}.
@@ -7596,6 +7593,10 @@ The MIDI output allocates a channel for each Staff, and one for global
 settings.  Hence, the MIDI file should not have more than 15 staves
 (or 14 if you do not use drums). Other staves will remain silent.
 
+Not all MIDI players correctly handle tempo change in the MIDI
+output. Players that are known to work include
+@uref{timidity,http://timidity.sourceforge.net/}
+
 
 @menu
 * MIDI block::