2007/6/18, Graham Percival <[EMAIL PROTECTED]>:

The lack of a patch is very unfortunate, especially in something this
long.  I'm not comfortable blindly replacing the entire doc section with
this new one, but it's very difficult to see exactly what is being
changed.  Could we at least split up the changes?

My bad; here's the patch. It's a pity I didn't propose any changes
sooner; while translating the doc, I often find possible minor
improvements, it never occurred to me that I could officially propose
them...

Regards,
Valentin
--- instrument-notation.itely	2007-06-18 10:09:27.000000000 +0200
+++ instrument-notation (copie).itely	2007-06-18 10:23:44.000000000 +0200
@@ -656,7 +656,6 @@
 @code{< .. >} syntax.
 
 
-
 @node Vocal music
 @section Vocal music
 
@@ -673,21 +672,20 @@
 Song texts must be aligned with the notes of their melody.
 @end itemize
 
-There are a few different ways to define lyrics; the simplest
-way is to use the @code{\addlyrics} function.
+There are a few different ways to define lyrics; let's try to present
+each one of them,
+starting with the simplest.
 
 @menu
-* Setting simple songs::        
-* Entering lyrics::             
-* Hyphens and extenders::       
-* The Lyrics context::          
-* Melismata::                   
-* Another way of entering lyrics::  
-* Flexibility in placement::    
-* Spacing lyrics::              
-* More about stanzas::          
-* Ambitus::                     
-* Other vocal issues::          
+* Setting simple songs::
+* Entering lyrics::
+* Aligning lyrics to a melody::
+* Working with lyrics and identifiers::
+* Flexibility in placement::
+* Spacing lyrics::
+* More about stanzas::
+* Ambitus::
+* Other vocal issues::
 @end menu
 
 
@@ -704,12 +702,12 @@
 To make lyrics avoid barlines as well, use
 @example
 \layout @{
-  \context @{
-    \Lyrics
-      \consists "Bar_engraver"
-      \consists "Separating_line_group_engraver"
-      \override BarLine #'transparent = ##t
-  @}
+ \context @{
+   \Lyrics
+     \consists "Bar_engraver"
+     \consists "Separating_line_group_engraver"
+     \override BarLine #'transparent = ##t
+ @}
 @}
 @end example
 
@@ -744,7 +742,8 @@
 @end lilypond
 
 The command @code{\addlyrics} cannot handle polyphony settings.  For these
-cases you should use @code{\lyricsto} and @code{\lyricmode}.
+cases you should use @code{\lyricsto} and @code{\lyricmode}, as we'll see in
+the following sections.
 
 
 
@@ -754,65 +753,54 @@
 @cindex lyrics
 @funindex \lyricmode
 @cindex punctuation
[EMAIL PROTECTED] spaces, in lyrics
[EMAIL PROTECTED] quotes, in lyrics
 
-Lyrics are entered in a special input mode.  This mode is introduced
+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,
 with punctuation and accents, and the input @code{d} is not parsed as
-a pitch, but rather as a one letter syllable.  Syllables are entered
-like notes, but with pitches replaced by text.  For example,
[EMAIL PROTECTED]
-\lyricmode @{ Twin-4 kle4 twin- kle litt- le star2 @}
[EMAIL PROTECTED] example
-
-There are two main methods to specify the horizontal placement
-of the syllables, either by specifying the duration of each syllable
-explicitly, like in the example above, or by automatically aligning
-the lyrics to a melody or other voice of music, using @code{\addlyrics}
-or @code{\lyricsto}.  For more details see @ref{The Lyrics context}.
+a pitch, but rather as a one letter syllable.
 
 A word or syllable of lyrics begins with an alphabetic character, and ends
