Updated NR2.1 Vocal music

diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely
index c0562cd90b289d1d4905b3c8269d980bb5ab31fd..7b803357d28fef85b9aed2b5b728de442117e1bf 100644 (file)
--- a/Documentation/de/user/vocal.itely
+++ b/Documentation/de/user/vocal.itely
@@ -15,12 +15,60 @@
 
 
 @menu
+* Common notation for vocal music::
 * Entering lyrics::
 * Aligning lyrics to a melody::
 * Specific uses of lyrics::
 * Stanzas::
 @end menu
 
+
+
+@node Common notation for vocal music
+@subsection Common notation for vocal music
+
+@untranslated
+
+@menu
+* References for vocal music and lyrics::
+* Opera::
+* Song books::
+* Chants::
+* Spoken music::
+* Ancient vocal music::
+@end menu
+
+
+@node References for vocal music and lyrics
+@unnumberedsubsubsec References for vocal music and lyrics
+
+@untranslated
+
+@node Opera
+@unnumberedsubsubsec Opera
+
+@untranslated
+
+@node Song books
+@unnumberedsubsubsec Song books
+
+@untranslated
+
+@node Spoken music
+@unnumberedsubsubsec Spoken music
+
+@untranslated
+
+@node Chants
+@unnumberedsubsubsec Chants
+
+@untranslated
+
+@node Ancient vocal music
+@unnumberedsubsubsec Ancient vocal music
+
+@untranslated
+
 @node Entering lyrics
 @subsection Entering lyrics
 
@@ -31,7 +79,6 @@
 * Lyrics explained::
 * Setting simple songs::
 * Working with lyrics and variables::
-* References for vocal music::
 @end menu
 
 
@@ -51,11 +98,6 @@
 
 @untranslated
 
-@node References for vocal music
-@unnumberedsubsubsec References for vocal music
-
-@untranslated
-
 
 @node Aligning lyrics to a melody
 @subsection Aligning lyrics to a melody
@@ -124,7 +166,6 @@
 @menu
 * Divisi lyrics::
 * Lyrics independent of notes::
-* Chants::
 * Spacing out syllables::
 * Centering lyrics between staves::
 @end menu
@@ -141,12 +182,6 @@
 @untranslated
 
 
-@node Chants
-@unnumberedsubsubsec Chants
-
-@untranslated
-
-
 @node Spacing out syllables
 @unnumberedsubsubsec Spacing out syllables
 

diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely
index 7357b56f2ae9b14c17ab0f35091ed690422b0649..fca24d75d446c78e97accb9287da38b4b3b01f2d 100644 (file)
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/user/vocal.itely
@@ -33,6 +33,7 @@ examinando el método más simple, y poco a poco iremos aumentando la
 complejidad.
 
 @menu
+* Common notation for vocal music::
 * Entering lyrics::  
 * Aligning lyrics to a melody::  
 * Specific uses of lyrics::         
@@ -64,6 +65,58 @@ Para hacer que la letra evite las líneas divisorias también, utilice
 @}
 @end example
 
+
+@node Common notation for vocal music
+@subsection Common notation for vocal music
+
+@untranslated
+
+
+@menu
+* References for vocal music and lyrics::
+* Opera::
+* Song books::
+* Chants::
+* Spoken music::
+* Ancient vocal music::
+@end menu
+
+
+@node References for vocal music and lyrics
+@unnumberedsubsubsec References for vocal music and lyrics
+
+@untranslated
+
+@node Opera
+@unnumberedsubsubsec Opera
+
+@untranslated
+
+@node Song books
+@unnumberedsubsubsec Song books
+
+@untranslated
+
+@node Spoken music
+@unnumberedsubsubsec Spoken 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 Chants
+@unnumberedsubsubsec Chants
+
+@untranslated
+
+@node Ancient vocal music
+@unnumberedsubsubsec Ancient vocal music
+
+@untranslated
+
+
 @node Entering lyrics
 @subsection Entering lyrics
 
@@ -71,7 +124,6 @@ Para hacer que la letra evite las líneas divisorias también, utilice
 * Lyrics explained::
 * Setting simple songs::
 * Working with lyrics and variables::
