Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / anglican-psalm-template.ly

diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index be40c3dd4ca640877f7d7de0d70b8e4eaa78e18c..252138644d5811e669b120d88124e713f1691359 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,49 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.14.0"
+\version "2.18.0"
 
 \header {
-%% Translation of GIT committish: 4077120c18ac1dc490501b3d7d5886bc93e61a42
-  texidocit = "
-Questo modello mostra un modo di impostare un salmo anglicano. Fa vedere
-anche come le strofe possono essere aggiunte come testo separato al di sotto
-della musica.  Le due strofe sono scritte con stili diversi per illustrare
-le varie possibilità.
-
-"
-  doctitleit = "Modello per salmo anglicano"
-
-  lsrtags = "vocal-music, template"
-
-
-
-
-%% Translation of GIT committish: 144cd434d02e6d90b2fb738eeee99119a7c5e1d2
-
-  texidocde = "
-Diese Vorlage zeigt eine Art, anglikanische Psalmengesänge zu setzen.  Hier
-wird auch gezeigt, wie Strophen als einfacher Text unter den Noten hinzugefügt
-werden können.  Zwei Strophen sind in unterschiedlicher Weise notiert um mehr
-Möglichkeiten darzustellen.
-"
-  doctitlede = "Vorlage für anglikanischen Psalm"
-
-
-%% Translation of GIT committish: 092f85605dcea69efff5ef31de4ff100346d6ef8
-
-  texidocfr = "
-Cet exemple illustre la manière de présenter un cantique tel qu'on le
-trouve dans l'église anglicane.  Vous noterez comment sont ajoutés les
-couplets indépendamment de la musique.  Dans le but de vous montrer
-plusieurs styles, comparez le code des deux couplets.
-
-"
-  doctitlefr = "Psalmodie anglicane"
-
+  lsrtags = "template, vocal-music"
 
   texidoc = "
 This template shows one way of setting out an Anglican psalm chant. It
@@ -122,8 +86,7 @@ tick = \markup {
       \layout {
         \context {
           \Score
-          \override SpacingSpanner
-          #'base-shortest-duration = #(ly:make-moment 1 2)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2)
         }
         \context {
           \Staff