MusicXML: Add testcase for lyrics on chorded notes

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

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index d9fedf2c5538036a9edfd2abdc66c238bb72384a..8d054dc546e9e8609458d8be46a5347a57da9a5b 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -154,7 +154,7 @@ Notation Reference:
 
 @c FIXME: this section is to be rewritten.
 Since LilyPond input files are text, there is at least one
-issue to consider when working with vocal music: 
+issue to consider when working with vocal music:
 song texts must be interpreted as text, not notes.  For example, the
 input@tie{}@code{d} should be interpreted as a one letter syllable,
 not the note@tie{}D.
@@ -506,7 +506,7 @@ The following example uses different commands for entering lyrics.
     c4 b8. a16 g4. f8 e4 d c2
   }
 
-% not recommended: left aligns syllables 
+% not recommended: left aligns syllables
   \new Lyrics \lyricmode { Joy4 to8. the16 world!4. the8 Lord4 is come.2 }
 
 % wrong: durations needed
@@ -627,7 +627,7 @@ single syllable; such vocalises are called melismas, or melismata.
 @c it might be better to present it first - vv
 
 You can define melismata entirely in the lyrics, by entering @code{_}
-for every extra note that has to be added to the the melisma.
+for every extra note that has to be added to the melisma.
 
 @c FIXME: clarify: __ is used to crate a lyric extender,
 @c _ is used to add a note to a melisma, so both __ and _ are needed.
@@ -689,10 +689,12 @@ A complete example of a SATB score setup is in section
 
 
 @predefined
-
-@code{\melisma}, @code{\melismaEnd}
-@funindex \melismaEnd
 @funindex \melisma
+@code{\melisma},
+@funindex \melismaEnd
+@code{\melismaEnd}.
+@endpredefined
+
 
 @seealso
 
@@ -707,7 +709,7 @@ inserted by hand.
 @unnumberedsubsubsec Skipping notes
 
 Making a lyric line run slower than the melody can be achieved by
-inserting @code{\skip}s into the lyrics.  For every @code{\skip}, 
+inserting @code{\skip}s into the lyrics.  For every @code{\skip},
 the text will be delayed another note.  The @code{\skip} command
 must be followed by a valid duration, but this is ignored when
 @code{\skip} is used in lyrics.
@@ -1001,7 +1003,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g.,
 These numbers are put just before the start of the first syllable.
 
 @c TODO Create and add snippet to show how two lines of a
-@c stanza can be grouped together, along these lines: 
+@c stanza can be grouped together, along these lines:
 @c (might need improving a bit) -td
 
 @ignore
@@ -1025,8 +1027,8 @@ stanzaOneThree =  {
 }
 
 \new Voice {
-  \repeat volta 2 { c'8 c' c' c' c' c' c'4 
-                    c'8 c' c' c' c' c' c'4   } 
+  \repeat volta 2 { c'8 c' c' c' c' c' c'4
+                    c'8 c' c' c' c' c' c'4   }
 }  \addlyrics { \stanzaOneOne }
    \addlyrics { \stanzaOneThree }
 
@@ -1090,9 +1092,6 @@ multiple syllables in another one.  One solution is to make the faster
 voice ignore the melisma.  This is done by setting
 @code{ignoreMelismata} in the Lyrics context.
 
-There is one tricky aspect: the setting for @code{ignoreMelismata}
-must be set one syllable @emph{before} the non-melismatic syllable
-in the text, as shown here,
 
 @c  TODO: breaks compile
 @c seems to be fixed, does not break compile anymore --FV
@@ -1109,8 +1108,9 @@ in the text, as shown here,
     more slow -- ly
   }
   \new Lyrics \lyricsto "lahlah" {
-    \set ignoreMelismata = ##t % applies to "fas"
-    go fas -- ter
+    go
+    \set ignoreMelismata = ##t
+    fas -- ter
     \unset ignoreMelismata
     still
   }
@@ -1118,10 +1118,6 @@ in the text, as shown here,
 @end lilypond
 
 
-The @code{ignoreMelismata} applies to the syllable @q{fas}, so it
-should be entered before @q{go}.
-
-
 @subsubheading Switching to an alternative melody
 
 More complex variations in text underlay are possible.  It is possible
@@ -1264,7 +1260,7 @@ output in LilyPond.
 melody = \relative c' {
   c c c c | d d d d
 }
- 
+
 text = \lyricmode {
   \set stanza = "1." This is verse one.
   It has two lines.
@@ -1279,7 +1275,7 @@ text = \lyricmode {
 
 \markup {
   \fill-line {
-    \hspace #0.1 % moves the column off the left margin; 
+    \hspace #0.1 % moves the column off the left margin;
         % can be removed if space on the page is tight
      \column {
       \line { \bold "2."
@@ -1296,8 +1292,8 @@ text = \lyricmode {
         }
       }
     }
-    \hspace #0.1  % adds horizontal spacing between columns; 
-        % if they are still too close, add more " " pairs  
+    \hspace #0.1  % adds horizontal spacing between columns;
+        % if they are still too close, add more " " pairs
         % until the result looks good
      \column {
       \line { \bold "4."
@@ -1314,7 +1310,7 @@ text = \lyricmode {
         }
       }
     }
-  \hspace #0.1 % gives some extra space on the right margin; 
+  \hspace #0.1 % gives some extra space on the right margin;
       % can be removed if page space is tight
   }
 }