Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / hairpins-with-different-line-styles.ly

diff --git a/Documentation/snippets/hairpins-with-different-line-styles.ly b/Documentation/snippets/hairpins-with-different-line-styles.ly
index 32f80aacefaa83c9c8c90a16c74c23c7ac270a5c..4446613e13c0a9995747b0c5d9d97eb7ddcc68c4 100644 (file)
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -1,12 +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.12.2"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
-%% Translation of GIT committish: fa19277d20f8ab0397c560eb0e7b814bd804ecec
+%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 Los reguladores pueden imprimirse en uno cualquiera de los estilos de
 @code{line-interface}: discontinuo, punteado, línea, trino o zig-zag.
@@ -24,6 +27,7 @@ dotted-line, line, trill or zigzag.
   doctitle = "Hairpins with different line styles"
 } % begin verbatim
 
+
 \relative c' {
   c2\< c\!
   \override Hairpin #'style = #'dashed-line