resolve merge

[lilypond.git] / Documentation / snippets / forcing-hyphens-to-be-shown.ly

diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
new file mode 100644 (file)
index 0000000..a4ce186
--- /dev/null
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -0,0 +1,47 @@
+%% 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 = "vocal-music"
+
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
+  texidoces = "
+
+Si LilyPond no cree que haya sitio suficiente para un guión separador
+de sílabas, lo omitirá.  Se puede sobreescribir este comportamiento
+con la propiedad @code{minimum-distance} de @code{LyricHyphen}.
+
+"
+  doctitlees = "Forzar la visibilidad de los guiones separadores de sílabas"
+
+
+
+  texidoc = "
+If LilyPond does not think there is space for a hyphen, it will be
+omitted.  The behaviour can be overridden with the
+@code{minimum-distance} property of @code{LyricHyphen}.
+
+"
+  doctitle = "Forcing hyphens to be shown"
+} % begin verbatim
+
+\relative c'' {
+  c32 c c c
+  c32 c c c
+  c32 c c c
+  c32 c c c
+}
+\addlyrics {
+  syl -- lab word word
+  \override LyricHyphen #'minimum-distance = #1.0
+  syl -- lab word word
+  \override LyricHyphen #'minimum-distance = #2.0
+  syl -- lab word word
+  \revert LyricHyphen #'minimum-distance
+  syl -- lab word word
+}