Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / Documentation / snippets / jazz-combo-template.ly

diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
index 65f385cc06a5dbf35844c38326a1b73e4ab514c5..adfa2a46984195a740a6bf9e8135c14314f65aa6 100644 (file)
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -1,11 +1,28 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% 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.1"
+\version "2.15.2"
 
 \header {
+%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
+  texidocit = "
+Ecco un modello piuttosto complesso, per un gruppo jazz. Si noti che tutti
+gli strumenti sono in @code{\\key c \\major}. Si tratta della tonalità
+reale; sarà trasposta automaticamente includendo la
+musica all'interno di una sezione @code{\\transpose}.
+
+"
+  doctitleit = "Modello per combo jazz"
+
   lsrtags = "keyboards, percussion, fretted-strings, template"
 
-%% Translation of GIT committish: d35687993883eb31442009fc50d5ae063108bfa7
+
+
+
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
   texidoces = "
 Ésta es una plantilla bastante avanzada, para un conjunto de
 jazz. Observe que la notación de todos los instrumentos está en
@@ -15,18 +32,30 @@ dentro de una sección @code{\\transpose}.
 
 "
   doctitlees = "Plantilla para combo de jazz"
-  
-%% Translation of GIT committish: 17633f6b8681af86230aa84597fe7561e98c91d6
+
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
-Hier ist ein ziemlich kompliziertes Beispiel für ein Jazz-Ensemble. Achtung: 
-Alle Instrumente sind in @code{\key c \major} (C-Dur) notiert. Das bezieht sich 
-auf die klingende Musik: LilyPond transponiert die Tonart automatisch, wenn 
-sich die Noten innerhalb eines @code{\transpose}-Abschnitts befinden.
+Hier ist ein ziemlich kompliziertes Beispiel für ein Jazz-Ensemble. Achtung:
+Alle Instrumente sind in @code{\\key c \major} (C-Dur) notiert. Das bezieht sich
+auf die klingende Musik: LilyPond transponiert die Tonart automatisch, wenn
+sich die Noten innerhalb eines @code{\\transpose}-Abschnitts befinden.
 
 "
 
   doctitlede = "Vorlage für Jazz-Combo"
 
+%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
+  texidocfr = "
+Bien que compliqué de prime abord, voici un canevas tout à fait indiqué
+pour les ensembles de jazz.  Vous noterez que tous les instruments sont
+notés en ut (@code{\\key c \major}), la tonalité de concert.  Les notes
+seront automatiquement transposée dès lors qu'elles seront inscrites
+dans une section @code{\\transpose}.
+
+"
+  doctitlefr = "Symboles de jazz"
+
   texidoc = "
 This is quite an advanced template, for a jazz ensemble. Note that all
 instruments are notated in @code{\\key c \\major}. This refers to the
@@ -210,7 +239,7 @@ PianoRH = {
 PianoLH = {
   \clef bass
   \global
-  \set Staff.midiInstrument = "acoustic grand"
+  \set Staff.midiInstrument = #"acoustic grand"
   <<
     \new Voice = "one" \lhUpper
     \new Voice = "two" \lhLower
@@ -273,7 +302,7 @@ drumContents = {
       \new Staff = "barisax" \bariSax
       \new Staff = "trombone" \trombone
     >>
-    
+
     \new StaffGroup = "rhythm" <<
       \new ChordNames = "chords" \gtrHarmony
       \new Staff = "guitar" \guitar
@@ -282,9 +311,8 @@ drumContents = {
       \new DrumStaff \drumContents
     >>
   >>
-  
   \layout {
-    \context { \RemoveEmptyStaffContext }
+    \context { \Staff \RemoveEmptyStaves }
     \context {
       \Score
       \override BarNumber #'padding = #3
@@ -292,7 +320,6 @@ drumContents = {
       skipBars = ##t
     }
   }
-  
   \midi { }
 }