-with
-any space or digit.  The following characters can be any character
-that is not a digit or white space.  One important consequence of this
-is that a word can end with @[EMAIL PROTECTED]  The following example is
-usually a mistake in the input file.  The syllable includes a @[EMAIL PROTECTED], so
-the
-opening brace is not balanced
+with any @emph{space} or @[EMAIL PROTECTED] full
+definition of a word start in Lyrics mode is somewhat more
+complex, so let's make it quick. A word in Lyrics mode can begin with:
+an alphabetic character, @code{_},
[EMAIL PROTECTED], @code{!}, @code{:}, @code{'}, the control characters @code{^A}
+through @code{^F}, @code{^Q} through @code{^W}, @code{^Y}, @code{^^},
+any 8-bit character with ASCII code over 127, or a two-character
+combination of a backslash followed by one of @code{`}, @code{'},
[EMAIL PROTECTED]"}, or @code{^}.}.  Any character that is not a digit or white space
+will be regarded as part of the syllable; one important consequence of this
+is that a word can end with @[EMAIL PROTECTED], which often leads to the
+following mistake:
+
 @example
-\lyricmode @{ [EMAIL PROTECTED]
+\lyricmode @{ lah- [EMAIL PROTECTED]
 @end example
 
+In this example, the @[EMAIL PROTECTED] is included in the final syllable, so
+the opening brace is not balanced and the input file will probably not compile.
+
+
 @funindex \property in \lyricmode
 
 @noindent
 Similarly, a period which follows an alphabetic sequence is included in
 the resulting string.  As a consequence, spaces must be inserted around
-property commands
+property commands: do @emph{not} write
+
 @example
-\override Score . LyricText #'font-shape = #'italic
+\override Score.LyricText #'font-shape =#'italic
 @end example
 
[EMAIL PROTECTED] _
[EMAIL PROTECTED] spaces, in lyrics
[EMAIL PROTECTED] quotes, in lyrics
[EMAIL PROTECTED] ties, in lyrics
-
-In order to assign more than one syllable to a single note, you can
-surround them with quotes or use a @code{_} character, to get spaces
-between syllables, or use tilde  symbol (@code{~}) to get a lyric tie.
-
[EMAIL PROTECTED],relative=2,ragged-right,fragment,verbatim]
-\time 3/4
-\relative { c2 e4 g2 e4 }
-\addlyrics { gran- de_a- mi- go }
-\addlyrics { pu- "ro y ho-" nes- to }
-\addlyrics { pu- ro~y~ho- nes- to }
[EMAIL PROTECTED] lilypond
[EMAIL PROTECTED]
+but use instead
 
-The lyric ties is implemented with the Unicode character U+203F, so be
-sure to have a font (Like DejaVuLGC) installed that includes this
-glyph.
[EMAIL PROTECTED]
+\override Score . LyricText #'font-shape = #'italic
[EMAIL PROTECTED] example
 
 
 To enter lyrics with characters from non-English languages, or with
@@ -833,86 +821,60 @@
 \addlyrics { "\"I" am so lone- "ly\"" said she }
 @end lilypond
 
-The full definition of a word start in Lyrics mode is somewhat more
-complex.
-
-A word in Lyrics mode begins with: an alphabetic character, @code{_},
[EMAIL PROTECTED], @code{!}, @code{:}, @code{'}, the control characters @code{^A}
-through @code{^F}, @code{^Q} through @code{^W}, @code{^Y}, @code{^^},
-any 8-bit character with ASCII code over 127, or a two-character
-combination of a backslash followed by one of @code{`}, @code{'},
[EMAIL PROTECTED]"}, or @code{^}.
-
-To define indentifiers containing lyrics, the function @code{lyricmode}
-must be used.
-
[EMAIL PROTECTED]
-verseOne = \lyricmode @{ Joy to the world the Lord is come @}
-\score @{
-  <<
-    \new Voice = "one" \relative c'' @{
-      \autoBeamOff
-      \time 2/4
-      c4 b8. a16 g4. f8 e4 d c2
-    @}
-    \addlyrics @{ \verseOne @}
-  >>
[EMAIL PROTECTED]
[EMAIL PROTECTED] example
-
 
 @seealso
 
 Program reference: @internalsref{LyricText}, @internalsref{LyricSpace}.
 
 
[EMAIL PROTECTED] Aligning lyrics to a melody
[EMAIL PROTECTED] Aligning lyrics to a melody
 
[EMAIL PROTECTED] Hyphens and extenders
[EMAIL PROTECTED] Hyphens and extenders
-
[EMAIL PROTECTED] hyphens
-
-Centered hyphens are entered as @samp{--} between syllables.
-The hyphen will have variable length depending on the space between
-the syllables and it will be centered between the syllables.
-
[EMAIL PROTECTED] melisma
[EMAIL PROTECTED] extender
-
-When a lyric is sung over many notes (this is called a melisma), this is
-indicated with a horizontal line centered between a syllable and the
-next one.  Such a line is called an extender line, and it is entered as
[EMAIL PROTECTED]
[EMAIL PROTECTED] \lyricmode
[EMAIL PROTECTED] \addlyrics
[EMAIL PROTECTED] \lyricsto
 
-In tighly engraved music, hyphens can be removed.  Whether this
-happens can be controlled with the @code{minimum-distance} (minimum
-distance between two syllables) and the @code{minimum-length}
-(threshold below which hyphens are removed).
+Lyrics are printed by interpreting them in the context called
[EMAIL PROTECTED]
 
[EMAIL PROTECTED]
 
-Program reference: @internalsref{LyricHyphen}, @internalsref{LyricExtender}.
+There are two main methods to specify the horizontal placement
+of the syllables:
 
[EMAIL PROTECTED] @bullet
[EMAIL PROTECTED]
+by automatically aligning
+the lyrics to a melody or other voice of music, using @code{\addlyrics}
+or @code{\lyricsto}.
 
[EMAIL PROTECTED]
+or by specifying the duration of each syllable
+explicitly, using @code{\lyricmode}
[EMAIL PROTECTED] itemize
 
[EMAIL PROTECTED] The Lyrics context
[EMAIL PROTECTED] The Lyrics context
[EMAIL PROTECTED]
+* Automatic syllable durations::
+* Another way of entering lyrics::
+* Assigning more than one syllable to a single note::
+* More than one note on a single syllable::
+* Extenders and hyphens::
[EMAIL PROTECTED] menu
 
-Lyrics are printed by interpreting them in the context called
[EMAIL PROTECTED]
[EMAIL PROTECTED]
 
 @example
 \new Lyrics \lyricmode @dots{}
 @end example
 
+
+
[EMAIL PROTECTED] Automatic syllable durations
[EMAIL PROTECTED] Automatic syllable durations
 @cindex automatic syllable durations
[EMAIL PROTECTED] \lyricsto
 @cindex lyrics and melodies
 
-This will place the lyrics according to the durations that were
-entered.  The lyrics can also be aligned under a given melody
-automatically.  In this case, it is no longer necessary to enter the
-correct duration for each syllable.  This is achieved by combining the
+The lyrics can be aligned under a given melody
+automatically.  This is achieved by combining the
 melody and the lyrics with the @code{\lyricsto} expression
 
 @example
@@ -926,24 +888,6 @@
 @code{\lyricsto} switches to @code{\lyricmode} mode automatically, so the
 @code{\lyricmode} keyword may be omitted.
 
-The following example uses different commands for entering lyrics.
-
[EMAIL PROTECTED],fragment,ragged-right,verbatim]
-<<
-  \new Voice = "one" \relative c'' {
-    \autoBeamOff
-    \time 2/4
-    c4 b8. a16 g4. f8 e4 d c2
-  }
-  \new Lyrics \lyricmode { Joy4 to8. the16 world!4. the8 Lord4 is come.2 }
-  \new Lyrics \lyricmode { Joy to the earth! the Sa -- viour reigns. }
-  \new Lyrics \lyricsto "one" { No more let sins and sor -- rows grow. }
->>
[EMAIL PROTECTED] lilypond
-
-The second stanza is not properly aligned because the durations
-were not specified.  A solution for that would be to use @code{\lyricsto}.
-
 The @code{\addlyrics} command is actually just a convenient way
 to write a more complicated LilyPond structure that sets up the
 lyrics.
@@ -961,63 +905,141 @@
 \new Lyrics \lyricsto "blah" @{ LYRICS @}
 @end example
 
-For different or more complex orderings, the best way is to setup the
-hierarchy of staves and lyrics first, e.g.,
+
[EMAIL PROTECTED] Another way of entering lyrics
[EMAIL PROTECTED] Another way of entering lyrics
+
+Lyrics can also be entered without @code{\addlyrics} or
[EMAIL PROTECTED]  In this case,
+syllables are entered like notes -- but with pitches replaced by text -- and the
+duration of each syllable must be entered explicitly. For example:
+
 @example
-\new ChoirStaff <<
-  \new Voice = "soprano" @{ @emph{music} @}
-  \new Lyrics = "sopranoLyrics" @{ s1 @}
-  \new Lyrics = "tenorLyrics" @{ s1 @}
-  \new Voice = "tenor" @{ @emph{music} @}
->>
+play2 the4 game2.
+sink2 or4 swim2.
 @end example
 
-and then combine the appropriate melodies and lyric lines
+The alignment to a melody can be specified with the
[EMAIL PROTECTED] property,
 
 @example
-\context Lyrics = sopranoLyrics \lyricsto "soprano"
-  @emph{the lyrics}
+\set associatedVoice = #"lala"
 @end example
 
 @noindent
-The final input would resemble
+The value of the property (here: @code{"lala"}) should be the name of
+a @internalsref{Voice} context.  Without this setting, extender lines
+will not be formatted properly.
 
[EMAIL PROTECTED]
-<<\new ChoirStaff << @emph{setup the music} >>
-  \lyricsto "soprano" @emph{etc}
-  \lyricsto "alto" @emph{etc}
-  @emph{etc}
+Here is an example demonstrating manual lyric durations,
+
[EMAIL PROTECTED],ragged-right,verbatim,fragment,quote]
+<< \new Voice = "melody" {
+    \time 3/4
+    c2 e4 g2.
+ }
+ \new Lyrics \lyricmode {
+   \set associatedVoice = #"melody"
+   play2 the4 game2.
+ } >>
[EMAIL PROTECTED] lilypond
+
+The following example is a comparison of the different commands for
+entering lyrics:
+
[EMAIL PROTECTED],fragment,ragged-right,verbatim]
+<<
+ \new Voice = "one" \relative c'' {
+   \autoBeamOff
+   \time 2/4
+   c4 b8. a16 g4. f8 e4 d c2
+ }
+ \new Lyrics \lyricmode { Joy4 to8. the16 world!4. the8 Lord4 is come.2 }
+ \new Lyrics \lyricmode { Joy to the earth! the Sa -- viour reigns. }
+ \new Lyrics \lyricsto "one" { No more let sins and sor -- rows grow. }
 >>
