From 777408ce1f7ba1ca5fadf3f638fac612be6b2e27 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 25 Jul 2004 14:18:26 +0000
Subject: [PATCH] *** empty log message ***

---
 Documentation/user/cheatsheet.itely |  2 +-
 Documentation/user/notation.itely   | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 4214bca3cf..5e174d1f52 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -243,7 +243,7 @@ twinkle
 @lilypond[fragment,relative=2]
 <<
   \notes { g'4 g }
-  \lyricsto "" \new Lyrics \lyrics { twin -- kle }
+  \lyricsto "" \new Lyrics { twin -- kle }
 >> 
 @end lilypond
 
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 69146ccac4..86bedb92e1 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -3444,14 +3444,16 @@ automatically.  In this case, it is no longer necessary to enter the
 correct duration for each syllable.  This is achieved by combining the
 melody and the lyrics with the @code{\lyricsto} expression
 @example
-\lyricsto @var{name} \new Lyrics \lyrics @dots{} 
+\lyricsto @var{name} \new Lyrics @dots{} 
 @end example
 
 This aligns the lyrics to the
 @c
 notes of the @internalsref{Voice} context called @var{name}, which has
 to exist. Therefore, normally the @code{Voice} is specified first, and
-then the lyrics are specified with @code{\lyricsto}.
+then the lyrics are specified with @code{\lyricsto}. The command
+@code{\lyricsto} switches to @code{\lyrics} mode automatically, so
+@code{\lyrics} may be skipped.
 
 For different or more complex orderings, the best way is to setup the
 hierarchy of staves and lyrics first, e.g.
@@ -3497,7 +3499,7 @@ last one, e.g.
     \melismaEnd
     e2
   }
-  \lyricsto "lala" \new Lyrics \lyrics {
+  \lyricsto "lala" \new Lyrics {
     la di __ daah 
   }
 >>
@@ -3615,6 +3617,10 @@ that identity followed by a dash.  In the preceding example, the
     Ooooo, ch\'e -- ri, je t'aime. @}
 @end example
 
+@c  \lyricsto in the example below is pointless, given subject of the
+@c  section.
+
+
 The complete example is shown here
 @lilypond[quote,raggedright,verbatim]
 \score {
@@ -3623,10 +3629,10 @@ The complete example is shown here
       \time 3/4
        g2 e4 a2 f4 g2. }
     <<
-      \lyricsto "duet" \new Lyrics \lyrics {
+      \lyricsto "duet" \new Lyrics {
         \set vocalName = "Bert"
         Hi, my name is Bert. }
-      \lyricsto "duet" \new Lyrics \lyrics {
+      \lyricsto "duet" \new Lyrics {
         \set vocalName = "Ernie"
         Ooooo, ch\'e -- ri, je t'aime. }
     >>
@@ -3644,7 +3650,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g.
 <<
   \context Voice = duet {
     \time 3/4 g2 e4 a2 f4 g2. }
-    \lyricsto "duet" \new Lyrics \lyrics {
+    \lyricsto "duet" \new Lyrics {
      \set stanza = "1. "
      Hi, my name is Bert. }
 >>
@@ -7294,7 +7300,7 @@ entering the chant, as the following short excerpt demonstrates
         \[ a \flexa \deminutum g\melismaEnd \] f \divisioMinima
       }
     }
-    \lyricsto "cantus" \new Lyrics \lyrics {
+    \lyricsto "cantus" \new Lyrics {
       San- ctus, San- ctus, San- ctus
     }
   >>
-- 
2.39.5