Minor editing.

diff --git a/ChangeLog b/ChangeLog
index 85bc60dd2204c54a7713d2bc8a23b4640bf05b8a..cc0076141c312c6c085861b519ce5d658f247508 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-22  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/examples.itely: minor editing.
+
+       * Documentation/user/changing-defaults.itely: minor editing.
+
+       * Documentation/user/notation.itely: clarified info on polyphony
+       and \addlyrics.
+
 2005-01-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/output-gnome.scm: 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 90158ecbd1f4db56023e4e10e1cdc64607365e27..c178378d78dbdbe96320c341e6bddcc8ff1ebfce 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1991,7 +1991,7 @@ then you could set
 @end example
 
 @noindent
-This sets the vertical size of the current staff to 4 staff spaces on
+This sets the vertical size of the current staff to 3 staff spaces on
 either side of the center staff line.  The argument of
 @code{minimumVerticalExtent} is interpreted as an interval, where the
 center line is the 0, so the first number is generally negative.  The

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 7acbd8e1d9272485ec52ad2822dbd8171fe1dc79..75d45e0b825edb945097b97c000d9fe84a25b63d 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -670,7 +670,7 @@ bassWords = \lyricmode {
 @end lilypond
 
 
-@subsection SATB vocal score and piano reduction
+@subsection SATB vocal score and automatic piano reduction
 
 This template adds an automatic piano reduction to the SATB vocal
 score.  This demonstrates one of the strengths of LilyPond -- you
@@ -747,13 +747,6 @@ bassWords = \lyricmode {
     \context Lyrics = basses \lyricsto basses \bassWords
   >>
   \new PianoStaff
-  <<
-    \new Staff <<
-    \context Lyrics = tenors \lyricsto tenors \tenorWords
-    \context Lyrics = basses \lyricsto basses \bassWords
-    >>
-  >>
-  \new PianoStaff
   <<
     \new Staff <<
       \set Staff.printPartCombineTexts = ##f

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index b83bb2bcac91f2c2a13f13d6b4d2d74a683cf3a7..3f030fcf58ea2bfc538c193b134dfaf6e1103ddd 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1457,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}
@@ -3821,6 +3835,10 @@ is the same as
 \lyricsto "blah" \new lyrics @{ LYRICS @}
 @end example
 
+@refbugs
+
+@code{\addlyrics} cannot handle polyphony.
+
 
 @node Entering lyrics
 @subsection Entering lyrics