[EMAIL PROTECTED] example
[EMAIL PROTECTED] lilypond
+
+The second stanza is not properly aligned because the durations
+were not specified.  A solution for that, as shown with the
+third stanza, would be to use @code{\lyricsto}.
 
 @seealso
 
 Program reference: @internalsref{LyricCombineMusic},
 @internalsref{Lyrics}.
 
[EMAIL PROTECTED] Assigning more than one syllable to a single note
[EMAIL PROTECTED] Assigning more than one syllable to a single note
+
+
[EMAIL PROTECTED] _
[EMAIL PROTECTED] ties, in lyrics
+
+In order to assign more than one syllable to a single note, you can
+surround them with quotes or use a @code{_} character, to get spaces
+between syllables, or use tilde  symbol (@code{~}) to get a lyric
[EMAIL PROTECTED] lyric ties is implemented with the Unicode character
+U+203F, so be
+sure to have a font (Like DejaVuLGC) installed that includes this
+glyph.}.
+
[EMAIL PROTECTED],relative=2,ragged-right,fragment,verbatim]
+\time 3/4
+\relative { c2 e4 g2 e4 }
+\addlyrics { gran- de_a- mi- go }
+\addlyrics { pu- "ro y ho-" nes- to }
+\addlyrics { pu- ro~y~ho- nes- to }
[EMAIL PROTECTED] lilypond
+
[EMAIL PROTECTED]
+
+Program reference: @internalsref{LyricCombineMusic}.
+
+
[EMAIL PROTECTED] More than one note on a single syllable
[EMAIL PROTECTED] More than one note on a single syllable
+
[EMAIL PROTECTED] melisma
[EMAIL PROTECTED] melismata
+
+Sometimes, particularly in Medieval music, several notes are to be sung on one
+single syllable; such vocalises are called melismas, or melismata.
 
