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 f666189d9dac6867850bfaec8044b411b7c5736b..81f5816c0a56026213f67e6a06fe3c25ce693bbe 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,16 +1,19 @@
-% Do not edit this file; it is automatically
-% generated from Documentation\snippets\new
-% This file is in the public domain.
-%% Note: this file works from version 2.13.30
+%% 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.17.11"
 
-\version "2.13.30"
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music"
+
   texidoc = "
-This template shows one way of setting out an Anglican psalm chant.
-It also shows how the verses may be added as stand-alone text under
-the music.  The two verses are coded in different styles to
-demonstrate more possibilities.
+This template shows one way of setting out an Anglican psalm chant. It
+also shows how the verses may be added as stand-alone text under the
+music.  The two verses are coded in different styles to demonstrate
+more possibilities.
 
 "
   doctitle = "Anglican psalm template"
@@ -38,67 +41,60 @@ BassMusic =  \relative c {
 }
 
 global = {
- \time 2/2
+  \time 2/2
 }
 
 dot = \markup {
-  \override #'(font-encoding . fetaMusic)
-  \raise #0.7 \lookup #"dots.dot"
+  \raise #0.7 \musicglyph #"dots.dot"
 }
 
 tick = \markup {
-  \override #'(font-encoding . fetaMusic)
-  \raise #1 \fontsize #-5 { \lookup #'"scripts.rvarcomma" }
+  \raise #1 \fontsize #-5 \musicglyph #"scripts.rvarcomma"
 }
 
 % Use markup to center the chant on the page
 \markup {
   \fill-line {
-    " "  % left-justified
-
-\score {  % centered
-  <<
-    \new ChoirStaff <<
-      \new Staff <<
-        \global
-        \clef "treble"
-        \new Voice = "Soprano" <<
-          \voiceOne
-          \SopranoMusic
-        >>
-        \new Voice = "Alto" <<
-          \voiceTwo
-          \AltoMusic
-        >>
-      >>
-      \new Staff <<
-        \clef "bass"
-        \global
-        \new Voice = "Tenor" <<
-          \voiceOne
-          \TenorMusic
-        >>
-        \new Voice = "Bass" <<
-          \voiceTwo
-          \BassMusic
+    \score {  % centered
+      <<
+        \new ChoirStaff <<
+          \new Staff <<
+            \global
+            \clef "treble"
+            \new Voice = "Soprano" <<
+              \voiceOne
+              \SopranoMusic
+            >>
+            \new Voice = "Alto" <<
+              \voiceTwo
+              \AltoMusic
+            >>
+          >>
+          \new Staff <<
+            \clef "bass"
+            \global
+            \new Voice = "Tenor" <<
+              \voiceOne
+              \TenorMusic
+            >>
+            \new Voice = "Bass" <<
+              \voiceTwo
+              \BassMusic
+            >>
+          >>
         >>
       >>
-    >>
-  >>
-  \layout {
-    \context {
-      \Score
-      \override SpacingSpanner
-                #'base-shortest-duration = #(ly:make-moment 1 2)
-    }
-    \context {
-      \Staff
-      \remove Time_signature_engraver
-    }
-  }
-}  % End score
-
-    " "  % right-justified
+      \layout {
+        \context {
+          \Score
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2)
+        }
+        \context {
+          \Staff
+          \remove "Time_signature_engraver"
+        }
+      }
+    }  % End score
   }
 }  % End markup
 
@@ -106,28 +102,34 @@ tick = \markup {
   \fill-line {
     \column {
       \left-align {
-        " " " " " "
+        \null \null \null
+        \line {
+          \fontsize #5 O
+          \fontsize #3 come
+          let us \bold sing | unto \dot the | Lord : let
+        }
+        \line {
+          us heartily
+          \concat { re \bold joice }
+          in the | strength of | our
+        }
+        \line {
+          sal | vation.
+        }
+        \null
         \line {
-          \fontsize #5 "O"
-          \fontsize #3 "come"
-          \fontsize #0
-          "let us" \bold "sing" "| unto" \dot "the | Lord : let"
+          \hspace #2.5 8. Today if ye will hear his voice *
         }
         \line {
-          "us heartily"
-          \concat { "re" \bold "joice" }
-          "in the | strength of | our"
+          \concat { \bold hard en }
+          \tick not your \tick hearts : as in the pro-
         }
-        "sal | vation."
-        " "
         \line {
-          "    2. Let us come before his presence" \tick "with"
+          vocation * and as in the \bold day of tempt- \tick
         }
         \line {
-          "thanks" \tick "giving * and shew ourselves"
-          \tick "glad in" \tick
+          -ation \tick in the \tick wilderness.
         }
-        "him with psalms."
       }
     }
   }