From e39b66f4823911d9da4b4e32addf27027ce4cb0d Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Tue, 30 Sep 2008 21:10:58 +0200 Subject: [PATCH] Introducing the new layout for NR 2.1 Vocal music "Entering lyrics" has been renamed into "Lyrics explained" "Common notation for vocals" has been renamed into "Entering lyrics" (better consistency with NR 1.x.y titles) "Placement of lyrics" has been renamed into "Specific uses of lyrics" The first section (now called "Entering lyrics") has also been reorganized. The German, Spanish and French vocal.itely files have been updated, but not the po files. --- Documentation/de/user/vocal.itely | 31 ++--- Documentation/es/user/vocal.itely | 116 ++++++++-------- Documentation/fr/user/vocal.itely | 118 ++++++++-------- Documentation/user/vocal.itely | 224 +++++++++++++----------------- 4 files changed, 228 insertions(+), 261 deletions(-) diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely index 76cc28b5f8..144a9e7717 100644 --- a/Documentation/de/user/vocal.itely +++ b/Documentation/de/user/vocal.itely @@ -15,27 +15,28 @@ @menu -* Common notation for vocals:: +* Entering lyrics:: * Aligning lyrics to a melody:: -* Placement of lyrics:: +* Specific uses of lyrics:: * Stanzas:: @end menu -@node Common notation for vocals -@subsection Common notation for vocals +@node Entering lyrics +@subsection Entering lyrics @untranslated @menu -* References for vocal music:: +* Lyrics explained:: * Setting simple songs:: -* Entering lyrics:: * Working with lyrics and variables:: +* References for vocal music:: @end menu -@node References for vocal music -@subsubsection References for vocal music + +@node Lyrics explained +@subsubsection Lyrics explained @untranslated @@ -45,15 +46,13 @@ @untranslated - -@node Entering lyrics -@subsubsection Entering lyrics +@node Working with lyrics and variables +@subsubsection Working with lyrics and variables @untranslated - -@node Working with lyrics and variables -@subsubsection Working with lyrics and variables +@node References for vocal music +@subsubsection References for vocal music @untranslated @@ -116,8 +115,8 @@ @untranslated -@node Placement of lyrics -@subsection Placement of lyrics +@node Specific uses of lyrics +@subsection Specific uses of lyrics @untranslated diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely index 331e2b7ac4..00b735eed9 100644 --- a/Documentation/es/user/vocal.itely +++ b/Documentation/es/user/vocal.itely @@ -33,9 +33,9 @@ examinando el método más simple, y poco a poco iremos aumentando la complejidad. @menu -* Common notation for vocals:: +* Entering lyrics:: * Aligning lyrics to a melody:: -* Placement of lyrics:: +* Specific uses of lyrics:: * Stanzas:: @end menu @@ -64,65 +64,19 @@ Para hacer que la letra evite las líneas divisorias también, utilice @} @end example -@node Common notation for vocals -@subsection Common notation for vocals +@node Entering lyrics +@subsection Entering lyrics @menu -* References for vocal music:: -* Setting simple songs:: -* Entering lyrics:: -* Working with lyrics and variables:: +* Lyrics explained:: +* Setting simple songs:: +* Working with lyrics and variables:: +* References for vocal music:: @end menu -@node References for vocal music -@subsubsection References for vocal music - -@c TODO Add @refs - -@q{Parlato} es texto hablado sin notas pero con ritmo; su notación se -realiza mediante cabezas de nota en forma de cruz. Esto queda demostrado en -@ref{Special note heads}. - - -@node Setting simple songs -@subsubsection Setting simple songs - -@cindex \addlyrics - -La manera más fácil de poner letra a una melodía es añadir - -@example -\addlyrics @{ @var{la letra} @} -@end example - -@noindent -a la melodía. He aquí un ejemplo: - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative c' { c2 e4 g2. } -\addlyrics { play the game } -@end lilypond - -Se pueden añadir más versos mediante la adición de más secciones -@code{\addlyrics} - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative c' { c2 e4 g2. } -\addlyrics { play the game } -\addlyrics { speel het spel } -\addlyrics { joue le jeu } -@end lilypond - -La instrucción @code{\addlyrics} no puede manejar situaciones de -polifonía. Para estos casos tendrá que usar @code{\lyricsto} y -@code{\lyricmode}, tal y como se explicará en @ref{Entering lyrics}. - - -@node Entering lyrics -@subsubsection Entering lyrics +@node Lyrics explained +@subsubsection Lyrics explained @cindex letra @funindex \lyricmode @@ -266,6 +220,43 @@ verseOne = \lyricmode @{ Joy to the world the Lord is come @} Referencia de funcionamiento interno: @rinternals{LyricText}, @rinternals{LyricSpace}. + +@node Setting simple songs +@subsubsection Setting simple songs + +@cindex \addlyrics + +La manera más fácil de poner letra a una melodía es añadir + +@example +\addlyrics @{ @var{la letra} @} +@end example + +@noindent +a la melodía. He aquí un ejemplo: + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative c' { c2 e4 g2. } +\addlyrics { play the game } +@end lilypond + +Se pueden añadir más versos mediante la adición de más secciones +@code{\addlyrics} + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative c' { c2 e4 g2. } +\addlyrics { play the game } +\addlyrics { speel het spel } +\addlyrics { joue le jeu } +@end lilypond + +La instrucción @code{\addlyrics} no puede manejar situaciones de +polifonía. Para estos casos tendrá que usar @code{\lyricsto} y +@code{\lyricmode}, tal y como se explicará en @ref{Lyrics explained}. + + @node Working with lyrics and variables @subsubsection Working with lyrics and variables @@ -326,6 +317,15 @@ El código de entrada definitivo sería algo como Referencia de funcionamiento interno: @rinternals{LyricCombineMusic}, @rinternals{Lyrics}. +@node References for vocal music +@subsubsection References for vocal music + +@c TODO Add @refs + +@q{Parlato} es texto hablado sin notas pero con ritmo; su notación se +realiza mediante cabezas de nota en forma de cruz. Esto queda demostrado en +@ref{Special note heads}. + @node Aligning lyrics to a melody @subsection Aligning lyrics to a melody @@ -622,8 +622,8 @@ Referencia de funcionamiento interno: @rinternals{LyricExtender}, @untranslated -@node Placement of lyrics -@subsection Placement of lyrics +@node Specific uses of lyrics +@subsection Specific uses of lyrics A menudo se aplican a una melodía distintos versos de una canción de formas ligeramente distintas. Tales variantes pueden aún captarse diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely index 8ab2e21546..c6683f5607 100644 --- a/Documentation/fr/user/vocal.itely +++ b/Documentation/fr/user/vocal.itely @@ -32,9 +32,9 @@ Plusieurs solutions existent pour ajouter des paroles ; nous les examinerons par degré croissant de complexité. @menu -* Common notation for vocals:: +* Entering lyrics:: * Aligning lyrics to a melody:: -* Placement of lyrics:: +* Specific uses of lyrics:: * Stanzas:: @end menu @@ -62,66 +62,19 @@ Pour que les paroles évitent également les barres de mesure, ajoutez @end example -@node Common notation for vocals -@subsection Common notation for vocals +@node Entering lyrics +@subsection Entering lyrics @menu -* References for vocal music:: -* Setting simple songs:: -* Entering lyrics:: -* Working with lyrics and variables:: +* Lyrics explained:: +* Setting simple songs:: +* Working with lyrics and variables:: +* References for vocal music:: @end menu -@node References for vocal music -@subsubsection References for vocal music - -@c TODO Add @refs - -Le @emph{parlato} est du texte scandé en rythme, mais sans hauteurs -définies ; il est indiqué par des notes en croix, à l'instar des -percussions --- voir @ref{Special note heads}. - - -@node Setting simple songs -@subsubsection Setting simple songs - -@cindex \addlyrics - -Le plus simple pour ajouter des paroles à une mélodie est d'adjoindre - -@example -\addlyrics @{ @var{les paroles} @} -@end example - -@noindent -à la mélodie. En voici un exemple : - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative { c2 e4 g2. } -\addlyrics { play the game } -@end lilypond - -On peut ajouter davantage de couplets en multipliant le nombre de -sections @code{\addlyrics}. - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative { c2 e4 g2. } -\addlyrics { play the game } -\addlyrics { speel het spel } -\addlyrics { joue le jeu } -@end lilypond - -Cependant, la commande @code{\addlyrics} ne peut gérer les -constructions polyphoniques. Dans ce cas, mieux vaut employer -@code{\lyricsto} et @code{\lyricmode}, comme nous le verrons dans -@ref{Entering lyrics}. - - -@node Entering lyrics -@subsubsection Entering lyrics +@node Lyrics explained +@subsubsection Lyrics explained @cindex paroles @funindex \lyricmode @@ -257,6 +210,43 @@ verseOne = \lyricmode @{ Joy to the world the Lord is come @} Référence du programme : @rinternals{LyricText}, @rinternals{LyricSpace}. +@node Setting simple songs +@subsubsection Setting simple songs + +@cindex \addlyrics + +Le plus simple pour ajouter des paroles à une mélodie est d'adjoindre + +@example +\addlyrics @{ @var{les paroles} @} +@end example + +@noindent +à la mélodie. En voici un exemple : + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative { c2 e4 g2. } +\addlyrics { play the game } +@end lilypond + +On peut ajouter davantage de couplets en multipliant le nombre de +sections @code{\addlyrics}. + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative { c2 e4 g2. } +\addlyrics { play the game } +\addlyrics { speel het spel } +\addlyrics { joue le jeu } +@end lilypond + +Cependant, la commande @code{\addlyrics} ne peut gérer les +constructions polyphoniques. Dans ce cas, mieux vaut employer +@code{\lyricsto} et @code{\lyricmode}, comme nous le verrons dans +@ref{Lyrics explained}. + + @node Working with lyrics and variables @subsubsection Working with lyrics and variables @@ -319,6 +309,16 @@ Référence du programme : @rinternals{LyricCombineMusic}, @rinternals{Lyrics}. +@node References for vocal music +@subsubsection References for vocal music + +@c TODO Add @refs + +Le @emph{parlato} est du texte scandé en rythme, mais sans hauteurs +définies ; il est indiqué par des notes en croix, à l'instar des +percussions --- voir @ref{Special note heads}. + + @node Aligning lyrics to a melody @subsection Aligning lyrics to a melody @@ -616,8 +616,8 @@ Référence du programme : @rinternals{LyricExtender}, @englishref @end ifnothtml -@node Placement of lyrics -@subsection Placement of lyrics +@node Specific uses of lyrics +@subsection Specific uses of lyrics Une même mélodie peut se voir traitée différemment suivant les couplets. La commande @code{\lyricsto} permet de prendre en compte ces variantes. diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely index c542f66d43..eb96f64cda 100644 --- a/Documentation/user/vocal.itely +++ b/Documentation/user/vocal.itely @@ -11,140 +11,33 @@ @node Vocal music @section Vocal music -@c TODO: CLARIFY -@c TODO: delete this comment block -@c http://code.google.com/p/lilypond/issues/detail?id=248 -@c Done, see @node Lyrics independent of notes ----FV +@c TODO: inspirational headword -@c http://code.google.com/p/lilypond/issues/detail?id=329 -@c Done, see @node Working with lyrics and variables ----FV - -@c partially done, needs improvement, see Switching to an alternative melody ----FV -@ignore - -> I think the issue here is that changing the associatedVoice -> happens one step -> later than expected. I could be wrong, but I don't think this -> is obviously -> documented. - -If you read section "Switching the melody associated with a lyrics -line" -it indeed says "Again, the command must be one syllable too -early,..."! -One problem with the current formulation is that the "Again" -refers to what's described 2 subsections earlier in "Lyrics to -multiple notes of a melisma", which isn't obvious unless you have -read all the sections -sequentially. - - -@c Done in @node Extenders and hyphens ---FV -@c also done (duplicated) in @node Multiple notes to one syllable --FV -I don't know who's working on the vocal music right now, but I -found something that should be clarified in NR 2.1.2.4. - -It should be made clear that __ is used to crate a lyric extender, -and _ is used to add a note to a melisma, so both __ and _ are -used. The example shows it, but there is no description of the -lyrics extender in this section. -@end ignore - - -Since LilyPond input files are text, there are two issues to consider -when working with vocal music: - -@itemize -@item -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. - -@item -Song texts must be aligned with the notes of their melody. -@end itemize - -To address the first issue, the fundamental method is the special mode -opened by @code{\lyricmode} that interprets its contents as text. -This mode is implicit by some abbreviated methods, as we will see. - -Aligning of text with melodies can be made automatically, but if you -specify the durations of the syllables it can also be made manually. -Lyrics aligning and typesetting are prepared with the help of skips, -hyphens and extender lines. - -All these methods and their combinations lead to a few different ways -to define lyrics; we shall begin by examining the simplest method, and -gradually increase complexity. +This section explains how to typeset vocal music, and make sure +that the lyrics will be aligned with the notes of their melody. @menu -* Common notation for vocals:: +* Entering lyrics:: * Aligning lyrics to a melody:: -* Placement of lyrics:: +* Specific uses of lyrics:: * Stanzas:: @end menu +@node Entering lyrics +@subsection Entering lyrics -@node Common notation for vocals -@subsection Common notation for vocals +@c TODO add one sentence here. -vv @menu -* References for vocal music:: +* Lyrics explained:: * Setting simple songs:: -* Entering lyrics:: * Working with lyrics and variables:: +* References for vocal music:: @end menu -@node References for vocal music -@subsubsection References for vocal music - -TBC -@c TODO Add @refs - -@q{Parlato} is spoken without pitch but still with rhythm; it is -notated by cross note heads. This is demonstrated in -@ref{Special note heads}. - - -@node Setting simple songs -@subsubsection Setting simple songs - -@cindex \addlyrics - -The easiest way to add lyrics to a melody is to append - -@example -\addlyrics @{ @var{the lyrics} @} -@end example - -@noindent -to a melody. Here is an example, - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative c' { c2 e4 g2. } -\addlyrics { play the game } -@end lilypond - -More stanzas can be added by adding more -@code{\addlyrics} sections - -@lilypond[ragged-right,verbatim,fragment,quote] -\time 3/4 -\relative c' { c2 e4 g2. } -\addlyrics { play the game } -\addlyrics { speel het spel } -\addlyrics { joue le jeu } -@end lilypond - -The command @code{\addlyrics} cannot handle polyphony settings. For these -cases you should use @code{\lyricsto} and @code{\lyricmode}, as will be -introduced in @ref{Entering lyrics}. - - -@node Entering lyrics -@subsubsection Entering lyrics +@node Lyrics explained +@subsubsection Lyrics explained @cindex lyrics @funindex \lyricmode @@ -152,6 +45,15 @@ introduced in @ref{Entering lyrics}. @cindex spaces, in lyrics @cindex quotes, in lyrics +@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: +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. +Therefore, a special lyric mode has to be used, either explicitely +or using some abbreviated methods. + Lyrics are entered in a special input mode, which can be introduced by the keyword @code{\lyricmode}, or by using @code{\addlyrics} or @code{\lyricsto}. In this mode you can enter lyrics, @@ -283,6 +185,45 @@ Internals Reference: @rinternals{LyricText}, @rinternals{LyricSpace}. + +@node Setting simple songs +@subsubsection Setting simple songs + +@cindex \addlyrics + +The easiest way to add lyrics to a melody is to append + +@example +\addlyrics @{ @var{the lyrics} @} +@end example + +@noindent +to a melody. Here is an example, + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative c' { c2 e4 g2. } +\addlyrics { play the game } +@end lilypond + +More stanzas can be added by adding more +@code{\addlyrics} sections + +@lilypond[ragged-right,verbatim,fragment,quote] +\time 3/4 +\relative c' { c2 e4 g2. } +\addlyrics { play the game } +\addlyrics { speel het spel } +\addlyrics { joue le jeu } +@end lilypond + +The command @code{\addlyrics} cannot handle polyphony settings. For these +cases you should use @code{\lyricsto} and @code{\lyricmode}, as will be +introduced in @ref{Lyrics explained}. + +@c TODO: one additional section may be needed here, +@c such as "advanced lyric syntax" or whatever -vv + @node Working with lyrics and variables @subsubsection Working with lyrics and variables @@ -338,7 +279,7 @@ The final input would resemble @end example @ignore - +@c FIXME http://code.google.com/p/lilypond/issues/detail?id=329 The problem cannot be reproduced. The following has no sense, because the issue seems to be fixed. @@ -377,6 +318,20 @@ Internals Reference: @rinternals{Lyrics}. +@node References for vocal music +@subsubsection References for vocal music + +TBC +@c TODO Add @refs + +@c Nope -- this section is to be removed. +@c With a vengeance :-) -vv + +@q{Parlato} is spoken without pitch but still with rhythm; it is +notated by cross note heads. This is demonstrated in +@ref{Special note heads}. + + @node Aligning lyrics to a melody @subsection Aligning lyrics to a melody @@ -384,6 +339,12 @@ Internals Reference: @funindex \addlyrics @funindex \lyricsto +@c FIXME: this stuff is to be rewritten. -vv + +Aligning of text with melodies can be made automatically, but if you +specify the durations of the syllables it can also be made manually. +Lyrics aligning and typesetting are prepared with the help of skips, +hyphens and extender lines. Lyrics are printed by interpreting them in the context called @rinternals{Lyrics}. @@ -570,6 +531,9 @@ single syllable; such vocalises are called melismas, or melismata. You can define melismata entirely in the lyrics, by entering @code{_} for every extra note that has to be added to the 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. + @c verbose! --FV @c duplicated: TODO fix Additionaly, you can make an extender line to be typeset to indicate @@ -617,8 +581,7 @@ In addition, notes are considered a melisma if they are manually beamed, and automatic beaming (see @ref{Setting automatic beam behavior}) is switched off. -@c TODO: there might be some more relevant place for -@c the following link (?) +@c FIXME: this now links to LM -vv @cindex SATB @cindex choral score @@ -707,8 +670,10 @@ Internals Reference: TBC -@node Placement of lyrics -@subsection Placement of lyrics +@node Specific uses of lyrics +@subsection Specific uses of lyrics + +@c FIXME This whole section is to be reorganized. -vv Often, different stanzas of one song are put to one melody in slightly differing ways. Such variations can still be captured with @@ -861,11 +826,13 @@ layout. } @end lilypond -@snippets -@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] -{aligning-lyrics.ly} - +@c @snippets +@c This snippet has been renamed to "lyrics-alignment.ly" +@c update as soon as lsr/is updated -vv +@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] +@c {lyrics-alignment.ly} +@c TODO: move to LSR -vv @snippets Checking to make sure that text scripts and lyrics are within the margins is @@ -1128,6 +1095,7 @@ This is achieved with Here, @code{alternative} is the name of the @code{Voice} context containing the triplet. +@c FIXME: make this easier to understand -vv This command must be one syllable too early, before @q{Ty} in this case. In other words, changing the associatedVoice happens one step later than expected. This is for technical reasons, and it is not a -- 2.39.5