[EMAIL PROTECTED] Melismata
[EMAIL PROTECTED] Melismata
+You can define melismata entirely in the lyrics, by entering @code{_}
+for every note
+that is part of the melisma.
+
[EMAIL PROTECTED],verbatim,fragment,quote]
+{ \set melismaBusyProperties = #'()
+ c d( e) f f( e) e e  }
+\addlyrics
+ { Ky -- _ _ ri __ _ _ _  e }
[EMAIL PROTECTED] lilypond
+
+In this case, you can also have ties and slurs in the melody if you
+set @code{melismaBusyProperties}, as is done in the example above.
 
-The @code{\lyricsto} command detects melismata: it only puts one
-syllable under a tied or slurred group of notes.  If you want to force
-an unslurred group of notes to be a melisma, insert @code{\melisma}
+However, in automatic syllable durations mode, LilyPond can detect
+melismata: the @code{\lyricsto} command only puts one
+syllable under a tied or slurred group of notes.  You can force
+an unslurred group of notes to be a melisma, by inserting @code{\melisma}
 after the first note of the group, and @code{\melismaEnd} after the
 last one, e.g.,
 
 @lilypond[quote,relative=2,ragged-right,fragment,verbatim]
 <<
-  \new Voice = "lala" {
-    \time 3/4
-    f4 g8
-    \melisma
-    f e f
-    \melismaEnd
-    e2
-  }
-  \new Lyrics \lyricsto "lala" {
-    la di __ daah
-  }
+ \new Voice = "lala" {
+   \time 3/4
+   f4 g8
+   \melisma
+   f e f
+   \melismaEnd
+   e2
+ }
+ \new Lyrics \lyricsto "lala" {
+   la di __ daah
+ }
 >>
 @end lilypond
 
@@ -1025,12 +1047,6 @@
 beamed, and automatic beaming (see @ref{Setting automatic beam
 behavior}) is switched off.
 
[EMAIL PROTECTED] SATB
[EMAIL PROTECTED] choral score
-
-A complete example of a SATB score setup is in section
[EMAIL PROTECTED] ensembles}.
-
 
 @refcommands
 
@@ -1048,46 +1064,103 @@
 
 Melismata are not detected automatically, and extender lines must be
 inserted by hand.
+It is also possible to define melismata entirely in the lyrics. This
+can be done by entering @code{_} for every note that is part of the
+melisma.
+
[EMAIL PROTECTED],verbatim,fragment,quote]
+{ \set melismaBusyProperties = #'()
+ c d( e) f f( e) e e  }
+\addlyrics
+ { Ky -- _ _ ri __ _ _ _  e }
[EMAIL PROTECTED] lilypond
 
+In this case, you can also have ties and slurs in the melody if you
+set @code{melismaBusyProperties}, as is done in the example above.
 
[EMAIL PROTECTED] Another way of entering lyrics
[EMAIL PROTECTED] Another way of entering lyrics
 
-Lyrics can also be entered without @code{\lyricsto}.  In this case the
-duration of each syllable must be entered explicitly, for example,
[EMAIL PROTECTED] Extenders and hyphens
[EMAIL PROTECTED] Extenders and hyphens
+
[EMAIL PROTECTED] melisma
[EMAIL PROTECTED] extender
+
+Melismata are indicated with a horizontal line centered between a
+syllable and the
+next one.  Such a line is called an extender line, and it is entered as
[EMAIL PROTECTED]
+
[EMAIL PROTECTED] hyphens
+
+Centered hyphens are entered as @samp{--} between syllables of a same word.
+The hyphen will be centered between the syllables, and its length
+will be adjusted depending on the space between
+the syllables.
+
+In tighly engraved music, hyphens can be removed.  Whether this
+happens can be controlled with the @code{minimum-distance} (minimum
+distance between two syllables) and the @code{minimum-length}
+(threshold below which hyphens are removed).
+
[EMAIL PROTECTED]
+
+Program reference: @internalsref{LyricExtender},  @internalsref{LyricHyphen}.
+
+
[EMAIL PROTECTED] Working with lyrics and identifiers
[EMAIL PROTECTED] Working with lyrics and identifiers
[EMAIL PROTECTED] lyrics, identifiers
+
+To define identifiers containing lyrics, the function @code{\lyricmode}
+must be used. You do not have to enter durations though, if you add
[EMAIL PROTECTED] or @code{\lyricsto}
+when invoking your identifier.
 
 @example
