Merge branch 'master' into dev/texi2html

[lilypond.git] / input / lsr / formatting-lyrics-syllables.ly

diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly
index 037b35539217a87e2aac1d77aec5466ab115bb29..2d52a4f1c2993d2f0b3040ace62bb9eb93b35bd1 100644 (file)
--- a/input/lsr/formatting-lyrics-syllables.ly
+++ b/input/lsr/formatting-lyrics-syllables.ly
@@ -1,27 +1,30 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.51"
 
 \header {
-  lsrtags = "editorial-and-educational-use, text, vocal-music"
- texidoc = "
-To format single lyrics syllables, you can simply use \\markup @{ ....
-@} on these lyrics!
-" }
-% begin verbatim
+  lsrtags = "text, vocal-music"
+
+  texidoc = "
+To format individual syllables in lyrics, use @code{\\markup @{ ....
+@}} on these lyrics.
+
+"
+  doctitle = "Formatting lyrics syllables"
+} % begin verbatim
 % Tip taken from http://lists.gnu.org/archive/html/lilypond-user/2007-12/msg00215.html
 \header {
-  title = "Markup can be used inside lyrics!" 
+  title = "Markup can be used inside lyrics!"
 }
-% begin verbatim
-melody = \relative c'' { c4 c c c  }
-lyr = \lyricmode { 
-  Lyrics \markup { \italic can } \markup {\with-color #red contain } 
-  \markup {\fontsize #8 \bold "Markup!" } 
+
+mel = \relative c'' { c4 c c c }
+lyr = \lyricmode {
+  Lyrics \markup { \italic "can" } \markup {\with-color #red "contain" }
+  \markup {\fontsize #8 \bold "Markup!" }
 }
 
-\context Staff << 
-  \context Voice = "mel" << \melody >>
-  \context Lyrics \lyricsto "mel" \lyr
+<<
+  \context Voice = melody \mel
+  \context Lyrics \lyricsto melody \lyr
 >>