-* References for vocal music::
 @end menu
 
 
@@ -317,16 +369,6 @@ El código de entrada definitivo sería algo como
 Referencia de funcionamiento interno:
 @rinternals{LyricCombineMusic}, @rinternals{Lyrics}.
 
-@node References for vocal music
-@unnumberedsubsubsec 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
 
@@ -631,8 +673,7 @@ mediante @code{\lyricsto}.
 
 @menu
 * Divisi lyrics::               
-* Lyrics independent of notes::  
-* Chants::                      
+* Lyrics independent of notes::                    
 * Spacing out syllables::       
 * Centering lyrics between staves::  
 @end menu
@@ -711,11 +752,6 @@ lyr = \lyricmode { I like my cat! }
 >>
 @end lilypond
 
-@node Chants
-@unnumberedsubsubsec Chants
-
-@untranslated
-
 
 @node Spacing out syllables
 @unnumberedsubsubsec Spacing out syllables

diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely
index 6634728d5e975ba5e8f0f13d07faaf4b441b2609..df57be70ed252d755cb1721573ff3de3e4effbf8 100644 (file)
--- a/Documentation/fr/user/vocal.itely
+++ b/Documentation/fr/user/vocal.itely
@@ -32,6 +32,7 @@ Plusieurs solutions existent pour ajouter des paroles ; nous les
 examinerons par degré croissant de complexité.
 
 @menu
+* Common notation for vocal music::
 * Entering lyrics::  
 * Aligning lyrics to a melody::  
 * Specific uses of lyrics::         
@@ -62,6 +63,53 @@ Pour que les paroles évitent également les barres de mesure, ajoutez
 @end example
 
 
+@node Common notation for vocal music
+@subsection Common notation for vocal music
+
+@untranslated
+
+@menu
+* References for vocal music and lyrics::
+* Opera::
+* Song books::
+* Chants::
+* Spoken music::
+* Ancient vocal music::
+@end menu
+
+@node References for vocal music and lyrics
+@unnumberedsubsubsec References for vocal music and lyrics
+
+@untranslated
+
+@node Opera
+@unnumberedsubsubsec Opera
+
+@untranslated
+
+@node Song books
+@unnumberedsubsubsec Song books
+
+@untranslated
+
+@node Spoken music
+@unnumberedsubsubsec Spoken music
+
+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 Chants
+@unnumberedsubsubsec Chants
+
+@untranslated
+
+@node Ancient vocal music
+@unnumberedsubsubsec Ancient vocal music
+
+@untranslated
+
+
 @node Entering lyrics
 @subsection Entering lyrics
 
@@ -69,7 +117,6 @@ Pour que les paroles évitent également les barres de mesure, ajoutez
 * Lyrics explained::
 * Setting simple songs::
 * Working with lyrics and variables::
-* References for vocal music::
 @end menu
 
 
@@ -309,17 +356,6 @@ Référence du programme : @rinternals{LyricCombineMusic},
 @rinternals{Lyrics}.  
 
 
-@node References for vocal music
-@unnumberedsubsubsec 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
 
@@ -624,8 +660,7 @@ La commande @code{\lyricsto} permet de prendre en compte ces variantes.
 
 @menu
 * Divisi lyrics::               
-* Lyrics independent of notes::  
-* Chants::                      
+* Lyrics independent of notes::                
 * Spacing out syllables::       
 * Centering lyrics between staves::  
 @end menu
@@ -704,10 +739,6 @@ lyr = \lyricmode { I like my cat! }
 >>
 @end lilypond
 
-@node Chants
-@unnumberedsubsubsec Chants
-
-@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 0ab25a2d9ccc9b626c01d45be23eee37aa61b3aa..e33dcb6c3940011eae85a698de697dbad58b6f03 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -17,12 +17,115 @@ 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 vocal music::
 * Entering lyrics::
 * Aligning lyrics to a melody::
 * Specific uses of lyrics::
 * Stanzas::
 @end menu
 