-play2 the4 game2.
-sink2 or4 swim2.
+verseOne = \lyricmode @{ Joy to the world the Lord is come @}
+\score @{
+ <<
+   \new Voice = "one" \relative c'' @{
+     \autoBeamOff
+     \time 2/4
+     c4 b8. a16 g4. f8 e4 d c2
+   @}
+   \addlyrics @{ \verseOne @}
+ >>
[EMAIL PROTECTED]
 @end example
 
-The alignment to a melody can be specified with the
[EMAIL PROTECTED] property,
-
+For complex orderings, the best way is to setup the
+hierarchy of staves and lyrics first, e.g.,
 @example
-\set associatedVoice = #"lala"
+\new ChoirStaff <<
+ \new Voice = "soprano" @{ @emph{music} @}
+ \new Lyrics = "sopranoLyrics" @{ s1 @}
+ \new Lyrics = "tenorLyrics" @{ s1 @}
+ \new Voice = "tenor" @{ @emph{music} @}
+>>
 @end example
 
 @noindent
-The value of the property (here: @code{"lala"}) should be the name of
-a @internalsref{Voice} context.  Without this setting, extender lines
-will not be formatted properly.
+and then combine the appropriate melodies and lyric lines
 
-Here is an example demonstrating manual lyric durations,
[EMAIL PROTECTED]
+\context Lyrics = sopranoLyrics \lyricsto "soprano"
+ @emph{the lyrics}
[EMAIL PROTECTED] example
 
[EMAIL PROTECTED],ragged-right,verbatim,fragment,quote]
-<< \new Voice = "melody" {
-     \time 3/4
-     c2 e4 g2.
-  }
-  \new Lyrics \lyricmode {
-    \set associatedVoice = #"melody"
-    play2 the4 game2.
-  } >>
[EMAIL PROTECTED] lilypond
[EMAIL PROTECTED]
+The final input would resemble
+
[EMAIL PROTECTED]
+<<\new ChoirStaff << @emph{setup the music} >>
+ \lyricsto "soprano" @emph{etc}
+ \lyricsto "alto" @emph{etc}
+ @emph{etc}
+>>
[EMAIL PROTECTED] example
 
 
[EMAIL PROTECTED] TODO: document \new Staff << Voice \lyricsto >> bug
 
 @node Flexibility in placement
 @subsection Flexibility in placement
@@ -1097,11 +1170,10 @@
 @code{\lyricsto}.
 
 @menu
-* Lyrics to multiple notes of a melisma::  
-* Divisi lyrics::               
-* Switching the melody associated with a lyrics line::  
-* Specifying melismata within the lyrics::  
-* Lyrics independent of notes::  
+* Lyrics to multiple notes of a melisma::
+* Divisi lyrics::
+* Switching the melody associated with a lyrics line::
+* Lyrics independent of notes::
 @end menu
 
 @node Lyrics to multiple notes of a melisma
@@ -1121,22 +1193,22 @@
 @lilypond[verbatim,ragged-right,quote]
 %{
 <<
-  \relative \new Voice = "lahlah" {
-    \set Staff.autoBeaming = ##f
-    c4
-    \slurDotted
-    f8.[( g16])
-    a4
-  }
-  \new Lyrics \lyricsto "lahlah" {
-    more slow -- ly
-  }
-  \new Lyrics \lyricsto "lahlah" {
-    \set ignoreMelismata = ##t % applies to "fas"
-    go fas -- ter
-    \unset ignoreMelismata
-    still
-  }
+ \relative \new Voice = "lahlah" {
+   \set Staff.autoBeaming = ##f
+   c4
+   \slurDotted
+   f8.[( g16])
+   a4
+ }
+ \new Lyrics \lyricsto "lahlah" {
+   more slow -- ly
+ }
+ \new Lyrics \lyricsto "lahlah" {
+   \set ignoreMelismata = ##t % applies to "fas"
+   go fas -- ter
+   \unset ignoreMelismata
+   still
+ }
 >>
 %}
 @end lilypond
@@ -1153,8 +1225,8 @@
 @lilypond[verbatim,ragged-right,quote]
 \relative { c c g' }
 \addlyrics {
-  twin -- \skip 4
-  kle
+ twin -- \skip 4
+ kle
 }
 @end lilypond
 
@@ -1167,18 +1239,18 @@
 
 @lilypond[verbatim,ragged-right,quote]
 \score{ <<
-  \new Voice = "melody" {
-    \relative c' {
-      c4
-      <<
-        { \voiceOne c8 e }
-        \new Voice = "splitpart" { \voiceTwo c4 }
-      >>
-      \oneVoice c4 c | c
-    }
-  }
-  \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
-  \new Lyrics \lyricsto "splitpart" { will }
+ \new Voice = "melody" {
+   \relative c' {
+     c4
+     <<
+       { \voiceOne c8 e }
+       \new Voice = "splitpart" { \voiceTwo c4 }
+     >>
+     \oneVoice c4 c | c
+   }
+ }
+ \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
+ \new Lyrics \lyricsto "splitpart" { will }
 >> }
 @end lilypond
 
