Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index a58503b2f2a72e0d2a026de4927a728b3de94054..7f68e263fe211d016cd88f0b3c5569b780a9a3ae 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -1096,9 +1096,6 @@ multiple syllables in another one.  One solution is to make the faster
 voice ignore the melisma.  This is done by setting
 @code{ignoreMelismata} in the Lyrics context.
 
-
-@c  TODO: breaks compile
-@c seems to be fixed, does not break compile anymore --FV
 @lilypond[verbatim,ragged-right,quote]
 <<
   \relative c' \new Voice = "lahlah" {
@@ -1121,6 +1118,11 @@ voice ignore the melisma.  This is done by setting
 >>
 @end lilypond
 
+@knownissues
+Unlike most @code{\set} commands, @code{\set ignoreMelismata} does
+not work if prefixed with @code{\once}.  It is necessary to use
+@code{\set} and @code{\unset} to bracket the lyrics where melismata
+are to be ignored.
 
 @subsubheading Switching to an alternative melody
 

diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely
index ff690e67775963720ae57155928c98c92ce11af0..797484fb18caae3d8fcfcf58e7292ba47741da7c 100644 (file)
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@ -110,6 +110,19 @@ or figure for each example to see the corresponding input file.
 @node Top
 @top GNU LilyPond --- Snippets List
 
+@ifhtml
+@ifclear bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond-snippets.pdf,PDF} and as
+@uref{source/input/lsr/lilypond-snippets-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond-snippets.pdf,PDF} and as
+@uref{source/input/lsr/lilypond-snippets/index.html,HTML indexed multiple pages}.
+@end ifset
+@end ifhtml
+
 This document shows a selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
 (LSR). It is in the public domain.