Merge remote branch 'origin/master' into release/unstable

[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 5a1013ca53375cd27869eb64fc1d9c16ab2d1bae..89cec8be7128c5424eae6b55afdc1946378409b0 100644 (file)
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -4,55 +4,11 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.15.15
-\version "2.15.15"
+%% Note: this file works from version 2.17.20
+\version "2.17.30"
 
 \header {
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-Ésta es una plantilla bastante avanzada, para un conjunto de
-jazz. Observe que la notación de todos los instrumentos está en
-@code{\\key c \\major} (Do mayor). Esto se refiere al tono de
-concierto; la armadura se transporta automáticamente si la música está
-dentro de una sección @code{\\transpose}.
-
-"
-  doctitlees = "Plantilla para combo de jazz"
-
-
-%% Translation of GIT committish: 6ae36b6f8a7cf2df5f4e46c3c06820fccd9f35e1
-  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"
-
-%% 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.
-
-"
-
-  doctitlede = "Vorlage für Jazz-Combo"
-
-%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
-  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"
-
-  lsrtags = "keyboards, percussion, fretted-strings, template"
+  lsrtags = "keyboards, percussion, fretted-strings, template, real-music"
 
   texidoc = "
 This is quite an advanced template, for a jazz ensemble. Note that all
@@ -85,17 +41,15 @@ music is within a @code{\\transpose} section.
 %%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%%
 
 sl = {
-  \override NoteHead #'style = #'slash
-  \override Stem #'transparent = ##t
-  \override Flag #'transparent = ##t
+  \override NoteHead.style = #'slash
+  \hide Stem
 }
 nsl = {
-  \revert NoteHead #'style
-  \revert Stem #'transparent
-  \revert Flag #'transparent
+  \revert NoteHead.style
+  \undo \hide Stem
 }
-crOn = \override NoteHead #'style = #'cross
-crOff = \revert NoteHead #'style
+crOn = \override NoteHead.style = #'cross
+crOff = \revert NoteHead.style
 
 %% insert chord name style stuff here.
 
@@ -316,11 +270,10 @@ drumContents = {
     \context { \Staff \RemoveEmptyStaves }
     \context {
       \Score
-      \override BarNumber #'padding = #3
-      \override RehearsalMark #'padding = #2
+      \override BarNumber.padding = #3
+      \override RehearsalMark.padding = #2
       skipBars = ##t
     }
   }
   \midi { }
 }
-