@@ -1188,23 +1260,21 @@
 
 @lilypond[verbatim,ragged-right,quote]
 \score{ <<
-  \new Voice = "melody" \relative c' {
-    c2 e | g e | c1 |
-    \new Voice = "verse" \repeat volta 2 {c4 d e f | g1 | }
-    a2 b | c1}
-  \new Lyrics = "mainlyrics" \lyricsto melody \lyricmode {
-    do mi sol mi do
-    la si do }
-  \context Lyrics = "mainlyrics" \lyricsto verse \lyricmode {
-   do re mi fa sol }
-  \new Lyrics = "repeatlyrics" \lyricsto verse \lyricmode {
-   dodo rere mimi fafa solsol }
+ \new Voice = "melody" \relative c' {
+   c2 e | g e | c1 |
+   \new Voice = "verse" \repeat volta 2 {c4 d e f | g1 | }
+   a2 b | c1}
+ \new Lyrics = "mainlyrics" \lyricsto melody \lyricmode {
+   do mi sol mi do
+   la si do }
+ \context Lyrics = "mainlyrics" \lyricsto verse \lyricmode {
+  do re mi fa sol }
+ \new Lyrics = "repeatlyrics" \lyricsto verse \lyricmode {
+  dodo rere mimi fafa solsol }
 >>
 }
 @end lilypond
 
-
-
 @node Switching the melody associated with a lyrics line
 @subsubsection Switching the melody associated with a lyrics line
 
@@ -1214,38 +1284,38 @@
 
 @lilypond[ragged-right,quote]
 <<
-  \relative \new Voice = "lahlah" {
-    \set Staff.autoBeaming = ##f
-    c4
-    <<
-      \new Voice = "alternative" {
-        \voiceOne
-        \times 2/3 {
-          % show associations clearly.
-          \override NoteColumn #'force-hshift = #-3
-          f8 f g
-        }
-      }
-      {
-        \voiceTwo
-        f8.[ g16]
-        \oneVoice
-      } >>
-    a8( b) c
-  }
-  \new Lyrics \lyricsto "lahlah" {
-    Ju -- ras -- sic Park
-  }
-  \new Lyrics \lyricsto "lahlah" {
-    % Tricky: need to set associatedVoice
-    % one syllable too soon!
-    \set associatedVoice = alternative % applies to "ran"
-    Ty --
-    ran --
-    no --
-    \set associatedVoice = lahlah % applies to "rus"
-    sau -- rus Rex
-  } >>
+ \relative \new Voice = "lahlah" {
+   \set Staff.autoBeaming = ##f
+   c4
+   <<
+     \new Voice = "alternative" {
+       \voiceOne
+       \times 2/3 {
+         % show associations clearly.
+         \override NoteColumn #'force-hshift = #-3
+         f8 f g
+       }
+     }
+     {
+       \voiceTwo
+       f8.[ g16]
+       \oneVoice
+     } >>
+   a8( b) c
+ }
+ \new Lyrics \lyricsto "lahlah" {
+   Ju -- ras -- sic Park
+ }
+ \new Lyrics \lyricsto "lahlah" {
+   % Tricky: need to set associatedVoice
+   % one syllable too soon!
+   \set associatedVoice = alternative % applies to "ran"
+   Ty --
+   ran --
+   no --
+   \set associatedVoice = lahlah % applies to "rus"
+   sau -- rus Rex
+ } >>
 @end lilypond
 
 @noindent
@@ -1253,7 +1323,7 @@
 
 @example
 \new Lyrics \lyricsto "lahlah" @{
-  Ju -- ras -- sic Park
+ Ju -- ras -- sic Park
 @}
 @end example
 
@@ -1274,12 +1344,12 @@
 
 @example
 \new Lyrics \lyricsto "lahlah" @{
-  \set associatedVoice = alternative % applies to "ran"
-  Ty --
-  ran --
-  no --
-  \set associatedVoice = lahlah % applies to "rus"
-  sau -- rus Rex
+ \set associatedVoice = alternative % applies to "ran"
+ Ty --
+ ran --
+ no --
+ \set associatedVoice = lahlah % applies to "rus"
+ sau -- rus Rex
 @}
 @end example
 
@@ -1288,27 +1358,11 @@
 @code{lahlah} to @code{associatedVoice}.
 
 
[EMAIL PROTECTED] Specifying melismata within the lyrics
[EMAIL PROTECTED] Specifying melismata within the lyrics
-
-It is also possible to define melismata entirely in the lyrics. This
-can be done by entering @code{_} for every note that is part of the
-melisma.
-
[EMAIL PROTECTED],verbatim,fragment,quote]
-{ \set melismaBusyProperties = #'()
-  c d( e) f f( e) e e  }
-\addlyrics
- { Ky -- _ _ ri __ _ _ _  e }
[EMAIL PROTECTED] lilypond
-
-In this case, you can also have ties and slurs in the melody if you
-set @code{melismaBusyProperties}, as is done in the example above.
-
-
 @node Lyrics independent of notes
 @subsubsection Lyrics independent of notes
 
[EMAIL PROTECTED] isn't there any simpler way to do this ? -vv
+
 In some complex vocal music, it may be desirable to place
 lyrics completely independently of notes.  Music defined
 inside @code{lyricrhythm} disappears into the
@@ -1317,20 +1371,20 @@
 
 @lilypond[quote,verbatim,ragged-right]
 voice = {
-  c''2
-  \tag #'music { c''2 }
-  \tag #'lyricrhythm { c''4. c''8 }
-  d''1
+ c''2
+ \tag #'music { c''2 }
+ \tag #'lyricrhythm { c''4. c''8 }
+ d''1
 }
 
 lyr = \lyricmode { I like my cat! }
 
 <<
