Merge remote-tracking branch 'origin/master' into translation

[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
index d9964ef84616e84990e131ede2d86e20d97ed36e..e2a2a00af63d31129168b3a6aae069e9643aab40 100644 (file)
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -1,25 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.2"
+\version "2.18.0"
 
 \header {
-  lsrtags = "simultaneous-notes, tweaks-and-overrides, rhythms"
-
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  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"
-
-
+  lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
 
   texidoc = "
 When a dotted note in the upper voice is moved to avoid a collision
@@ -31,15 +19,14 @@ the right.  This behaviour can be over-ridden by using the
   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
+    \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}
+  { e4 e e e e e e e e e e e }
 >>
-