Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / avoiding-collisions-with-chord-fingerings.ly

diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index c776d63ff344ae3719e7067854a5d3e3959a95fe..d4867310441f6b493fe3af660e8e844bee2a5b4c 100644 (file)
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -1,10 +1,15 @@
-%% Do not edit this file; it is automatically
+%% 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.13.31"
+\version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
+  lsrtags = "editorial-annotations, chords, tweaks-and-overrides, rhythms"
+
+%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
   texidoces = "
 
@@ -19,8 +24,6 @@ sobreescribir este comportamiento predeterminado.
   doctitlees = "Evitar colisiones con digitaciones de acordes"
 
 
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
-
   texidoc = "
 Fingerings and string numbers applied to individual notes will
 automatically avoid beams and stems, but this is not true by default
@@ -32,6 +35,7 @@ overridden.
   doctitle = "Avoiding collisions with chord fingerings"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(up)
   \set stringNumberOrientations = #'(up)