Merge branch 'translation' into staging

[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 ac0b797a2ca4dc54b9166c0d24275782c3cb62cf..81f5816c0a56026213f67e6a06fe3c25ce693bbe 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,10 +1,13 @@
-%% 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.13.31"
+\version "2.17.11"
 
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music"
 
   texidoc = "
 This template shows one way of setting out an Anglican psalm chant. It
@@ -16,6 +19,7 @@ more possibilities.
   doctitle = "Anglican psalm template"
 } % begin verbatim
 
+
 SopranoMusic = \relative g' {
   g1 | c2 b | a1 | \bar "||"
   a1 | d2 c | c b | c1 | \bar "||"
@@ -83,8 +87,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
@@ -115,14 +118,17 @@ tick = \markup {
         }
         \null
         \line {
-          \hspace #2.5 2. Let us come before his presence \tick with
+          \hspace #2.5 8. Today if ye will hear his voice *
+        }
+        \line {
+          \concat { \bold hard en }
+          \tick not your \tick hearts : as in the pro-
         }
         \line {
-          thanks \tick giving * and shew ourselves
-          \tick glad in \tick
+          vocation * and as in the \bold day of tempt- \tick
         }
         \line {
-          him with psalms.
+          -ation \tick in the \tick wilderness.
         }
       }
     }