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

[lilypond.git] / Documentation / snippets / piano-template-with-melody-and-lyrics.ly

diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 6a4f37064b418ce0a567fbfab9d35bcb1fa9e1aa..57466a0a3e523ed00dc7102a4a2e710e89d25056 100644 (file)
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -1,38 +1,13 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% 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.13.16"
+\version "2.18.0"
 
 \header {
-  lsrtags = "vocal-music, keyboards, template"
-
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
-  texidoces = "
-He aquí el típico formato dde una canción: un pentagrama con la
-melodía y la letra, y el acompañamiento de piano por debajo.
-
-"
-  doctitlees = "Plantilla de piano con melodía y letra"
-
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
-  texidocja = "
-これは一般的な歌曲のフォーマットです: 旋律と歌詞を持つ譜表と、その下にピアノ伴奏譜があります。
-"
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-Das nächste Beispiel ist typisch für ein Lied: Im oberen System die
-Melodie mit Text, darunter Klavierbegleitung.
-"
-
-  doctitlede = "Vorlage für Klavier und Gesangsstimme"
-
-%% Translation of GIT committish: ceb0afe7d4d0bdb3d17b9d0bff7936bb2a424d16
-  texidocfr = "
-Il s'agit du format classique pour le chant : une portée pour la mélodie
-et les paroles au-dessus de l'accompagnement au piano.
-
-"
-  doctitlefr = "Piano mélodie et paroles"
+  lsrtags = "keyboards, really-simple, template, vocal-music"
 
   texidoc = "
 Here is a typical song format: one staff with the melody and lyrics,
@@ -80,8 +55,7 @@ lower = \relative c {
     >>
   >>
   \layout {
-    \context { \RemoveEmptyStaffContext }
+    \context { \Staff \RemoveEmptyStaves }
   }
   \midi { }
 }
-