resolve merge

[lilypond.git] / Documentation / snippets / moving-dotted-notes-in-polyphony.ly

diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
new file mode 100644 (file)
index 0000000..b7cd9ca
--- /dev/null
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -0,0 +1,44 @@
+%% 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, simultaneous-notes, tweaks-and-overrides"
+
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
+  texidoces = "
+Cuando se puede una nota en la voz superior para evitar la colisión
+con una nota de otra voz, el comportamiento predeterminado es
+desplazar la nota superior a la derecha.  Se puede cambiar usando la
+propiedad @code{prefer-dotted-right} de @code{NoteCollision}.
+
+"
+  doctitlees = "Desplazar las notas con puntillo en polifonía"
+
+
+
+  texidoc = "
+When a dotted note in the upper voice is moved to avoid a collision
+with a note in another voice, the default is to move the upper note to
+the right.  This behaviour can be over-ridden by using the
+@code{prefer-dotted-right} property of @code{NoteCollision}.
+
+"
+  doctitle = "Moving dotted notes in polyphony"
+} % begin verbatim
+
+\new Staff \relative c' <<
+  { f2. f4
+    \override Staff.NoteCollision #'prefer-dotted-right = ##f
+    f2. f4
+    \override Staff.NoteCollision #'prefer-dotted-right = ##t
+    f2. f4
+  }
+  \\
+  { e4 e e e e e e e e e e e}
+>>
+