resolve merge

[lilypond.git] / Documentation / snippets / skips-in-lyric-mode.ly

diff --git a/Documentation/snippets/skips-in-lyric-mode.ly b/Documentation/snippets/skips-in-lyric-mode.ly
new file mode 100644 (file)
index 0000000..f9efee4
--- /dev/null
+++ b/Documentation/snippets/skips-in-lyric-mode.ly
@@ -0,0 +1,25 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.0"
+
+\header {
+  lsrtags = "rhythms, vocal-music"
+
+  texidoc = "
+The @code{s} syntax for skips is only available in note mode and chord
+mode. In other situations, for example, when entering lyrics, using the
+@code{\\skip} command is recommended.
+
+"
+  doctitle = "Skips in lyric mode"
+} % begin verbatim
+
+<<
+  \relative c'' { a1 | a }
+  \new Lyrics \lyricmode { \skip 1 bla1 }
+>>
+