-  \new Staff \keepWithTag #'music \voice
-  \new Devnull="nowhere" \keepWithTag #'lyricrhythm \voice
-  \new Lyrics \lyricsto "nowhere" \lyr
-  \new Staff { c'8 c' c' c' c' c' c' c'
-  c' c' c' c' c' c' c' c' }
+ \new Staff \keepWithTag #'music \voice
+ \new Devnull="nowhere" \keepWithTag #'lyricrhythm \voice
+ \new Lyrics \lyricsto "nowhere" \lyr
+ \new Staff { c'8 c' c' c' c' c' c' c'
+ c' c' c' c' c' c' c' c' }
 >>
 @end lilypond
 
@@ -1346,13 +1400,13 @@
 
 @lilypond[relative,verbatim,fragment,quote,ragged-right]
 {
-  c c c c
-  \override Lyrics.LyricSpace #'minimum-distance = #1.0
-  c c c c
+ c c c c
+ \override Lyrics.LyricSpace #'minimum-distance = #1.0
+ c c c c
 }
 \addlyrics {
-  longtext longtext longtext longtext
-  longtext longtext longtext longtext
+ longtext longtext longtext longtext
+ longtext longtext longtext longtext
 }
 @end lilypond
 
@@ -1361,20 +1415,20 @@
 
 @lilypond[relative,verbatim,quote,ragged-right]
 \score {
-  \relative c' {
-  c c c c
-  c c c c
-  }
-  \addlyrics {
-  longtext longtext longtext longtext
-  longtext longtext longtext longtext
-  }
-  \layout {
-    \context {
-      \Lyrics
-      \override LyricSpace #'minimum-distance = #1.0
-    }
-  }
+ \relative c' {
+ c c c c
+ c c c c
+ }
+ \addlyrics {
+ longtext longtext longtext longtext
+ longtext longtext longtext longtext
+ }
+ \layout {
+   \context {
+     \Lyrics
+     \override LyricSpace #'minimum-distance = #1.0
+   }
+ }
 }
 @end lilypond
 
@@ -1386,19 +1440,19 @@
 @cindex phrasing, in lyrics
 
 @cindex stanza number
[EMAIL PROTECTED] Adding stanza numbers 
[EMAIL PROTECTED] Adding stanza numbers
 
 Stanza numbers can be added by setting @code{stanza}, e.g.,
 
 @lilypond[quote,ragged-right,verbatim,relative=2,fragment]
 \new Voice {
-  \time 3/4 g2 e4 a2 f4 g2.
+ \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
-  \set stanza = "1. "
-  Hi, my name is Bert.
+ \set stanza = "1. "
+ Hi, my name is Bert.
 } \addlyrics {
-  \set stanza = "2. "
-  Oh, che -- ri, je t'aime
+ \set stanza = "2. "
+ Oh, che -- ri, je t'aime
 }
 @end lilypond
 
@@ -1416,17 +1470,17 @@
 
 @lilypond[quote,ragged-right,verbatim]
 text = {
-  \set stanza = \markup { \dynamic "ff" "1. " }
-  \lyricmode {
-    Big bang
-  }
+ \set stanza = \markup { \dynamic "ff" "1. " }
+ \lyricmode {
+   Big bang
+ }
 }
 
 <<
-  \new Voice = "tune" {
-    \time 3/4
-    g'4 c'2
-  }
+ \new Voice = "tune" {
+   \time 3/4
+   g'4 c'2
+ }
 \new Lyrics \lyricsto "tune" \text
 >>
 @end lilypond
@@ -1441,18 +1495,18 @@
 
 @lilypond[fragment,ragged-right,quote,verbatim,relative=2]
 \new Voice {
-  \time 3/4 g2 e4 a2 f4 g2.
+ \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
-  \set vocalName = "Bert "
-  Hi, my name is Bert.
+ \set vocalName = "Bert "
+ Hi, my name is Bert.
 } \addlyrics {
-  \set vocalName = "Ernie "
-  Oh, che -- ri, je t'aime
+ \set vocalName = "Ernie "
+ Oh, che -- ri, je t'aime
 }
 @end lilypond
 
 
[EMAIL PROTECTED] Printing stanzas at the end 
[EMAIL PROTECTED] Printing stanzas at the end
 
 Sometimes it is appropriate to have one stanza set
 to the music, and the rest added in verse form at
@@ -1473,32 +1527,32 @@
 its fleece was white as snow.
 }
 
-\book{
-  \score{ <<
-    \new Voice = "one" { \melody }
-    \new Lyrics \lyricsto "one" \text
-	>>
-    \layout { }
-  }
-  \markup { \column{
-    \line{ Verse 2. }
-    \line{ All the children laughed and played }
-    \line{ To see a lamb at school. }
-    }
-  }
-  \markup{
-    \wordwrap-string #"
-    Verse 3.
 
-    Mary took it home again,
+ \score{ <<
+   \new Voice = "one" { \melody }
+   \new Lyrics \lyricsto "one" \text
+       >>
+   \layout { }
+ }
+ \markup { \column{
+   \line{ Verse 2. }
+   \line{ All the children laughed and played }
+   \line{ To see a lamb at school. }
+   }
+ }
+ \markup{
+   \wordwrap-string #"
+   Verse 3.
+
+   Mary took it home again,
+
+   It was against the rule."
+ }
 
-    It was against the rule."
-  }
-}
 @end lilypond
 
 