+
+@node Common notation for vocal music
+@subsection Common notation for vocal music
+
+This section discusses issues related to vocal music in general, and
+to some particular styles of vocal music.
+
+@menu
+* References for vocal music and lyrics::
+* Opera::
+* Song books::
+* Chants::
+* Spoken music::
+* Ancient vocal music::
+@end menu
+
+
+@node References for vocal music and lyrics
+@unnumberedsubsubsec References for vocal music and lyrics
+
+@c TODO: split this section in two parts? -vv
+
+Various issues may arise when engraving vocal music.  Some of these
+are discussed in this section, while others are explained elsewhere:
+
+@itemize
+@item
+Most styles of vocal music use written text as lyrics.  An introduction
+to this notation is to be found in @rlearning{Setting simple songs}.
+@item
+Vocal music is likely to require the use of @code{markup} mode, either
+for lyrics of for other text elements (character's names, etc.).
+This syntax is described in @ref{Text markup introduction}.
+@item
+Lead sheets may be printed by combining vocal parts and @q{chord mode};
+this syntax is explained in @ref{Chord notation}.
+@item
+@q{Ambitus} may be added at the beginning of vocal staves, as explained
+in @ref{Ambitus}.
+@item
+Vocal parts may be printed using traditional clefs, as shown in @ref{Clefs}.
+@item
+Ancient vocal music is supported, as explained in @ref{Ancient notation}.
+@item
+
+
+@node Opera
+@unnumberedsubsubsec Opera
+
+@c TODO
+TBC
+
+@c add characters names snippet -vv
+
+@node Song books
+@unnumberedsubsubsec Song books
+
+@c TODO
+TBC
+
+@snippets
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{simple-lead-sheet.ly}
+
+@seealso
+Notation Reference:
+@ref{Chord notation}.
+
+@node Spoken music
+@unnumberedsubsubsec Spoken music
+@cindex parlato
+@cindex Sprechgesang
+Such effects as @q{parlato} or @q{Sprechgesang} require perfomers to speak
+without pitch but still with rhythm; these are notated by cross
+note heads, as demonstrated in @ref{Special note heads}.
+
+@c TODO add "marking-notes-on-spoken-parts" snippet -vv
+@c add "showing the rhythm of a melody" snip
+@c add "one staff-line notation"
+@c add "improvisation" ref
+@c add "lyrics independents of notes" ref
+
+@node Chants
+@unnumberedsubsubsec Chants
+
+@c TODO Add text from lsr and -user
+TBC
+
+@node Ancient vocal music
+@unnumberedsubsubsec Ancient vocal music
+
+@c TODO
+TBC
+
+@c Add "Printing both the ancient and the modern clef in vocal music" snippet,
+@c and "Transcription of Ancient music with incipit" snippet. -vv
+
+@seealso
+Notation Reference:
+@ref{Ancient notation}.
+
+
 @node Entering lyrics
 @subsection Entering lyrics
 
@@ -32,7 +135,6 @@ that the lyrics will be aligned with the notes of their melody.
 * Lyrics explained::
 * Setting simple songs::
 * Working with lyrics and variables::
-* References for vocal music::
 @end menu
 
 
@@ -190,7 +292,7 @@ Internals Reference:
 @rinternals{LyricText},
 @rinternals{LyricSpace}.
 
-
+@c FIXME: this title has to be changed (possible confusion with LM) -vv
 @node Setting simple songs
 @unnumberedsubsubsec Setting simple songs
 
@@ -323,20 +425,6 @@ Internals Reference:
 @rinternals{Lyrics}.
 
 
-@node References for vocal music
-@unnumberedsubsubsec 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
 
@@ -687,7 +775,6 @@ differing ways.  Such variations can still be captured with
 @menu
 * Divisi lyrics::
 * Lyrics independent of notes::
-* Chants::
 * Spacing out syllables::
 * Centering lyrics between staves::
 @end menu
@@ -781,13 +868,6 @@ the implicit melismata get ignored.
 
 @c this clarifies http://code.google.com/p/lilypond/issues/detail?id=248
 
-
-@node Chants
-@unnumberedsubsubsec Chants
-
-@c TODO Add text from lsr and -user
-TBC
-
 @node Spacing out syllables
 @unnumberedsubsubsec Spacing out syllables