* Documentation/user/ various: final round of reorg.
+ * Documentation/user/instrument-notation.itely: some more
+ fixes from Eduardo, thanks!
+
2006-05-02 Han-Wen Nienhuys <hanwen@lilypond.org>
* flower/file-path.cc (is_dir): canonicalize file name before stat'ing.
* The Lyrics context::
* Melismata::
* Another way of entering lyrics::
-* Flexibility in alignment::
+* Flexibility in placement::
+* Switching the melody associated with a lyrics line::
+* Specifying melismata within the lyrics::
* More about stanzas::
* Ambitus::
* Other vocal issues::
@c TODO: document \new Staff << Voice \lyricsto >> bug
-@node Flexibility in alignment
-@subsection Flexibility in alignment
+@node Flexibility in placement
+@subsection Flexibility in placement
Often, different stanzas of one song are put to one melody in slightly
differing ways. Such variations can still be captured with
@code{\lyricsto}.
+@menu
+* Lyrics to multiple notes of a melisma::
+@end menu
+
+@node Lyrics to multiple notes of a melisma
@subsubsection Lyrics to multiple notes of a melisma
voice ignore the melisma. This is done by setting
@code{ignoreMelismata} in the Lyrics context.
-There has one tricky aspect. The setting for @code{ignoreMelismata}
+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,
@end lilypond
+@node Switching the melody associated with a lyrics line
@subsection Switching the melody associated with a lyrics line
-
More complex variations in text underlay are possible. It is possible
to switch the melody for a line of lyrics during the text. This is
done by setting the @code{associatedVoice} property. In the example
@code{lahlah} to @code{associatedVoice}.
-
+@node Specifying melismata within the lyrics
@subsection Specifying melismata within the lyrics
It is also possible to define melismata entirely in the lyrics. This
{ Ky -- _ _ ri __ _ _ _ e }
@end lilypond
+@menu
+* Spacing lyrics::
+@end menu
+
+@node Spacing lyrics
@subsubsection Spacing lyrics
@cindex Spacing lyrics
@itemize bullet
-@item Linux: @file{/usr/ ... }
+@item Linux: @file{@{INSTALLDIR@}/lilypond/usr/share/lilypond/current/}
@item OSX:
-@file{@{LILYPOND_INSTALLED_DIR@}/LilyPond.app/Contents/Resources/share/lilypond/current/}.
+@file{@{INSTALLDIR@}/LilyPond.app/Contents/Resources/share/lilypond/current/}.
To access this, either @code{cd} into this directory from
the Terminal, or control-click on the LilyPond application
and select "Show Package Contents".
-@item Windows:
+@item Windows: @file{C:/Program Files/LilyPond/usr/share/lilypond/current/}
@end itemize