[EMAIL PROTECTED] Printing stanzas at the end in multiple columns 
[EMAIL PROTECTED] Printing stanzas at the end in multiple columns
 
 When a piece of music has many verses, they are often printed in
 multiple columns across the page. An outdented verse number often
@@ -1507,61 +1561,61 @@
 
 @lilypond[ragged-right,quote,verbatim]
 melody = \relative c' {
-  c c c c | d d d d
+ c c c c | d d d d
 }
- 
+
 text = \lyricmode {
-  \set stanza = "1." This is verse one.
-  It has two lines.
+ \set stanza = "1." This is verse one.
+ It has two lines.
 }
 
 \score{ <<
-    \new Voice = "one" { \melody }
-    \new Lyrics \lyricsto "one" \text
-   >>
-  \layout { }
+   \new Voice = "one" { \melody }
+   \new Lyrics \lyricsto "one" \text
+  >>
+ \layout { }
 }
 
 \markup {
-  \fill-line {
-    \hspace #0.1 % moves the column off the left margin; can be removed if
-        % space on the page is tight
-     \column {
-      \line { \bold "2."
-        \column {
-          "This is verse two."
-          "It has two lines."
-        }
-      }
-      \hspace #0.1 % adds vertical spacing between verses
-      \line { \bold "3."
-        \column {
-          "This is verse three."
-          "It has two lines."
-        }
-      }
-    }
-    \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."
-        \column {
-          "This is verse four."
-          "It has two lines."
-        }
-      }
-      \hspace #0.1 % adds vertical spacing between verses
-      \line { \bold "5."
-        \column {
-          "This is verse five."
-          "It has two lines."
-        }
-      }
-    }
-  \hspace #0.1 % gives some extra space on the right margin; can
-      % be removed if page space is tight
-  }
+ \fill-line {
+   \hspace #0.1 % moves the column off the left margin; can be removed if
+       % space on the page is tight
+    \column {
+     \line { \bold "2."
+       \column {
+         "This is verse two."
+         "It has two lines."
+       }
+     }
+     \hspace #0.1 % adds vertical spacing between verses
+     \line { \bold "3."
+       \column {
+         "This is verse three."
+         "It has two lines."
+       }
+     }
+   }
+   \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."
+       \column {
+         "This is verse four."
+         "It has two lines."
+       }
+     }
+     \hspace #0.1 % adds vertical spacing between verses
+     \line { \bold "5."
+       \column {
+         "This is verse five."
+         "It has two lines."
+       }
+     }
+   }
+ \hspace #0.1 % gives some extra space on the right margin; can
+     % be removed if page space is tight
+ }
 }
 @end lilypond
 
@@ -1590,10 +1644,10 @@
 
 @example
 \layout @{
-  \context @{
-    \Voice
-    \consists Ambitus_engraver
-  @}
+ \context @{
+   \Voice
+   \consists Ambitus_engraver
+ @}
 @}
 @end example
 
@@ -1601,14 +1655,14 @@
 
 @lilypond[quote,ragged-right]
 \layout {
-  \context {
-    \Staff
-    \consists Ambitus_engraver
-  }
+ \context {
+   \Staff
+   \consists Ambitus_engraver
+ }
 }
 
 \relative \new Staff {
-  as'' c e2 cis,2
+ as'' c e2 cis,2
 }
 @end lilypond
 
@@ -1619,22 +1673,22 @@
 
 @lilypond[verbatim,ragged-right,quote]
 \new Staff \with {
-  \consists "Ambitus_engraver"
+ \consists "Ambitus_engraver"
 }
 <<
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } \relative c'' {
-    \override Ambitus #'X-offset = #-1.0
-    \voiceOne
-    c4 a d e f2
-  }
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } \relative c' {
-    \voiceTwo
-    es4 f g as b2
-  }
+ \new Voice \with {
+   \remove "Ambitus_engraver"
+ } \relative c'' {
+   \override Ambitus #'X-offset = #-1.0
+   \voiceOne
+   c4 a d e f2
+ }
+ \new Voice \with {
+   \remove "Ambitus_engraver"
+ } \relative c' {
+   \voiceTwo
+   es4 f g as b2
+ }
 >>
 @end lilypond
 
@@ -1668,15 +1722,6 @@
 @node Other vocal issues
 @subsection Other vocal issues
 
[EMAIL PROTECTED]
-yeah, I'm giving up somewhat by stuffing a bunch of things in
-here.  But at least they're in the manual now; it's easier to
-move them around in the manual once they're already here.
-
-Besides, if users complain about everything stuffed in here, I
-can ask them for specific instructions about where to move these
-examples, and that might get them more involved in the docs.  -gp
[EMAIL PROTECTED] ignore
 
 @q{Parlato} is spoken without pitch but still with rhythm; it is
 notated by cross noteheads.  This is demonstrated in
_______________________________________________
lilypond-user mailing list
lilypond-user@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-user

Reply via email to