Merge branch 'master' into lilypond/translation

* master: (41 commits)
  Update predefined fret diagrams and documentation
  Indexes from Ralph.
  Indexes from Ralph.
  Compile fix
  Patch 0006 from John
  Patch 0005 from John
  Patch 0003 from John
  Patch 0002 from John
  Patch 0001 from John
  Compile fix
  Some additions to NR 1.8 "Text"
  Compile fix in NR 1.8
  Some additions to NR 1.8 "Text"
  Revert fretted-strings.itely
  Saving status that won't build docs
  Update for Expressive and Staff
  GDP NR 5.5.1 Amend layer details
  Fix broken documentation file
  Add predefined fret diagrams to FretBoards context
  GDP LM 4.3.1 Work around for layer
  ...

diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely
index 4fbc2c96a7a3602894ffd26fdfec83d84c924367..ecac4f8e53dc3cea5ccf5f931187d16ae4819202 100644 (file)
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/user/vocal.itely
@@ -884,7 +884,7 @@ texto, tal y como se muestra a continuación:
     more slow -- ly
   }
   \new Lyrics \lyricsto "lahlah" {
-    \set ignoreMelismata = ##t % applies to "fas"
+    \set ignoreMelismata = ##t % se aplica al "fas"
     go fas -- ter
     \unset ignoreMelismata
     still

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index deb747afc06425aa1803b40b6283002082984742..5384baf12586ee11b9f2591f260e465b456727bc 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -51,21 +51,31 @@ lyrics extender in this section.
 @end ignore
 
 
-Since LilyPond input files are text, there are two issues to
-consider when working with vocal music:
+Since LilyPond input files are text, there are two issues to consider
+when working with vocal music:
 
 @itemize
 @item
-Song texts must be entered as text, not notes.  For example, the
-input@tie{}@code{d} should be interpreted as a one letter syllable, not the
-note@tie{}D.
+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
 
-There are a few different ways to define lyrics; we shall begin
-by examining the simplest method, and gradually increase complexity.
+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.
 
 @menu
 * Common notation for vocals::
@@ -74,28 +84,6 @@ by examining the simplest method, and gradually increase complexity.
 * Stanzas::
 @end menu
 
-@snippets
-
-Checking to make sure that text scripts and lyrics are within the margins is
-a relatively large computational task.  To speed up processing, LilyPond does
-not perform such calculations by default; to enable it, use
-
-@example
-\override Score.PaperColumn #'keep-inside-line = ##t
-@end example
-
-To make lyrics avoid bar lines as well, use
-
-@example
-\layout @{
-  \context @{
-    \Lyrics
-      \consists "Bar_engraver"
-      \consists "Separating_line_group_engraver"
-      \override BarLine #'transparent = ##t
-  @}
-@}
-@end example
 
 @node Common notation for vocals
 @subsection Common notation for vocals
@@ -458,8 +446,14 @@ The following example uses different commands for entering lyrics.
     \time 2/4
     c4 b8. a16 g4. f8 e4 d c2
   }
+
+% not recommended: left aligns syllables 
   \new Lyrics \lyricmode { Joy4 to8. the16 world!4. the8 Lord4 is come.2 }
+
+% wrong: durations needed
   \new Lyrics \lyricmode { Joy to the earth! the Sa -- viour reigns. }
+
+%correct
   \new Lyrics \lyricsto "one" { No more let sins and sor -- rows grow. }
 >>
 @end lilypond
@@ -574,7 +568,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 note that is part of the melisma.
+for every extra note that has to be added to the the melisma.
 
 @c verbose! --FV
 @c duplicated: TODO fix
@@ -585,6 +579,7 @@ that are used for this purpose (all of them surrounded by spaces):
 double hyphens to separate syllables in a word, underscores to add
 notes to a melisma, and a double underscore to put an extender line.
 
+@c wrong: extender line only on last syllable of a word. Change example
 @lilypond[relative=1,verbatim,fragment,quote]
 { \set melismaBusyProperties = #'()
  c d( e) f f( e) e e  }
@@ -675,10 +670,11 @@ For example,
 @cindex extender
 
 @c leave this as samp. -gp
-Melismata are sometimes indicated with a long horizontal line starting
-in the melisma syllable, and ending in the next one.  Such a line is
-called an extender line, and it is entered as @samp{ __ } (note the
-spaces before and after the two underscore characters).
+In the last syllable of a word, melismata are sometimes indicated with
+a long horizontal line starting in the melisma syllable, and ending in
+the next one.  Such a line is called an extender line, and it is
+entered as @samp{ __ } (note the spaces before and after the two
+underscore characters).
 
 @warning{Melismata are indicated in the score with extender lines,
 which are entered as one double underscore; but short melismata can
@@ -870,6 +866,30 @@ layout.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {aligning-lyrics.ly}
 
+
+@snippets
+
+Checking to make sure that text scripts and lyrics are within the margins is
+a relatively large computational task.  To speed up processing, LilyPond does
+not perform such calculations by default; to enable it, use
+
+@example
+\override Score.PaperColumn #'keep-inside-line = ##t
+@end example
+
+To make lyrics avoid bar lines as well, use
+
+@example
+\layout @{
+  \context @{
+    \Lyrics
+      \consists "Bar_engraver"
+      \consists "Separating_line_group_engraver"
+      \override BarLine #'transparent = ##t
+  @}
+@}
+@end example
+
 @c TODO Create and add lsr example of lyricMelismaAlignment
 @c It's used like this to center-align all lyric syllables,
 @c even when notes are tied. -td
@@ -881,6 +901,7 @@ layout.
 }
 @end ignore
 
+
 @node Centering lyrics between staves
 @subsubsection Centering lyrics between staves
 
@@ -1108,10 +1129,10 @@ This is achieved with
 Here, @code{alternative} is the name of the @code{Voice} context
 containing the triplet.
 
-This command 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 bug.
+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
+bug.
 
 @example
 \new Lyrics \lyricsto "lahlah" @{