(Entering lyrics):

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

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 1439f61dfbe2e438f473b1a94b004f45f4271236..1a765e23f169448196fca932b6a7ff6a9a184c3b 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -138,7 +138,8 @@ espanol.ly     do  re  mi  fa  sol la  sib si  -s          -b
 
 @seealso
 
-Program reference: @internalsref{NoteEvent}, and @internalsref{NoteHead}.
+Program reference: @internalsref{NoteEvent},
+@internalsref{LedgerLineSpanner}, and @internalsref{NoteHead}.
 
 
 
@@ -720,6 +721,10 @@ Not all durations (especially those containing tuplets) can be
 represented exactly with normal notes and dots, but the engraver will
 not insert tuplets.
 
+@code{Completion_heads_engraver} only affects notes; it does not split
+rests.
+
+
 @seealso
 
 Examples: @inputfileref{input/@/regression,completion@/-heads@/.ly}.
@@ -761,6 +766,31 @@ with a set of horizontal lines, into a staff (plural `staves').  In our
 system, these lines are drawn using a separate layout object called
 staff symbol.
 
+The staff symbol may be tuned in the number, thickness and distannce
+of lines, using properties.  This is demonstrated in the example files
+@inputfileref{input/@/test,staff@/-lines@/.ly},
+@inputfileref{input/@/test,staff@/-size@/.ly}.
+
+In addition, staves may be started and stopped at will. This is done
+with @code{\startStaff} and @code{\stopStaff}.
+
+@lilypond[verbatim,relative=2,fragment]
+b4 b
+\override Staff.StaffSymbol #'line-count = 2
+\stopStaff  \startStaff
+b b
+\revert Staff.StaffSymbol #'line-count
+\stopStaff \startStaff
+b b  
+@end lilypond
+
+In combination with Frenched staves, this may be used to typeset ossia
+sections. An example is in @inputfileref{input/@/test@/,ossia.ly},
+shown here
+
+@cindex ossia
+
+@lilypondfile{ossia.ly}
 
 @cindex staff lines, setting number of
 @cindex staff lines, setting thickness of
@@ -769,16 +799,12 @@ staff symbol.
 
 @seealso
 
-Program reference: @internalsref{StaffSymbol}.
+Program reference: @internalsref{StaffSymbol}, @internalsref{StaffSpanEvent}.
 
 Examples: @inputfileref{input/@/test,staff@/-lines@/.ly},
+@inputfileref{input/@/test@/,ossia.ly},
 @inputfileref{input/@/test,staff@/-size@/.ly}.
 
-@refbugs
-
-If a staff is ended halfway a piece, the staff symbol may not end
-exactly on the bar line.
-
 
 @node Key signature
 @subsection Key signature
@@ -1744,6 +1770,9 @@ be achieved in LilyPond by setting @code{doubleSlurs},
 <c e>4 ( <d f> <c e> <d f> )
 @end lilypond
 
+Only one slur can be printed at once.  If you need to print a long
+slur over a few small slurs, please see @ref{Phrasing slurs}.
+
 
 @refcommands
 
@@ -1789,6 +1818,8 @@ normal slur.  However, they are treated as different objects.  A
 The commands @code{\slurUp}, @code{\slurDown}, and @code{\slurNeutral}
 will only affect normal slurs and not phrasing slurs.
 
+You cannot have simultaneous phrasing slurs.
+
 @refcommands
 
 @cindex @code{\phrasingSlurUp}
@@ -1955,8 +1986,9 @@ c2\fp c\sf c\sff c\sp c\spp c\sfz c\rfz
 
 
 A crescendo mark is started with @code{\<} and terminated with
-@code{\!}.  A decrescendo is started with @code{\>} and also terminated
-with @code{\!}.  Because these marks are bound to notes, you must
+@code{\!} or an absolute dynamic.  A decrescendo is started with
+@code{\>} and is also terminated with @code{\!} or an absolute
+dynamic.  Because these marks are bound to notes, you must
 use spacer notes if multiple marks are needed during one note
 
 @lilypond[quote,raggedright,fragment,verbatim,relative=2]
@@ -2255,6 +2287,18 @@ voice in the first @code{<< \\ >>} construct is effective in the second
 }
 @end lilypond
 
+Polyphony does not change the relationship of notes within a
+@code{\relative @{ @}} block.  Each note is calculated relative
+to the note immediately preceding it.
+
+@example
+\relative @{ noteA << noteB \\ noteC >> noteD @}
+@end example
+
+@code{noteC} is relative to @code{noteB}, not @code{noteA};
+@code{noteD} is relative to @code{noteC}, not @code{noteB} or
+@code{noteA}.
+
 @node Explicitly instantiating voices
 @subsection Explicitly instantiating voices