Minor editing.

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 71ec568ee2c0849c1002e50e31f00548ecbf27d5..8af2acf8afc0a9fe22b5cfba8e64b798c45c1b76 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1371,15 +1371,17 @@ indefinitely.
 Timing can be changed by setting any of these variables explicitly.
 In the next example, the 4/4 time signature is printed, but
 @code{measureLength} is set to 5/4.  After a while, the measure is
-shortened by 1/8, by setting @code{measurePosition} to -3/8 at 2/4 in
-the measure, so the next bar line will fall at 2/4 + 3/8.
+shortened by 1/8, by setting @code{measurePosition} to 7/8 at 2/4
+in the measure, so the next bar line will fall at 2/4 + 3/8.  The
+3/8 arises because 5/4 normally has 10/8, but we have manually
+set the measure position to be 7/8 and 10/8 - 7/8 = 3/8.
 
 @lilypond[quote,raggedright,verbatim,relative,fragment]
 \set Score.measureLength = #(ly:make-moment 5 4)
 c1 c4
 c1 c4
 c4 c4
-\set Score.measurePosition = #(ly:make-moment -3 8)
+\set Score.measurePosition = #(ly:make-moment 7 8)
 b8 b b
 c4 c1
 @end lilypond
@@ -1388,8 +1390,8 @@ c4 c1
 @node Controlling formatting of prefatory matter
 @subsection Controlling formatting of prefatory matter
 
-@c  This section will be moved to somewhere else soon.
-This example demonstrates how to place prefactory matter
+@c  This section will be moved to somewhere else soon. -gp
+This example demonstrates how to place prefatory matter
 (such as the clef and key signature) at the end of a line.
 
 @lilypond[quote,verbatim]
@@ -1455,7 +1457,21 @@ voices are sometimes called ``layers'' in other notation packages}
 @cindex layers
 to be instantiated.  They bear the names @code{"1"}, @code{"2"}, etc.  In
 each of these contexts, vertical direction of slurs, stems, etc., is set
-appropriately.
+appropriately.  Specifically,
+
+@example
+<< \upper \\ \lower >>
+@end example
+
+@noindent
+is equivalent to
+
+@example
+<<
+  \context Voice = "1" @{ \voiceOne \upper @}
+  \context Voice = "2" @{ \voiceTwo \lower @}
+>>
+@end example
 
 @cindex @code{\voiceOne}
 @cindex @code{\voiceFour}
@@ -1477,6 +1493,11 @@ a stem directions and horizontal shift for each part
 The command @code{\oneVoice} will revert back to the normal setting.
 @cindex @code{\oneVoice}
 
+Defining voices (either with the separator @code{\\} or with
+@code{\voiceXXX}) will set the direction of stems, slurs, ties,
+articulations, text annotations, augmentation dots of dotted
+notes, and fingerings.  @code{\voiceOne} makes these objects
+point upwards, while @code{\voiceTwo} makes them point down.
 
 Normally, note heads with a different number of dots are not merged, but
 when the object property @code{merge-differently-dotted} is set in
@@ -3764,7 +3785,7 @@ for complex vocal music.
 * Flexibility in alignment::    
 * More stanzas::                
 * Ambitus::                     
-* Other vocal issues::
+* Other vocal issues::          
 @end menu
 
 @node Setting simple songs
@@ -3819,6 +3840,10 @@ is the same as
 \lyricsto "blah" \new lyrics @{ LYRICS @}
 @end example
 
+@refbugs
+
+@code{\addlyrics} cannot handle polyphony.
+
 
 @node Entering lyrics
 @subsection Entering lyrics
@@ -5211,9 +5236,13 @@ c1 \mark \markup { \musicglyph #"scripts-ufermata" }
 c1
 @end lilypond
 
-In the case of a line break, marks must also be printed at the end of
-the line, and not at the beginning.  Use the following to force that
-behavior
+If the mark occurs at a line break, the mark will be printed at the
+beginning of the next line.
+@c  IMO this is a bug; hopefully it'll be fixed soon, so I can
+@c  delete this sentence.   -gp
+If there is no next line, then the mark will not be printed at all.
+To print the mark at the end of the current line, use
+
 @example
 \override Score.RehearsalMark
   #'break-visibility = #begin-of-line-invisible
@@ -5622,8 +5651,8 @@ properties.
   \set Score.soloIIText = #"ni"
   \set Score.aDueText = #"tachi"
   \partcombine
-    \relative g' { g a( b) r }
-    \relative g' { g r4 r f }
+    \relative g' { g4 g a( b) r }
+    \relative g' { g4 g r r f }
 >>
 @end lilypond