]> git.donarmstrong.com Git - lilypond.git/blobdiff - Documentation/po/lilypond-doc.pot
Docs: update lilypond doc po
[lilypond.git] / Documentation / po / lilypond-doc.pot
index e1be177b373c5f49e0c03c06111cb5038ba66797..f698ce440759e820fe4cc1747fd82d6e248bd1b5 100644 (file)
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-13 12:25+0200\n"
+"POT-Creation-Date: 2010-12-06 22:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,11 +40,11 @@ msgstr ""
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr ""
 
-#: postprocess_html.py:318
+#: postprocess_html.py:326
 msgid "stable-branch"
 msgstr ""
 
-#: postprocess_html.py:320
+#: postprocess_html.py:328
 msgid "development-branch"
 msgstr ""
 
@@ -127,11 +128,11 @@ msgid "post-GDP"
 msgstr ""
 
 #. -*- coding: utf-8 -*-
-#. Documentation/changes.tely:69 (variable)
+#. Documentation/changes.tely:183 (variable)
 msgid "coloredheads"
 msgstr ""
 
-#. Documentation/changes.tely:70 (variable)
+#. Documentation/changes.tely:184 (variable)
 msgid "noclef"
 msgstr ""
 
@@ -144,19 +145,6 @@ msgstr ""
 msgid "New features in 2.13 since 2.12"
 msgstr ""
 
-#. @node in Documentation/essay.tely
-#. @appendix in Documentation/essay.tely
-#. @node in Documentation/extending.tely
-#. @appendix in Documentation/extending.tely
-#. @node in Documentation/learning.tely
-#. @appendix in Documentation/learning.tely
-#. @node in Documentation/notation.tely
-#. @appendix in Documentation/notation.tely
-#. @node in Documentation/usage.tely
-#. @appendix in Documentation/usage.tely
-msgid "LilyPond index"
-msgstr ""
-
 #. @top in Documentation/macros.itexi
 msgid "LilyPond --- \\\\TITLE\\\\"
 msgstr ""
@@ -177,6 +165,19 @@ msgstr ""
 msgid "Known issues and warnings"
 msgstr ""
 
+#. @node in Documentation/essay.tely
+#. @appendix in Documentation/essay.tely
+#. @node in Documentation/extending.tely
+#. @appendix in Documentation/extending.tely
+#. @node in Documentation/learning.tely
+#. @appendix in Documentation/learning.tely
+#. @node in Documentation/notation.tely
+#. @appendix in Documentation/notation.tely
+#. @node in Documentation/usage.tely
+#. @appendix in Documentation/usage.tely
+msgid "LilyPond index"
+msgstr ""
+
 #. @node in Documentation/essay/engraving.itely
 #. @chapter in Documentation/essay/engraving.itely
 msgid "Music engraving"
@@ -322,15 +323,14 @@ msgid "dummy action to deal with parser lookahead"
 msgstr ""
 
 #. Documentation/extending/scheme-tutorial.itely:1354 (variable)
-#. Documentation/extending/programming-interface.itely:127 (variable)
-#. Documentation/learning/fundamental.itely:3103 (variable)
-#. Documentation/learning/fundamental.itely:3153 (variable)
-#. Documentation/notation/changing-defaults.itely:3677 (variable)
+#. Documentation/learning/fundamental.itely:3003 (variable)
+#. Documentation/learning/fundamental.itely:3058 (variable)
+#. Documentation/notation/changing-defaults.itely:3802 (variable)
 msgid "padText"
 msgstr ""
 
 #. Documentation/extending/scheme-tutorial.itely:1377 (variable)
-#. Documentation/notation/changing-defaults.itely:3712 (variable)
+#. Documentation/notation/changing-defaults.itely:3844 (variable)
 msgid "tempoPadded"
 msgstr ""
 
@@ -495,26 +495,21 @@ msgstr ""
 msgid "Adding articulation to notes (example)"
 msgstr ""
 
-#. Documentation/extending/programming-interface.itely:145 (variable)
-#. Documentation/notation/changing-defaults.itely:3695 (variable)
-msgid "custosNote"
-msgstr ""
-
-#. Documentation/extending/programming-interface.itely:192 (variable)
+#. Documentation/extending/programming-interface.itely:139 (variable)
 msgid "manualBeam"
 msgstr ""
 
-#. Documentation/extending/programming-interface.itely:212 (variable)
+#. Documentation/extending/programming-interface.itely:160 (variable)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:192 (variable)
 msgid "AltOn"
 msgstr ""
 
-#. Documentation/extending/programming-interface.itely:217 (variable)
+#. Documentation/extending/programming-interface.itely:170 (variable)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:198 (variable)
 msgid "AltOff"
 msgstr ""
 
-#. Documentation/extending/programming-interface.itely:230 (variable)
+#. Documentation/extending/programming-interface.itely:185 (variable)
 msgid "withAlt"
 msgstr ""
 
@@ -550,12 +545,12 @@ msgstr ""
 
 #. @node in Documentation/extending/programming-interface.itely
 #. @subsection in Documentation/extending/programming-interface.itely
-msgid "Void functions"
+msgid "Functions without arguments"
 msgstr ""
 
 #. @node in Documentation/extending/programming-interface.itely
 #. @subsection in Documentation/extending/programming-interface.itely
-msgid "Functions without arguments"
+msgid "Void functions"
 msgstr ""
 
 #. @node in Documentation/extending/programming-interface.itely
@@ -638,35 +633,35 @@ msgstr ""
 msgid "LilyPond Scheme interfaces"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:209 (comment)
+#. Documentation/learning/tutorial.itely:210 (comment)
 msgid "set the starting point to middle C"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:240 (comment)
+#. Documentation/learning/tutorial.itely:241 (comment)
 msgid "one octave above middle C"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:256 (comment)
+#. Documentation/learning/tutorial.itely:257 (comment)
 msgid "c is 1 staff space up, so is the c above"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:257 (comment)
+#. Documentation/learning/tutorial.itely:258 (comment)
 msgid "d is 2 up or 5 down, so is the d above"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:258 (comment)
+#. Documentation/learning/tutorial.itely:259 (comment)
 msgid "e is 3 up or 4 down, so is the e above"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:259 (comment)
+#. Documentation/learning/tutorial.itely:260 (comment)
 msgid "a is 6 up or 1 down, so is the a below"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:260 (comment)
+#. Documentation/learning/tutorial.itely:261 (comment)
 msgid "g is 5 up or 2 down, so is the g below"
 msgstr ""
 
-#. Documentation/learning/tutorial.itely:261 (comment)
+#. Documentation/learning/tutorial.itely:262 (comment)
 msgid "f is 4 up or 3 down, so is the f below"
 msgstr ""
 
@@ -734,6 +729,8 @@ msgstr ""
 #. @rglos in Documentation/learning/tutorial.itely
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
+#. Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly:19 (variable)
+#. Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly:29 (variable)
 msgid "scale"
 msgstr ""
 
@@ -817,6 +814,22 @@ msgstr ""
 msgid "time signature"
 msgstr ""
 
+#. @subheading in Documentation/learning/tutorial.itely
+msgid "Tempo marks"
+msgstr ""
+
+#. @rglos in Documentation/learning/tutorial.itely
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "tempo indication"
+msgstr ""
+
+#. @rglos in Documentation/learning/tutorial.itely
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "metronome"
+msgstr ""
+
 #. @subheading in Documentation/learning/tutorial.itely
 msgid "Clef"
 msgstr ""
@@ -836,6 +849,21 @@ msgstr ""
 msgid "Working on input files"
 msgstr ""
 
+#. @node in Documentation/learning/tutorial.itely
+#. @section in Documentation/learning/tutorial.itely
+msgid "Dealing with errors"
+msgstr ""
+
+#. @node in Documentation/learning/tutorial.itely
+#. @subsection in Documentation/learning/tutorial.itely
+msgid "General troubleshooting tips"
+msgstr ""
+
+#. @node in Documentation/learning/tutorial.itely
+#. @subsection in Documentation/learning/tutorial.itely
+msgid "Some common errors"
+msgstr ""
+
 #. @node in Documentation/learning/tutorial.itely
 #. @section in Documentation/learning/tutorial.itely
 msgid "How to read the manuals"
@@ -856,22 +884,22 @@ msgstr ""
 msgid "Overview of manuals"
 msgstr ""
 
-#. Documentation/learning/common-notation.itely:1185 (variable)
-#. Documentation/learning/fundamental.itely:3084 (variable)
-#. Documentation/learning/fundamental.itely:3105 (variable)
+#. Documentation/learning/common-notation.itely:1223 (variable)
+#. Documentation/learning/fundamental.itely:2984 (variable)
+#. Documentation/learning/fundamental.itely:3008 (variable)
 msgid "violin"
 msgstr ""
 
-#. Documentation/learning/common-notation.itely:1190 (variable)
-#. Documentation/snippets/string-quartet-template-simple.ly:80 (variable)
+#. Documentation/learning/common-notation.itely:1229 (variable)
+#. Documentation/snippets/string-quartet-template-simple.ly:83 (variable)
 msgid "cello"
 msgstr ""
 
-#. Documentation/learning/common-notation.itely:1215 (variable)
+#. Documentation/learning/common-notation.itely:1255 (variable)
 msgid "tripletA"
 msgstr ""
 
-#. Documentation/learning/common-notation.itely:1216 (variable)
+#. Documentation/learning/common-notation.itely:1256 (variable)
 msgid "barA"
 msgstr ""
 
@@ -891,6 +919,11 @@ msgstr ""
 msgid "Single staff notation"
 msgstr ""
 
+#. @node in Documentation/learning/common-notation.itely
+#. @subsection in Documentation/learning/common-notation.itely
+msgid "Bar checks"
+msgstr ""
+
 #. @node in Documentation/learning/common-notation.itely
 #. @subsection in Documentation/learning/common-notation.itely
 msgid "Accidentals and key signatures"
@@ -1164,6 +1197,20 @@ msgstr ""
 msgid "brace"
 msgstr ""
 
+#. @rglos in Documentation/learning/common-notation.itely
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "staff"
+msgstr ""
+
+#. @rglos in Documentation/learning/common-notation.itely
+#. @rglos in Documentation/learning/fundamental.itely
+#. @rglos in Documentation/learning/tweaks.itely
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "system"
+msgstr ""
+
 #. @node in Documentation/learning/common-notation.itely
 #. @subsection in Documentation/learning/common-notation.itely
 msgid "Combining notes into chords"
@@ -1245,7 +1292,9 @@ msgstr ""
 
 #. Documentation/learning/fundamental.itely:320 (context id)
 #. Documentation/learning/fundamental.itely:371 (context id)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (context id)
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:73 (variable)
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:86 (context id)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:70 (context id)
 msgid "singer"
 msgstr ""
 
@@ -1258,8 +1307,8 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:375 (context id)
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/snippets/jazz-combo-template.ly:231 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:291 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:233 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:293 (context id)
 #. Documentation/snippets/staff-headword.ly:119 (context id)
 msgid "piano"
 msgstr ""
@@ -1267,22 +1316,22 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:325 (context id)
 #. Documentation/learning/fundamental.itely:366 (variable)
 #. Documentation/learning/fundamental.itely:376 (context id)
-#. Documentation/learning/fundamental.itely:2764 (variable)
-#. Documentation/learning/fundamental.itely:2826 (context id)
+#. Documentation/learning/fundamental.itely:2592 (variable)
+#. Documentation/learning/fundamental.itely:2654 (context id)
 #. Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly:20 (variable)
 #. Documentation/snippets/chords-headword.ly:80 (context id)
-#. Documentation/snippets/fretted-headword.ly:145 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:234 (context id)
-#. Documentation/snippets/piano-template-simple.ly:37 (variable)
-#. Documentation/snippets/piano-template-simple.ly:56 (context id)
+#. Documentation/snippets/fretted-headword.ly:143 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:236 (context id)
+#. Documentation/snippets/piano-template-simple.ly:39 (variable)
+#. Documentation/snippets/piano-template-simple.ly:58 (context id)
 #. Documentation/snippets/piano-template-with-centered-dynamics.ly:60 (variable)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:45 (variable)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (context id)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:57 (variable)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:78 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:42 (variable)
-#. Documentation/snippets/polyphony-in-tablature.ly:60 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:64 (context id)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:48 (variable)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:70 (context id)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:60 (variable)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:81 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:44 (variable)
+#. Documentation/snippets/polyphony-in-tablature.ly:62 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:66 (context id)
 #. Documentation/snippets/staff-headword.ly:68 (variable)
 msgid "upper"
 msgstr ""
@@ -1290,73 +1339,73 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:326 (context id)
 #. Documentation/learning/fundamental.itely:367 (variable)
 #. Documentation/learning/fundamental.itely:377 (context id)
-#. Documentation/learning/fundamental.itely:2771 (variable)
-#. Documentation/learning/fundamental.itely:2827 (context id)
+#. Documentation/learning/fundamental.itely:2599 (variable)
+#. Documentation/learning/fundamental.itely:2655 (context id)
 #. Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly:24 (variable)
 #. Documentation/snippets/chords-headword.ly:90 (context id)
-#. Documentation/snippets/fretted-headword.ly:146 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:235 (context id)
-#. Documentation/snippets/piano-template-simple.ly:45 (variable)
-#. Documentation/snippets/piano-template-simple.ly:57 (context id)
+#. Documentation/snippets/fretted-headword.ly:144 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:237 (context id)
+#. Documentation/snippets/piano-template-simple.ly:47 (variable)
+#. Documentation/snippets/piano-template-simple.ly:59 (context id)
 #. Documentation/snippets/piano-template-with-centered-dynamics.ly:65 (variable)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:53 (variable)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:65 (variable)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:49 (variable)
-#. Documentation/snippets/polyphony-in-tablature.ly:61 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:65 (context id)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:56 (variable)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:72 (context id)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:68 (variable)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:82 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:51 (variable)
+#. Documentation/snippets/polyphony-in-tablature.ly:63 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:67 (context id)
 #. Documentation/snippets/staff-headword.ly:79 (variable)
 msgid "lower"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:364 (variable)
-#. Documentation/notation/changing-defaults.itely:490 (variable)
-#. Documentation/notation/changing-defaults.itely:497 (context id)
-#. Documentation/notation/changing-defaults.itely:507 (context id)
-#. Documentation/notation/changing-defaults.itely:512 (context id)
-#. Documentation/notation/changing-defaults.itely:529 (variable)
-#. Documentation/notation/changing-defaults.itely:547 (context id)
-#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:35 (context id)
+#. Documentation/notation/changing-defaults.itely:488 (variable)
+#. Documentation/notation/changing-defaults.itely:495 (context id)
+#. Documentation/notation/changing-defaults.itely:505 (context id)
+#. Documentation/notation/changing-defaults.itely:510 (context id)
+#. Documentation/notation/changing-defaults.itely:527 (variable)
+#. Documentation/notation/changing-defaults.itely:545 (context id)
+#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:37 (context id)
 #. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:46 (context id)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:64 (context id)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:66 (context id)
 #. Documentation/snippets/demo-midiinstruments.ly:29 (variable)
 #. Documentation/snippets/formatting-lyrics-syllables.ly:29 (context id)
 #. Documentation/snippets/fretted-headword.ly:63 (variable)
-#. Documentation/snippets/guitar-strum-rhythms.ly:66 (context id)
+#. Documentation/snippets/guitar-strum-rhythms.ly:68 (context id)
 #. Documentation/snippets/heavily-customized-polymetric-time-signatures.ly:34 (variable)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:45 (variable)
-#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:45 (variable)
-#. Documentation/snippets/single-staff-template-with-notes-and-chords.ly:47 (variable)
-#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:63 (variable)
-#. Documentation/snippets/single-staff-template-with-only-notes.ly:53 (variable)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:48 (variable)
+#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:48 (variable)
+#. Documentation/snippets/single-staff-template-with-notes-and-chords.ly:50 (variable)
+#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:66 (variable)
+#. Documentation/snippets/single-staff-template-with-only-notes.ly:56 (variable)
 #. Documentation/snippets/vertically-centered-common-lyrics.ly:45 (variable)
 msgid "melody"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:365 (variable)
-#. Documentation/snippets/piano-template-with-centered-lyrics.ly:61 (variable)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:53 (variable)
-#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:53 (variable)
-#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:71 (variable)
+#. Documentation/snippets/piano-template-with-centered-lyrics.ly:64 (variable)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:56 (variable)
+#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:56 (variable)
+#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:74 (variable)
 msgid "text"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:439 (context id)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:84 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:120 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:136 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:157 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:172 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:193 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:208 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:224 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:240 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:86 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:122 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:138 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:159 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:174 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:195 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:210 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:226 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:242 (comment)
 msgid "main"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:629 (comment)
-msgid "Voice \\\"1\\\"                  Voice \\\"2\\\""
+msgid "Voice \\\"1\\\"               Voice \\\"2\\\""
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:639 (comment)
@@ -1377,7 +1426,7 @@ msgid "Main voice"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:684 (comment)
-msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                 Voice \\\"3\\\""
+msgid "Voice \\\"1\\\"     Voice \\\"2\\\"                Voice \\\"3\\\""
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:708 (comment)
@@ -1456,455 +1505,423 @@ msgid "Set stems, etc, down"
 msgstr ""
 
 #. Documentation/learning/fundamental.itely:1197 (context id)
-#. Documentation/learning/fundamental.itely:2478 (context id)
-#. Documentation/snippets/adding-fingerings-to-tablatures.ly:25 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:217 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:226 (context id)
-#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:67 (context id)
-#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:77 (context id)
+#. Documentation/learning/fundamental.itely:2303 (context id)
+#. Documentation/snippets/adding-fingerings-to-tablatures.ly:34 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:219 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:228 (context id)
+#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:70 (context id)
+#. Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly:80 (context id)
 msgid "one"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1240 (variable)
-#. Documentation/learning/fundamental.itely:2738 (variable)
-#. Documentation/learning/tweaks.itely:3537 (variable)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:64 (variable)
+#. Documentation/learning/fundamental.itely:1242 (variable)
+#. Documentation/learning/fundamental.itely:2569 (variable)
+#. Documentation/learning/tweaks.itely:3614 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:66 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:62 (variable)
+#. Documentation/snippets/hymn-template.ly:78 (variable)
 #. Documentation/snippets/incipit.ly:70 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:87 (variable)
-#. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:51 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:89 (variable)
+#. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:53 (variable)
 #. Documentation/snippets/piano-template-with-centered-dynamics.ly:55 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:33 (variable)
-#. Documentation/snippets/string-quartet-template-simple.ly:47 (variable)
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:106 (variable)
+#. Documentation/snippets/satb-choir-template---four-staves.ly:35 (variable)
+#. Documentation/snippets/string-quartet-template-simple.ly:50 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:109 (variable)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:32 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:61 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:51 (variable)
-#. Documentation/snippets/vocal-ensemble-template.ly:60 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:64 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:54 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:56 (variable)
+#. Documentation/snippets/vocal-ensemble-template.ly:63 (variable)
 msgid "global"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1241 (variable)
+#. Documentation/learning/fundamental.itely:1244 (variable)
 msgid "SopOneMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1243 (variable)
-msgid "SopTwoMusic"
+#. Documentation/learning/fundamental.itely:1247 (variable)
+msgid "SopOneLyrics"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1245 (variable)
-msgid "SopOneLyrics"
+#. Documentation/learning/fundamental.itely:1250 (variable)
+msgid "SopTwoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1247 (variable)
+#. Documentation/learning/fundamental.itely:1253 (variable)
 msgid "SopTwoLyrics"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1253 (context id)
+#. Documentation/learning/fundamental.itely:1260 (context id)
 msgid "SopOne"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1262 (context id)
+#. Documentation/learning/fundamental.itely:1269 (context id)
 msgid "SopTwo"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1294 (variable)
-#. Documentation/learning/fundamental.itely:3006 (variable)
-msgid "TimeKey"
+#. Documentation/learning/fundamental.itely:1301 (variable)
+#. Documentation/learning/fundamental.itely:2901 (variable)
+msgid "keyTime"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1295 (variable)
+#. Documentation/learning/fundamental.itely:1303 (variable)
 msgid "SopMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1296 (variable)
-#. Documentation/learning/tweaks.itely:3539 (variable)
+#. Documentation/learning/fundamental.itely:1304 (variable)
+#. Documentation/learning/tweaks.itely:3617 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:47 (variable)
+#. Documentation/snippets/hymn-template.ly:63 (variable)
 msgid "AltoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1297 (variable)
-#. Documentation/learning/tweaks.itely:3540 (variable)
+#. Documentation/learning/fundamental.itely:1305 (variable)
+#. Documentation/learning/tweaks.itely:3618 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:52 (variable)
+#. Documentation/snippets/hymn-template.ly:68 (variable)
 msgid "TenorMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1298 (variable)
-#. Documentation/learning/tweaks.itely:3541 (variable)
+#. Documentation/learning/fundamental.itely:1306 (variable)
+#. Documentation/learning/tweaks.itely:3619 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:57 (variable)
+#. Documentation/snippets/hymn-template.ly:73 (variable)
 msgid "BassMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1299 (variable)
-#. Documentation/learning/tweaks.itely:3542 (variable)
+#. Documentation/learning/fundamental.itely:1308 (variable)
+#. Documentation/learning/tweaks.itely:3621 (variable)
 msgid "VerseOne"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1301 (variable)
-#. Documentation/learning/tweaks.itely:3543 (variable)
+#. Documentation/learning/fundamental.itely:1310 (variable)
+#. Documentation/learning/tweaks.itely:3625 (variable)
 msgid "VerseTwo"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1303 (variable)
-#. Documentation/learning/tweaks.itely:3544 (variable)
+#. Documentation/learning/fundamental.itely:1312 (variable)
+#. Documentation/learning/tweaks.itely:3629 (variable)
 msgid "VerseThree"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1305 (variable)
-#. Documentation/learning/tweaks.itely:3545 (variable)
+#. Documentation/learning/fundamental.itely:1314 (variable)
+#. Documentation/learning/tweaks.itely:3633 (variable)
 msgid "VerseFour"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1312 (context id)
+#. Documentation/learning/fundamental.itely:1321 (context id)
 msgid "Sop"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1313 (context id)
-#. Documentation/learning/tweaks.itely:3552 (context id)
-#. Documentation/notation/input.itely:984 (context id)
+#. Documentation/learning/fundamental.itely:1322 (context id)
+#. Documentation/learning/tweaks.itely:3642 (context id)
+#. Documentation/notation/input.itely:1141 (context id)
+#. Documentation/snippets/anglican-psalm-template.ly:87 (context id)
 #. Documentation/snippets/chords-headword.ly:57 (variable)
+#. Documentation/snippets/hymn-template.ly:93 (context id)
 msgid "Alto"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1321 (context id)
-#. Documentation/learning/tweaks.itely:3560 (context id)
-#. Documentation/notation/input.itely:986 (context id)
+#. Documentation/learning/fundamental.itely:1330 (context id)
+#. Documentation/learning/tweaks.itely:3650 (context id)
+#. Documentation/notation/input.itely:1143 (context id)
+#. Documentation/snippets/anglican-psalm-template.ly:95 (context id)
 #. Documentation/snippets/chords-headword.ly:63 (variable)
+#. Documentation/snippets/hymn-template.ly:102 (context id)
 msgid "Tenor"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1322 (context id)
-#. Documentation/learning/tweaks.itely:3561 (context id)
-#. Documentation/notation/input.itely:991 (context id)
+#. Documentation/learning/fundamental.itely:1331 (context id)
+#. Documentation/learning/tweaks.itely:3651 (context id)
+#. Documentation/notation/input.itely:1148 (context id)
+#. Documentation/snippets/anglican-psalm-template.ly:99 (context id)
 #. Documentation/snippets/chords-headword.ly:70 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:240 (variable)
+#. Documentation/snippets/hymn-template.ly:107 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:242 (variable)
 msgid "Bass"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1347 (variable)
-#. Documentation/learning/fundamental.itely:1400 (variable)
-#. Documentation/learning/fundamental.itely:1463 (variable)
-msgid "versenotes"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1353 (variable)
-#. Documentation/learning/fundamental.itely:1415 (variable)
-#. Documentation/learning/fundamental.itely:1478 (variable)
-msgid "versewords"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1359 (context id)
-#. Documentation/learning/fundamental.itely:1427 (context id)
-#. Documentation/learning/fundamental.itely:1489 (context id)
-#. Documentation/snippets/score-for-diatonic-accordion.ly:60 (variable)
-msgid "verse"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1406 (variable)
-#. Documentation/learning/fundamental.itely:1469 (variable)
-msgid "refrainnotesA"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1410 (variable)
-#. Documentation/learning/fundamental.itely:1473 (variable)
-msgid "refrainnotesB"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1418 (variable)
-#. Documentation/learning/fundamental.itely:1481 (variable)
-msgid "refrainwordsA"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1421 (variable)
-#. Documentation/learning/fundamental.itely:1484 (variable)
-msgid "refrainwordsB"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1435 (context id)
-#. Documentation/learning/fundamental.itely:1509 (context id)
-msgid "refrainB"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1501 (context id)
-msgid "refrainA"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:1663 (comment)
+#. Documentation/learning/fundamental.itely:1475 (comment)
 msgid "start of single compound music expression"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1664 (comment)
+#. Documentation/learning/fundamental.itely:1476 (comment)
 msgid "start of simultaneous staves section"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1666 (comment)
+#. Documentation/learning/fundamental.itely:1478 (comment)
 msgid "create RH staff"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1669 (comment)
+#. Documentation/learning/fundamental.itely:1481 (comment)
 msgid "create voice for RH notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1670 (comment)
+#. Documentation/learning/fundamental.itely:1482 (comment)
 msgid "start of RH notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1673 (comment)
+#. Documentation/learning/fundamental.itely:1485 (comment)
 msgid "end of RH notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1674 (comment)
+#. Documentation/learning/fundamental.itely:1486 (comment)
 msgid "end of RH voice"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1675 (comment)
+#. Documentation/learning/fundamental.itely:1487 (comment)
 msgid "end of RH staff"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1676 (comment)
+#. Documentation/learning/fundamental.itely:1488 (comment)
 msgid "create LH staff; needs two simultaneous voices"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1679 (comment)
+#. Documentation/learning/fundamental.itely:1491 (comment)
 msgid "create LH voice one"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1681 (comment)
+#. Documentation/learning/fundamental.itely:1493 (comment)
 msgid "start of LH voice one notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1684 (comment)
+#. Documentation/learning/fundamental.itely:1496 (comment)
 msgid "end of LH voice one notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1685 (comment)
+#. Documentation/learning/fundamental.itely:1497 (comment)
 msgid "end of LH voice one"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1686 (comment)
+#. Documentation/learning/fundamental.itely:1498 (comment)
 msgid "create LH voice two"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1688 (comment)
+#. Documentation/learning/fundamental.itely:1500 (comment)
 msgid "start of LH voice two notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1691 (comment)
+#. Documentation/learning/fundamental.itely:1503 (comment)
 msgid "end of LH voice two notes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1692 (comment)
+#. Documentation/learning/fundamental.itely:1504 (comment)
 msgid "end of LH voice two"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1693 (comment)
+#. Documentation/learning/fundamental.itely:1505 (comment)
 msgid "end of LH staff"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1694 (comment)
+#. Documentation/learning/fundamental.itely:1506 (comment)
 msgid "end of simultaneous staves section"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1695 (comment)
+#. Documentation/learning/fundamental.itely:1507 (comment)
 msgid "end of single compound music expression"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:1914 (comment)
+#. Documentation/learning/fundamental.itely:1726 (comment)
 msgid "Wrong!"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2000 (comment)
-#. Documentation/learning/fundamental.itely:2171 (comment)
+#. Documentation/learning/fundamental.itely:1812 (comment)
+#. Documentation/learning/fundamental.itely:1989 (comment)
 msgid "make note heads smaller"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2003 (comment)
-#. Documentation/learning/fundamental.itely:2173 (comment)
+#. Documentation/learning/fundamental.itely:1815 (comment)
+#. Documentation/learning/fundamental.itely:1991 (comment)
 msgid "make note heads larger"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2006 (comment)
-#. Documentation/learning/fundamental.itely:2175 (comment)
+#. Documentation/learning/fundamental.itely:1818 (comment)
+#. Documentation/learning/fundamental.itely:1993 (comment)
 msgid "return to default size"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2457 (variable)
-#. Documentation/learning/fundamental.itely:2742 (variable)
-#. Documentation/notation/input.itely:976 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:63 (variable)
+#. Documentation/learning/fundamental.itely:2282 (variable)
+#. Documentation/learning/fundamental.itely:2570 (variable)
+#. Documentation/notation/input.itely:1133 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:74 (variable)
 msgid "sopranoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2464 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:64 (variable)
+#. Documentation/learning/fundamental.itely:2289 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:75 (variable)
 msgid "sopranoLyrics"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2468 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:76 (variable)
+#. Documentation/learning/fundamental.itely:2293 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:87 (variable)
 msgid "celloMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2746 (variable)
+#. Documentation/learning/fundamental.itely:2574 (variable)
 msgid "sopranoWords"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2749 (variable)
-#. Documentation/notation/input.itely:977 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:73 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:63 (variable)
-#. Documentation/snippets/vocal-ensemble-template.ly:72 (variable)
-msgid "altoMusic"
-msgstr ""
-
-#. Documentation/learning/fundamental.itely:2753 (variable)
+#. Documentation/learning/fundamental.itely:2577 (variable)
+#. Documentation/notation/input.itely:1134 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:76 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:66 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:75 (variable)
-msgid "altoWords"
+msgid "altoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2754 (variable)
-#. Documentation/notation/input.itely:978 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:69 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:80 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:70 (variable)
-#. Documentation/snippets/vocal-ensemble-template.ly:79 (variable)
-msgid "tenorMusic"
+#. Documentation/learning/fundamental.itely:2581 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:79 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:69 (variable)
+#. Documentation/snippets/vocal-ensemble-template.ly:78 (variable)
+msgid "altoWords"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2758 (variable)
+#. Documentation/learning/fundamental.itely:2582 (variable)
+#. Documentation/notation/input.itely:1135 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:80 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:83 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:73 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:82 (variable)
-msgid "tenorWords"
+msgid "tenorMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2759 (variable)
-#. Documentation/notation/input.itely:979 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:77 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:87 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:77 (variable)
-#. Documentation/snippets/vocal-ensemble-template.ly:86 (variable)
-msgid "bassMusic"
+#. Documentation/learning/fundamental.itely:2586 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:86 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:76 (variable)
+#. Documentation/snippets/vocal-ensemble-template.ly:85 (variable)
+msgid "tenorWords"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2763 (variable)
+#. Documentation/learning/fundamental.itely:2587 (variable)
+#. Documentation/notation/input.itely:1136 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:88 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:90 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:80 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
+msgid "bassMusic"
+msgstr ""
+
+#. Documentation/learning/fundamental.itely:2591 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:93 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:83 (variable)
+#. Documentation/snippets/vocal-ensemble-template.ly:92 (variable)
 msgid "bassWords"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2780 (comment)
+#. Documentation/learning/fundamental.itely:2608 (comment)
 msgid "combine ChoirStaff and PianoStaff in parallel"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2782 (context id)
-#. Documentation/learning/fundamental.itely:2784 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:99 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:87 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:97 (context id)
+#. Documentation/learning/fundamental.itely:2610 (context id)
+#. Documentation/learning/fundamental.itely:2612 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:102 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:90 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:100 (context id)
 msgid "sopranos"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2792 (context id)
-#. Documentation/learning/fundamental.itely:2794 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:100 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:88 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:101 (context id)
+#. Documentation/learning/fundamental.itely:2620 (context id)
+#. Documentation/learning/fundamental.itely:2622 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:103 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:91 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:104 (context id)
 msgid "altos"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2802 (context id)
-#. Documentation/learning/fundamental.itely:2804 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:106 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:98 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:110 (context id)
+#. Documentation/learning/fundamental.itely:2630 (context id)
+#. Documentation/learning/fundamental.itely:2632 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:109 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:113 (context id)
 msgid "tenors"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2812 (context id)
-#. Documentation/learning/fundamental.itely:2814 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:107 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:99 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:114 (context id)
+#. Documentation/learning/fundamental.itely:2640 (context id)
+#. Documentation/learning/fundamental.itely:2642 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:110 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:117 (context id)
 msgid "basses"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:2822 (comment)
+#. Documentation/learning/fundamental.itely:2650 (comment)
 msgid "end ChoirStaff"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3010 (variable)
+#. Documentation/learning/fundamental.itely:2902 (variable)
 msgid "ManualOneVoiceOneMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3014 (variable)
+#. Documentation/learning/fundamental.itely:2906 (variable)
 msgid "ManualOneVoiceTwoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3018 (variable)
+#. Documentation/learning/fundamental.itely:2910 (variable)
 msgid "ManualTwoMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3022 (variable)
+#. Documentation/learning/fundamental.itely:2914 (variable)
 msgid "PedalOrganMusic"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3028 (comment)
+#. Documentation/learning/fundamental.itely:2920 (comment)
 msgid "PianoStaff and Pedal Staff must be simultaneous"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3030 (context id)
+#. Documentation/learning/fundamental.itely:2922 (context id)
 msgid "ManualOne"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3031 (comment)
-msgid "set time signature and key"
+#. Documentation/learning/fundamental.itely:2923 (comment)
+msgid "set key and time signature"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3041 (comment)
+#. Documentation/learning/fundamental.itely:2933 (comment)
 msgid "end ManualOne Staff context"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3042 (context id)
+#. Documentation/learning/fundamental.itely:2934 (context id)
 msgid "ManualTwo"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3048 (comment)
+#. Documentation/learning/fundamental.itely:2943 (comment)
 msgid "end ManualTwo Staff context"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3049 (comment)
+#. Documentation/learning/fundamental.itely:2944 (comment)
 msgid "end PianoStaff context"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3050 (context id)
+#. Documentation/learning/fundamental.itely:2945 (context id)
 msgid "PedalOrgan"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3056 (comment)
+#. Documentation/learning/fundamental.itely:2951 (comment)
 msgid "end PedalOrgan Staff context"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3058 (comment)
+#. Documentation/learning/fundamental.itely:2953 (comment)
 msgid "end Score context"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3071 (variable)
+#. Documentation/learning/fundamental.itely:2969 (variable)
 msgid "hornNotes"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3082 (variable)
+#. Documentation/learning/fundamental.itely:2981 (variable)
 msgid "fragmentA"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3083 (variable)
+#. Documentation/learning/fundamental.itely:2982 (variable)
 msgid "fragmentB"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3102 (variable)
+#. Documentation/learning/fundamental.itely:3001 (variable)
 msgid "dolce"
 msgstr ""
 
-#. Documentation/learning/fundamental.itely:3104 (variable)
+#. Documentation/learning/fundamental.itely:3004 (variable)
 msgid "fthenp"
 msgstr ""
 
@@ -2055,241 +2072,263 @@ msgstr ""
 msgid "Scores and parts"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:598 (comment)
-#. Documentation/learning/tweaks.itely:733 (comment)
+#. Documentation/learning/tweaks.itely:602 (comment)
+#. Documentation/learning/tweaks.itely:740 (comment)
 msgid "Increase thickness of all following slurs from 1.2 to 5.0"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:667 (comment)
-#. Documentation/learning/tweaks.itely:706 (comment)
-#. Documentation/learning/tweaks.itely:709 (comment)
+#. Documentation/learning/tweaks.itely:672 (comment)
+#. Documentation/learning/tweaks.itely:712 (comment)
+#. Documentation/learning/tweaks.itely:715 (comment)
 msgid "Increase thickness of immediately following slur only"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:737 (comment)
+#. Documentation/learning/tweaks.itely:744 (comment)
 msgid "Revert thickness of all following slurs to default of 1.2"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1413 (comment)
+#. Documentation/learning/tweaks.itely:1421 (comment)
 msgid "Don't print clefs in this staff"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1415 (comment)
+#. Documentation/learning/tweaks.itely:1423 (comment)
 msgid "Don't print time signatures in this staff"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1479 (comment)
+#. Documentation/learning/tweaks.itely:1487 (comment)
 msgid "Reduce all font sizes by ~24%"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1546 (comment)
+#. Documentation/learning/tweaks.itely:1554 (comment)
 msgid "Reduce stem length and line spacing to match"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1990 (comment)
-#. Documentation/learning/tweaks.itely:2059 (comment)
+#. Documentation/learning/tweaks.itely:1998 (comment)
+#. Documentation/learning/tweaks.itely:2067 (comment)
 msgid "Set details for later Text Spanner"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1993 (comment)
-#. Documentation/learning/tweaks.itely:2062 (comment)
+#. Documentation/learning/tweaks.itely:2001 (comment)
+#. Documentation/learning/tweaks.itely:2070 (comment)
 msgid "Place dynamics above staff"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1995 (comment)
-#. Documentation/learning/tweaks.itely:2066 (comment)
+#. Documentation/learning/tweaks.itely:2003 (comment)
+#. Documentation/learning/tweaks.itely:2074 (comment)
 msgid "Start Ottava Bracket"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:1998 (comment)
+#. Documentation/learning/tweaks.itely:2006 (comment)
 msgid "Add Dynamic Text and hairpin"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2001 (comment)
-#. Documentation/learning/tweaks.itely:2073 (comment)
+#. Documentation/learning/tweaks.itely:2009 (comment)
+#. Documentation/learning/tweaks.itely:2081 (comment)
 msgid "Add Text Script"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2004 (comment)
+#. Documentation/learning/tweaks.itely:2012 (comment)
 msgid "Add Dynamic Text and terminate hairpin"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2006 (comment)
-#. Documentation/learning/tweaks.itely:2078 (comment)
+#. Documentation/learning/tweaks.itely:2014 (comment)
+#. Documentation/learning/tweaks.itely:2086 (comment)
 msgid "Stop Ottava Bracket"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2064 (comment)
+#. Documentation/learning/tweaks.itely:2072 (comment)
 msgid "Place following Ottava Bracket below Text Spanners"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2069 (comment)
-#. Documentation/learning/tweaks.itely:2076 (comment)
+#. Documentation/learning/tweaks.itely:2077 (comment)
+#. Documentation/learning/tweaks.itely:2084 (comment)
 msgid "Add Dynamic Text"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2071 (comment)
+#. Documentation/learning/tweaks.itely:2079 (comment)
 msgid "Add Dynamic Line Spanner"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2153 (comment)
+#. Documentation/learning/tweaks.itely:2161 (comment)
 msgid "Cause notes to space out to accommodate text"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2176 (comment)
+#. Documentation/learning/tweaks.itely:2184 (comment)
 msgid "This markup is short enough to fit without collision"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2180 (comment)
+#. Documentation/learning/tweaks.itely:2188 (comment)
 msgid "This is too long to fit, so it is displaced upwards"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2184 (comment)
-#. Documentation/learning/tweaks.itely:2189 (comment)
+#. Documentation/learning/tweaks.itely:2192 (comment)
+#. Documentation/learning/tweaks.itely:2197 (comment)
 msgid "Turn off collision avoidance"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2191 (comment)
+#. Documentation/learning/tweaks.itely:2199 (comment)
 msgid "and turn on textLengthOn"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2192 (comment)
+#. Documentation/learning/tweaks.itely:2200 (comment)
 msgid "Spaces at end are honored"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2299 (comment)
+#. Documentation/learning/tweaks.itely:2307 (comment)
 msgid "Extend width by 1 staff space"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2582 (comment)
+#. Documentation/learning/tweaks.itely:2587 (comment)
 msgid "This will not work, see below"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2586 (comment)
+#. Documentation/learning/tweaks.itely:2591 (comment)
 msgid "This works"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2623 (variable)
+#. Documentation/learning/tweaks.itely:2627 (variable)
 msgid "sesquisharp"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2626 (comment)
+#. Documentation/learning/tweaks.itely:2630 (comment)
 msgid "This prints a sesquisharp but the spacing is too small"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2631 (comment)
+#. Documentation/learning/tweaks.itely:2635 (comment)
 msgid "This improves the spacing"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2671 (comment)
+#. Documentation/learning/tweaks.itely:2675 (comment)
 msgid "Extend width by 1 unit"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2673 (comment)
+#. Documentation/learning/tweaks.itely:2677 (comment)
 msgid "Align dynamics to a base line 2 units above staff"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2980 (variable)
-#. Documentation/learning/tweaks.itely:3029 (variable)
-#. Documentation/learning/tweaks.itely:3091 (variable)
-#. Documentation/learning/tweaks.itely:3228 (variable)
-#. Documentation/learning/tweaks.itely:3289 (variable)
+#. Documentation/learning/tweaks.itely:3003 (variable)
+#. Documentation/learning/tweaks.itely:3060 (variable)
+#. Documentation/learning/tweaks.itely:3130 (variable)
+#. Documentation/learning/tweaks.itely:3283 (variable)
+#. Documentation/learning/tweaks.itely:3352 (variable)
 msgid "rhMusic"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2985 (comment)
-#. Documentation/learning/tweaks.itely:3034 (comment)
-#. Documentation/learning/tweaks.itely:3098 (comment)
-#. Documentation/learning/tweaks.itely:3237 (comment)
+#. Documentation/learning/tweaks.itely:3009 (comment)
+#. Documentation/learning/tweaks.itely:3066 (comment)
+#. Documentation/learning/tweaks.itely:3138 (comment)
+#. Documentation/learning/tweaks.itely:3293 (comment)
+#. Documentation/learning/tweaks.itely:3362 (comment)
 msgid "Start polyphonic section of four voices"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:2998 (variable)
-#. Documentation/learning/tweaks.itely:3047 (variable)
-#. Documentation/learning/tweaks.itely:3111 (variable)
-#. Documentation/learning/tweaks.itely:3254 (variable)
-#. Documentation/learning/tweaks.itely:3320 (variable)
+#. Documentation/learning/tweaks.itely:3011 (comment)
+#. Documentation/learning/tweaks.itely:3025 (comment)
+#. Documentation/learning/tweaks.itely:3068 (comment)
+#. Documentation/learning/tweaks.itely:3082 (comment)
+#. Documentation/learning/tweaks.itely:3140 (comment)
+#. Documentation/learning/tweaks.itely:3154 (comment)
+#. Documentation/learning/tweaks.itely:3295 (comment)
+#. Documentation/learning/tweaks.itely:3313 (comment)
+#. Documentation/learning/tweaks.itely:3364 (comment)
+#. Documentation/learning/tweaks.itely:3390 (comment)
+msgid "continuation of main voice"
+msgstr ""
+
+#. Documentation/learning/tweaks.itely:3029 (variable)
+#. Documentation/learning/tweaks.itely:3086 (variable)
+#. Documentation/learning/tweaks.itely:3158 (variable)
+#. Documentation/learning/tweaks.itely:3317 (variable)
+#. Documentation/learning/tweaks.itely:3394 (variable)
 msgid "lhMusic"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3007 (context id)
-#. Documentation/learning/tweaks.itely:3056 (context id)
-#. Documentation/learning/tweaks.itely:3120 (context id)
-#. Documentation/learning/tweaks.itely:3263 (context id)
-#. Documentation/learning/tweaks.itely:3329 (context id)
-#. Documentation/notation/input.itely:997 (context id)
+#. Documentation/learning/tweaks.itely:3038 (context id)
+#. Documentation/learning/tweaks.itely:3095 (context id)
+#. Documentation/learning/tweaks.itely:3167 (context id)
+#. Documentation/learning/tweaks.itely:3326 (context id)
+#. Documentation/learning/tweaks.itely:3403 (context id)
+#. Documentation/notation/input.itely:1154 (context id)
 #. Documentation/snippets/repeats-headword.ly:30 (context id)
 #. Documentation/snippets/simultaneous-headword.ly:60 (comment)
 msgid "RH"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3011 (context id)
-#. Documentation/learning/tweaks.itely:3060 (context id)
-#. Documentation/learning/tweaks.itely:3124 (context id)
-#. Documentation/learning/tweaks.itely:3267 (context id)
-#. Documentation/learning/tweaks.itely:3333 (context id)
-#. Documentation/notation/input.itely:1003 (context id)
+#. Documentation/learning/tweaks.itely:3042 (context id)
+#. Documentation/learning/tweaks.itely:3099 (context id)
+#. Documentation/learning/tweaks.itely:3171 (context id)
+#. Documentation/learning/tweaks.itely:3330 (context id)
+#. Documentation/learning/tweaks.itely:3407 (context id)
+#. Documentation/notation/input.itely:1160 (context id)
 #. Documentation/snippets/repeats-headword.ly:92 (context id)
 #. Documentation/snippets/text-headword.ly:137 (comment)
 msgid "LH"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3241 (comment)
-#. Documentation/learning/tweaks.itely:3304 (comment)
+#. Documentation/learning/tweaks.itely:3298 (comment)
+#. Documentation/learning/tweaks.itely:3370 (comment)
 msgid "Move the c2 out of the main note column so the merge will work"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3244 (comment)
-#. Documentation/learning/tweaks.itely:3307 (comment)
+#. Documentation/learning/tweaks.itely:3303 (comment)
+#. Documentation/learning/tweaks.itely:3377 (comment)
 msgid "Stem on the d2 must be down to permit merging"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3302 (comment)
+#. Documentation/learning/tweaks.itely:3368 (comment)
 msgid "Reposition the c2 to the right of the merged note"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3442 (comment)
-#. Documentation/learning/tweaks.itely:3464 (comment)
+#. Documentation/learning/tweaks.itely:3379 (comment)
+msgid "Stem on the d2 should be invisible"
+msgstr ""
+
+#. Documentation/learning/tweaks.itely:3514 (comment)
+#. Documentation/learning/tweaks.itely:3536 (comment)
 msgid "Visible tempo marking"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3446 (comment)
-#. Documentation/learning/tweaks.itely:3468 (comment)
+#. Documentation/learning/tweaks.itely:3518 (comment)
+#. Documentation/learning/tweaks.itely:3540 (comment)
 msgid "Invisible tempo marking to lengthen fermata in MIDI"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3449 (comment)
-#. Documentation/learning/tweaks.itely:3471 (comment)
+#. Documentation/learning/tweaks.itely:3521 (comment)
+#. Documentation/learning/tweaks.itely:3543 (comment)
 msgid "New tempo for next section"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3528 (variable)
+#. Documentation/learning/tweaks.itely:3604 (variable)
 msgid "emphasize"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3532 (variable)
+#. Documentation/learning/tweaks.itely:3609 (variable)
 msgid "normal"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3538 (variable)
+#. Documentation/learning/tweaks.itely:3616 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:42 (variable)
+#. Documentation/snippets/hymn-template.ly:58 (variable)
 msgid "SopranoMusic"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3551 (context id)
-#. Documentation/notation/input.itely:982 (context id)
+#. Documentation/learning/tweaks.itely:3641 (context id)
+#. Documentation/notation/input.itely:1139 (context id)
+#. Documentation/snippets/anglican-psalm-template.ly:83 (context id)
 #. Documentation/snippets/chords-headword.ly:49 (variable)
+#. Documentation/snippets/hymn-template.ly:88 (context id)
 msgid "Soprano"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3582 (variable)
+#. Documentation/learning/tweaks.itely:3672 (variable)
 msgid "mpdolce"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:3585 (variable)
+#. Documentation/learning/tweaks.itely:3679 (variable)
 msgid "inst"
 msgstr ""
 
-#. Documentation/learning/tweaks.itely:4029 (comment)
+#. Documentation/learning/tweaks.itely:4184 (comment)
 msgid "Arrange to obtain color from color-notehead procedure"
 msgstr ""
 
@@ -2449,7 +2488,7 @@ msgid "padding property"
 msgstr ""
 
 #. @subheading in Documentation/learning/tweaks.itely
-msgid "left-padding and right-padding"
+msgid "right-padding"
 msgstr ""
 
 #. @subheading in Documentation/learning/tweaks.itely
@@ -2598,6 +2637,22 @@ msgstr ""
 msgid "SATB with aligned contexts"
 msgstr ""
 
+#. @appendixsubsec in Documentation/learning/templates.itely
+msgid "SATB on four staves"
+msgstr ""
+
+#. @appendixsubsec in Documentation/learning/templates.itely
+msgid "Solo verse and two-part refrain"
+msgstr ""
+
+#. @appendixsubsec in Documentation/learning/templates.itely
+msgid "Hymn tunes"
+msgstr ""
+
+#. @appendixsubsec in Documentation/learning/templates.itely
+msgid "Psalms"
+msgstr ""
+
 #. @node in Documentation/learning/templates.itely
 #. @appendixsec in Documentation/learning/templates.itely
 msgid "Orchestral templates"
@@ -2636,10 +2691,10 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/notation/changing-defaults.itely:455 (context id)
-#. Documentation/notation/changing-defaults.itely:461 (context id)
+#. Documentation/notation/changing-defaults.itely:453 (context id)
+#. Documentation/notation/changing-defaults.itely:459 (context id)
+#. Documentation/notation/changing-defaults.itely:467 (context id)
 #. Documentation/notation/changing-defaults.itely:469 (context id)
-#. Documentation/notation/changing-defaults.itely:471 (context id)
 msgid "A"
 msgstr ""
 
@@ -2690,7 +2745,8 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/snippets/jazz-combo-template.ly:111 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:113 (variable)
+#. Documentation/snippets/satb-choir-template---four-staves.ly:69 (context id)
 msgid "alto"
 msgstr ""
 
@@ -2721,12 +2777,12 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-msgid "augmented interval"
+msgid "augmentation"
 msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-msgid "augmentation"
+msgid "augmented interval"
 msgstr ""
 
 #. @node in Documentation/music-glossary.tely
@@ -2736,9 +2792,9 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/notation/changing-defaults.itely:456 (context id)
-#. Documentation/notation/changing-defaults.itely:465 (context id)
-#. Documentation/notation/changing-defaults.itely:470 (context id)
+#. Documentation/notation/changing-defaults.itely:454 (context id)
+#. Documentation/notation/changing-defaults.itely:463 (context id)
+#. Documentation/notation/changing-defaults.itely:468 (context id)
 msgid "B"
 msgstr ""
 
@@ -2769,10 +2825,11 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:44 (variable)
+#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:45 (variable)
 #. Documentation/snippets/fretted-headword.ly:107 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:244 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:292 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:246 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:294 (context id)
+#. Documentation/snippets/satb-choir-template---four-staves.ly:83 (context id)
 msgid "bass"
 msgstr ""
 
@@ -2887,6 +2944,11 @@ msgstr ""
 msgid "common meter"
 msgstr ""
 
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "Common Practice Period"
+msgstr ""
+
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 msgid "common time"
@@ -3462,11 +3524,6 @@ msgstr ""
 msgid "meter"
 msgstr ""
 
-#. @node in Documentation/music-glossary.tely
-#. @section in Documentation/music-glossary.tely
-msgid "metronome"
-msgstr ""
-
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 msgid "metronome mark"
@@ -3589,8 +3646,8 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/snippets/flamenco-notation.ly:144 (variable)
-#. Documentation/snippets/flamenco-notation.ly:241 (context id)
+#. Documentation/snippets/flamenco-notation.ly:184 (variable)
+#. Documentation/snippets/flamenco-notation.ly:281 (context id)
 msgid "part"
 msgstr ""
 
@@ -3654,6 +3711,11 @@ msgstr ""
 msgid "portato"
 msgstr ""
 
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "power chord"
+msgstr ""
+
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 msgid "presto"
@@ -3712,7 +3774,7 @@ msgstr ""
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly:49 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:288 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:290 (context id)
 msgid "rhythm"
 msgstr ""
 
@@ -3838,6 +3900,7 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
+#. Documentation/snippets/satb-choir-template---four-staves.ly:62 (context id)
 msgid "soprano"
 msgstr ""
 
@@ -3846,11 +3909,6 @@ msgstr ""
 msgid "staccato"
 msgstr ""
 
-#. @node in Documentation/music-glossary.tely
-#. @section in Documentation/music-glossary.tely
-msgid "staff"
-msgstr ""
-
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 msgid "staves"
@@ -3921,11 +3979,6 @@ msgstr ""
 msgid "syntonic comma"
 msgstr ""
 
-#. @node in Documentation/music-glossary.tely
-#. @section in Documentation/music-glossary.tely
-msgid "system"
-msgstr ""
-
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 msgid "temperament"
@@ -3933,11 +3986,7 @@ msgstr ""
 
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-msgid "tempo indication"
-msgstr ""
-
-#. @node in Documentation/music-glossary.tely
-#. @section in Documentation/music-glossary.tely
+#. Documentation/snippets/satb-choir-template---four-staves.ly:76 (context id)
 msgid "tenor"
 msgstr ""
 
@@ -4082,52 +4131,110 @@ msgid "Duration names notes and rests"
 msgstr ""
 
 #. @node in Documentation/music-glossary.tely
-#. @appendix in Documentation/music-glossary.tely
-msgid "Literature used"
+#. @chapter in Documentation/music-glossary.tely
+msgid "Non-Western terms A-Z"
 msgstr ""
 
-#. @node in Documentation/notation.tely
-#. @appendix in Documentation/notation.tely
-msgid "LilyPond grammar"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "bayati"
 msgstr ""
 
-#. @node in Documentation/notation.tely
-#. @appendix in Documentation/notation.tely
-msgid "LilyPond command index"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "iraq"
 msgstr ""
 
-#. @node in Documentation/notation/notation.itely
-#. @chapter in Documentation/notation/notation.itely
-msgid "Musical notation"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "kurd"
 msgstr ""
 
-#. @node in Documentation/notation/specialist.itely
-#. @chapter in Documentation/notation/specialist.itely
-msgid "Specialist notation"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "makam"
 msgstr ""
 
-#. Documentation/notation/input.itely:548 (comment)
-msgid "not printed"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "makamlar"
 msgstr ""
 
-#. Documentation/notation/input.itely:980 (variable)
-msgid "allLyrics"
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "maqam"
+msgstr ""
+
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "rast"
+msgstr ""
+
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "semai"
+msgstr ""
+
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "sikah"
+msgstr ""
+
+#. @node in Documentation/music-glossary.tely
+#. @section in Documentation/music-glossary.tely
+msgid "taqasim"
+msgstr ""
+
+#. @node in Documentation/music-glossary.tely
+#. @appendix in Documentation/music-glossary.tely
+msgid "Literature used"
+msgstr ""
+
+#. @node in Documentation/notation.tely
+#. @appendix in Documentation/notation.tely
+msgid "LilyPond grammar"
+msgstr ""
+
+#. @node in Documentation/notation.tely
+#. @appendix in Documentation/notation.tely
+msgid "LilyPond command index"
+msgstr ""
+
+#. @node in Documentation/notation/notation.itely
+#. @chapter in Documentation/notation/notation.itely
+msgid "Musical notation"
+msgstr ""
+
+#. @node in Documentation/notation/specialist.itely
+#. @chapter in Documentation/notation/specialist.itely
+msgid "Specialist notation"
+msgstr ""
+
+#. Documentation/notation/input.itely:673 (comment)
+msgid "not printed"
 msgstr ""
 
-#. Documentation/notation/input.itely:1066 (variable)
-#. Documentation/notation/input.itely:1085 (variable)
-#. Documentation/notation/input.itely:1122 (variable)
 #. Documentation/notation/input.itely:1137 (variable)
-#. Documentation/notation/changing-defaults.itely:460 (variable)
-#. Documentation/notation/changing-defaults.itely:495 (context id)
-#. Documentation/notation/changing-defaults.itely:545 (context id)
+msgid "allLyrics"
+msgstr ""
+
+#. Documentation/notation/input.itely:1223 (variable)
+#. Documentation/notation/input.itely:1242 (variable)
+#. Documentation/notation/input.itely:1279 (variable)
+#. Documentation/notation/input.itely:1294 (variable)
+#. Documentation/notation/spacing.itely:1555 (variable)
+#. Documentation/notation/spacing.itely:1609 (variable)
+#. Documentation/notation/spacing.itely:1634 (variable)
+#. Documentation/notation/changing-defaults.itely:458 (variable)
+#. Documentation/notation/changing-defaults.itely:493 (context id)
+#. Documentation/notation/changing-defaults.itely:543 (context id)
 #. Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly:31 (variable)
-#. Documentation/snippets/controlling-tuplet-bracket-visibility.ly:21 (variable)
-#. Documentation/snippets/guitar-slides.ly:30 (variable)
-#. Documentation/snippets/letter-tablature-formatting.ly:18 (variable)
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:138 (variable)
-#. Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:168 (variable)
-#. Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly:66 (variable)
+#. Documentation/snippets/controlling-tuplet-bracket-visibility.ly:53 (variable)
+#. Documentation/snippets/guitar-slides.ly:43 (variable)
+#. Documentation/snippets/letter-tablature-formatting.ly:26 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:141 (variable)
+#. Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:170 (variable)
+#. Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly:68 (variable)
 msgid "music"
 msgstr ""
 
@@ -4151,6 +4258,16 @@ msgstr ""
 msgid "Multiple scores in a book"
 msgstr ""
 
+#. @node in Documentation/notation/input.itely
+#. @subsection in Documentation/notation/input.itely
+msgid "Multiple output files from one input file"
+msgstr ""
+
+#. @node in Documentation/notation/input.itely
+#. @subsection in Documentation/notation/input.itely
+msgid "Output file names"
+msgstr ""
+
 #. @node in Documentation/notation/input.itely
 #. @subsection in Documentation/notation/input.itely
 msgid "File structure"
@@ -4167,8 +4284,11 @@ msgid "Creating titles"
 msgstr ""
 
 #. @node in Documentation/notation/input.itely
+msgid "Custom headers footers and titles"
+msgstr ""
+
 #. @subsection in Documentation/notation/input.itely
-msgid "Custom titles"
+msgid "Custom headers, footers, and titles"
 msgstr ""
 
 #. @node in Documentation/notation/input.itely
@@ -4241,6 +4361,10 @@ msgstr ""
 msgid "Replacing the notation font"
 msgstr ""
 
+#. @subsubheading in Documentation/notation/input.itely
+msgid "Installation Instructions for MacOS"
+msgstr ""
+
 #. @node in Documentation/notation/input.itely
 #. @section in Documentation/notation/input.itely
 msgid "MIDI output"
@@ -4304,71 +4428,63 @@ msgstr ""
 msgid "Percussion in MIDI"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1009 (comment)
-msgid "this does nothing"
+#. Documentation/notation/spacing.itely:2045 (comment)
+msgid "The very low note here needs more room than 'space can"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1010 (comment)
-msgid "a break here would work"
+#. Documentation/notation/spacing.itely:2046 (comment)
+msgid "provide, so the distance between this staff and the next is"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1011 (comment)
-msgid "as does this break"
+#. Documentation/notation/spacing.itely:2047 (comment)
+msgid "determined by 'padding."
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1023 (comment)
-msgid "now the break is allowed"
+#. Documentation/notation/spacing.itely:2050 (comment)
+msgid "Here, 'space provides enough room, and there is no need to"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1441 (comment)
-msgid "Since space is small and there is no minimum-distance, the distance"
+#. Documentation/notation/spacing.itely:2051 (comment)
+msgid "compress the space (towards 'minimum-distance) to make room"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1442 (comment)
-msgid "between this staff and the next will be determined by padding."
+#. Documentation/notation/spacing.itely:2052 (comment)
+msgid "for anything else on the page, so the distance between this"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1448 (comment)
-msgid "Since space is small and nothing sticks out very far, the distance"
+#. Documentation/notation/spacing.itely:2053 (comment)
+msgid "staff and the next is determined by 'space."
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1449 (comment)
-msgid "between this staff and the next will be determined by minimum-distance."
+#. Documentation/notation/spacing.itely:2056 (comment)
+msgid "By setting 'padding to a negative value, staves can be made to"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1455 (comment)
-msgid "By setting padding to a negative value, staves can be made to collide."
+#. Documentation/notation/spacing.itely:2057 (comment)
+msgid "collide.  The lowest acceptable value for 'space is 0."
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1551 (comment)
-msgid "By default, Lyrics are placed close together. Here, we allow them to"
-msgstr ""
-
-#. Documentation/notation/spacing.itely:1552 (comment)
-msgid "be stretched more widely."
-msgstr ""
-
-#. Documentation/notation/spacing.itely:1905 (comment)
+#. Documentation/notation/spacing.itely:2489 (comment)
 msgid "this time the text will be closer to the staff"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1907 (comment)
+#. Documentation/notation/spacing.itely:2491 (comment)
 msgid "by setting outside-staff-priority to a non-number,"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1908 (comment)
+#. Documentation/notation/spacing.itely:2492 (comment)
 msgid "we disable the automatic collision avoidance"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1911 (comment)
+#. Documentation/notation/spacing.itely:2495 (comment)
 msgid "now they will collide"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1937 (comment)
+#. Documentation/notation/spacing.itely:2521 (comment)
 msgid "the markup is too close to the following note"
 msgstr ""
 
-#. Documentation/notation/spacing.itely:1941 (comment)
+#. Documentation/notation/spacing.itely:2525 (comment)
 msgid "setting outside-staff-horizontal-padding fixes this"
 msgstr ""
 
@@ -4379,49 +4495,151 @@ msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @section in Documentation/notation/spacing.itely
-msgid "Paper and pages"
+msgid "Page layout"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
+msgid "The \\\\paper block"
+msgstr ""
+
 #. @subsection in Documentation/notation/spacing.itely
-msgid "Paper size"
+msgid "The @code{\\\\paper} block"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @subsection in Documentation/notation/spacing.itely
-msgid "Page formatting"
+msgid "Paper size and automatic scaling"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @unnumberedsubsubsec in Documentation/notation/spacing.itely
-msgid "Vertical dimensions"
+msgid "Setting paper size"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @unnumberedsubsubsec in Documentation/notation/spacing.itely
-msgid "Horizontal dimensions"
+msgid "Automatic scaling to paper size"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "Fixed vertical spacing \\\\paper variables"
+msgstr ""
+
+#. @subsection in Documentation/notation/spacing.itely
+msgid "Fixed vertical spacing @code{\\\\paper} variables"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "Flexible vertical spacing \\\\paper variables"
+msgstr ""
+
+#. @subsection in Documentation/notation/spacing.itely
+msgid "Flexible vertical spacing @code{\\\\paper} variables"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @unnumberedsubsubsec in Documentation/notation/spacing.itely
-msgid "Other layout variables"
+msgid "Structure of flexible vertical spacing alists"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
-#. @section in Documentation/notation/spacing.itely
-msgid "Music layout"
+msgid "List of flexible vertical spacing \\\\paper variables"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "List of flexible vertical spacing @code{\\\\paper} variables"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
+msgid "Horizontal spacing \\\\paper variables"
+msgstr ""
+
 #. @subsection in Documentation/notation/spacing.itely
-msgid "Setting the staff size"
+msgid "Horizontal spacing @code{\\\\paper} variables"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for widths and margins"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for widths and margins"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for two-sided mode"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for two-sided mode"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for shifts and indents"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for shifts and indents"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "Other \\\\paper variables"
+msgstr ""
+
 #. @subsection in Documentation/notation/spacing.itely
+msgid "Other @code{\\\\paper} variables"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for line breaking"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for line breaking"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for page breaking"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for page breaking"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "\\\\paper variables for page numbering"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "@code{\\\\paper} variables for page numbering"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+msgid "Miscellaneous \\\\paper variables"
+msgstr ""
+
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "Miscellaneous @code{\\\\paper} variables"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+#. @section in Documentation/notation/spacing.itely
 msgid "Score layout"
 msgstr ""
 
+#. @node in Documentation/notation/spacing.itely
+msgid "The \\\\layout block"
+msgstr ""
+
+#. @subsection in Documentation/notation/spacing.itely
+msgid "The @code{\\\\layout} block"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+#. @subsection in Documentation/notation/spacing.itely
+msgid "Setting the staff size"
+msgstr ""
+
 #. @node in Documentation/notation/spacing.itely
 #. @section in Documentation/notation/spacing.itely
 msgid "Breaks"
@@ -4469,20 +4687,35 @@ msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
 #. @subsection in Documentation/notation/spacing.itely
-msgid "Vertical spacing inside a system"
+msgid "Flexible vertical spacing within systems"
 msgstr ""
 
+#. @node in Documentation/notation/spacing.itely
 #. @unnumberedsubsubsec in Documentation/notation/spacing.itely
-msgid "Spacing between staves"
+msgid "Within-system spacing properties"
 msgstr ""
 
+#. @subsubheading in Documentation/notation/spacing.itely
+msgid "Properties of the @code{VerticalAxisGroup} grob"
+msgstr ""
+
+#. @subsubheading in Documentation/notation/spacing.itely
+msgid "Properties of the @code{StaffGrouper} grob"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
 #. @unnumberedsubsubsec in Documentation/notation/spacing.itely
-msgid "Spacing of non-staff lines"
+msgid "Spacing of ungrouped staves"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
-#. @subsection in Documentation/notation/spacing.itely
-msgid "Vertical spacing between systems"
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "Spacing of grouped staves"
+msgstr ""
+
+#. @node in Documentation/notation/spacing.itely
+#. @unnumberedsubsubsec in Documentation/notation/spacing.itely
+msgid "Spacing of non-staff lines"
 msgstr ""
 
 #. @node in Documentation/notation/spacing.itely
@@ -4540,139 +4773,162 @@ msgstr ""
 msgid "Changing spacing"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:451 (variable)
+#. Documentation/notation/changing-defaults.itely:449 (variable)
 msgid "musicA"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:452 (variable)
+#. Documentation/notation/changing-defaults.itely:450 (variable)
 msgid "musicB"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:453 (variable)
+#. Documentation/notation/changing-defaults.itely:451 (variable)
 msgid "keepVoicesAlive"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:455 (comment)
+#. Documentation/notation/changing-defaults.itely:453 (comment)
 msgid "Keep Voice \\\"A\\\" alive for 5 bars"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:456 (comment)
+#. Documentation/notation/changing-defaults.itely:454 (comment)
 msgid "Keep Voice \\\"B\\\" alive for 5 bars"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:491 (variable)
-#. Documentation/notation/changing-defaults.itely:502 (context id)
+#. Documentation/notation/changing-defaults.itely:489 (variable)
+#. Documentation/notation/changing-defaults.itely:500 (context id)
+#. Documentation/notation/changing-defaults.itely:506 (context id)
 #. Documentation/notation/changing-defaults.itely:508 (context id)
-#. Documentation/notation/changing-defaults.itely:510 (context id)
-#. Documentation/notation/changing-defaults.itely:513 (context id)
-#. Documentation/notation/changing-defaults.itely:535 (variable)
-#. Documentation/notation/changing-defaults.itely:551 (context id)
+#. Documentation/notation/changing-defaults.itely:511 (context id)
+#. Documentation/notation/changing-defaults.itely:533 (variable)
+#. Documentation/notation/changing-defaults.itely:549 (context id)
 msgid "accompaniment"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:492 (variable)
-#. Documentation/notation/changing-defaults.itely:541 (variable)
+#. Documentation/notation/changing-defaults.itely:490 (variable)
+#. Documentation/notation/changing-defaults.itely:539 (variable)
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:74 (variable)
 msgid "words"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:499 (comment)
+#. Documentation/notation/changing-defaults.itely:497 (comment)
 msgid "Keep Voice \\\"melody\\\" alive for 4 bars"
 msgstr ""
 
+#. Documentation/notation/changing-defaults.itely:528 (comment)
 #. Documentation/notation/changing-defaults.itely:530 (comment)
-#. Documentation/notation/changing-defaults.itely:532 (comment)
 msgid "skip a bar"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2364 (comment)
+#. Documentation/notation/changing-defaults.itely:2017 (comment)
+msgid "default space between staves"
+msgstr ""
+
+#. Documentation/notation/changing-defaults.itely:2023 (comment)
+msgid "reduced space between staves"
+msgstr ""
+
+#. Documentation/notation/changing-defaults.itely:2025 (comment)
+msgid "this is the nested declaration"
+msgstr ""
+
+#. Documentation/notation/changing-defaults.itely:2480 (comment)
 msgid "increase the length of the tie"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2373 (comment)
+#. Documentation/notation/changing-defaults.itely:2489 (comment)
 msgid "increase the length of the rest bar"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2381 (comment)
+#. Documentation/notation/changing-defaults.itely:2497 (comment)
 msgid "increase the length of the hairpin"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2409 (comment)
+#. Documentation/notation/changing-defaults.itely:2525 (comment)
 msgid "default"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2412 (comment)
-#. Documentation/notation/changing-defaults.itely:2425 (comment)
+#. Documentation/notation/changing-defaults.itely:2528 (comment)
+#. Documentation/notation/changing-defaults.itely:2541 (comment)
 msgid "not effective alone"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2416 (comment)
-#. Documentation/notation/changing-defaults.itely:2429 (comment)
+#. Documentation/notation/changing-defaults.itely:2532 (comment)
+#. Documentation/notation/changing-defaults.itely:2545 (comment)
 msgid "effective only when both overrides are present"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2806 (comment)
+#. Documentation/notation/changing-defaults.itely:2922 (comment)
 msgid "Remove bar line at the end of the current line"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:2852 (comment)
+#. Documentation/notation/changing-defaults.itely:2968 (comment)
 msgid "Try to remove all key signatures"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3274 (comment)
+#. Documentation/notation/changing-defaults.itely:3392 (comment)
 msgid "move horizontally left"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3276 (comment)
+#. Documentation/notation/changing-defaults.itely:3394 (comment)
 msgid "move vertically up"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3277 (comment)
+#. Documentation/notation/changing-defaults.itely:3395 (comment)
 msgid "third finger"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3326 (comment)
-#. Documentation/notation/changing-defaults.itely:3358 (comment)
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:88 (comment)
-msgid "the RehearsalMark will be centered above the Clef"
+#. Documentation/notation/changing-defaults.itely:3443 (comment)
+#. Documentation/notation/changing-defaults.itely:3482 (comment)
+msgid "The rehearsal mark will be centered above the Clef"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3332 (comment)
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:95 (comment)
-msgid "the RehearsalMark will be centered above the TimeSignature"
+#. Documentation/notation/changing-defaults.itely:3449 (comment)
+msgid "The rehearsal mark will be centered above the Time Signature"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3352 (comment)
-msgid "the RehearsalMark will be centered above the Key Signature"
+#. Documentation/notation/changing-defaults.itely:3456 (comment)
+msgid "The rehearsal mark will be centered above the Breath Mark"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3372 (comment)
-msgid "The RehearsalMark will be centered above the KeySignature"
+#. Documentation/notation/changing-defaults.itely:3476 (comment)
+msgid "The rehearsal mark will be centered above the Key Signature"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3379 (comment)
-#. Documentation/notation/changing-defaults.itely:3395 (comment)
-#. Documentation/notation/changing-defaults.itely:3402 (comment)
+#. Documentation/notation/changing-defaults.itely:3489 (comment)
+msgid "The rehearsal mark will be centered above the Bar Line"
+msgstr ""
+
+#. Documentation/notation/changing-defaults.itely:3504 (comment)
+msgid "The RehearsalMark will be centered above the Key Signature"
+msgstr ""
+
+#. Documentation/notation/changing-defaults.itely:3511 (comment)
+#. Documentation/notation/changing-defaults.itely:3527 (comment)
+#. Documentation/notation/changing-defaults.itely:3534 (comment)
 msgid ""
-"The RehearsalMark will be aligned with the left edge of the KeySignature"
+"The RehearsalMark will be aligned with the left edge of the Key Signature"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3384 (comment)
+#. Documentation/notation/changing-defaults.itely:3516 (comment)
 msgid ""
-"The RehearsalMark will be aligned with the right edge of the KeySignature"
+"The RehearsalMark will be aligned with the right edge of the Key Signature"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3396 (comment)
+#. Documentation/notation/changing-defaults.itely:3528 (comment)
 msgid "and then shifted right by 3.5 staff-spaces"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3403 (comment)
+#. Documentation/notation/changing-defaults.itely:3535 (comment)
 msgid "and then shifted left by 2 staff-spaces"
 msgstr ""
 
-#. Documentation/notation/changing-defaults.itely:3451 (variable)
+#. Documentation/notation/changing-defaults.itely:3583 (variable)
 msgid "XinO"
 msgstr ""
 
+#. Documentation/notation/changing-defaults.itely:3825 (variable)
+msgid "custosNote"
+msgstr ""
+
 #. @node in Documentation/notation/changing-defaults.itely
 #. @chapter in Documentation/notation/changing-defaults.itely
 msgid "Changing defaults"
@@ -4795,6 +5051,11 @@ msgstr ""
 msgid "@code{\\\\set} vs. @code{\\\\override}"
 msgstr ""
 
+#. @node in Documentation/notation/changing-defaults.itely
+#. @subsection in Documentation/notation/changing-defaults.itely
+msgid "Modifying alists"
+msgstr ""
+
 #. @node in Documentation/notation/changing-defaults.itely
 #. @section in Documentation/notation/changing-defaults.itely
 msgid "Useful concepts and properties"
@@ -4899,16 +5160,25 @@ msgid "Aligning objects"
 msgstr ""
 
 #. @node in Documentation/notation/changing-defaults.itely
+msgid "Setting X-offset and Y-offset directly"
+msgstr ""
+
 #. @unnumberedsubsubsec in Documentation/notation/changing-defaults.itely
 msgid "Setting @code{X-offset} and @code{Y-offset} directly"
 msgstr ""
 
 #. @node in Documentation/notation/changing-defaults.itely
+msgid "Using the side-position-interface"
+msgstr ""
+
 #. @unnumberedsubsubsec in Documentation/notation/changing-defaults.itely
 msgid "Using the @code{side-position-interface}"
 msgstr ""
 
 #. @node in Documentation/notation/changing-defaults.itely
+msgid "Using the self-alignment-interface"
+msgstr ""
+
 #. @unnumberedsubsubsec in Documentation/notation/changing-defaults.itely
 msgid "Using the @code{self-alignment-interface}"
 msgstr ""
@@ -4922,6 +5192,9 @@ msgid "Using the @code{centered-on-parent} procedures"
 msgstr ""
 
 #. @node in Documentation/notation/changing-defaults.itely
+msgid "Using the break-alignable-interface"
+msgstr ""
+
 #. @unnumberedsubsubsec in Documentation/notation/changing-defaults.itely
 msgid "Using the @code{break-alignable-interface}"
 msgstr ""
@@ -4956,11 +5229,6 @@ msgstr ""
 msgid "Substitution function syntax"
 msgstr ""
 
-#. @node in Documentation/notation/changing-defaults.itely
-#. @subsection in Documentation/notation/changing-defaults.itely
-msgid "Common argument types"
-msgstr ""
-
 #. @node in Documentation/notation/changing-defaults.itely
 #. @subsection in Documentation/notation/changing-defaults.itely
 msgid "Substitution function examples"
@@ -5141,6 +5409,16 @@ msgstr ""
 msgid "Note head styles"
 msgstr ""
 
+#. @node in Documentation/notation/notation-appendices.itely
+#. @appendixsec in Documentation/notation/notation-appendices.itely
+msgid "Text markup commands"
+msgstr ""
+
+#. @node in Documentation/notation/notation-appendices.itely
+#. @appendixsec in Documentation/notation/notation-appendices.itely
+msgid "Text markup list commands"
+msgstr ""
+
 #. @node in Documentation/notation/notation-appendices.itely
 #. @appendixsec in Documentation/notation/notation-appendices.itely
 msgid "List of articulations"
@@ -5276,6 +5554,11 @@ msgstr ""
 msgid "Available music functions"
 msgstr ""
 
+#. @node in Documentation/notation/notation-appendices.itely
+#. @appendixsec in Documentation/notation/notation-appendices.itely
+msgid "Predefined type predicates"
+msgstr ""
+
 #. @node in Documentation/notation/notation-appendices.itely
 #. @appendixsec in Documentation/notation/notation-appendices.itely
 msgid "Scheme functions"
@@ -5318,6 +5601,10 @@ msgstr ""
 msgid "Invoking @command{lilypond}"
 msgstr ""
 
+#. @unnumberedsubsubsec in Documentation/usage/running.itely
+msgid "Standard shell commands"
+msgstr ""
+
 #. @node in Documentation/usage/running.itely
 msgid "Command line options for lilypond"
 msgstr ""
@@ -5331,6 +5618,15 @@ msgstr ""
 msgid "Environment variables"
 msgstr ""
 
+#. @node in Documentation/usage/running.itely
+#. @unnumberedsubsec in Documentation/usage/running.itely
+msgid "LilyPond in chroot jail"
+msgstr ""
+
+#. @subheading in Documentation/usage/running.itely
+msgid "Example script for 32-bit Ubuntu 8.04"
+msgstr ""
+
 #. @node in Documentation/usage/running.itely
 #. @section in Documentation/usage/running.itely
 msgid "Error messages"
@@ -5369,6 +5665,11 @@ msgstr ""
 msgid "Error message FT_Get_Glyph_Name"
 msgstr ""
 
+#. @node in Documentation/usage/running.itely
+#. @unnumberedsubsec in Documentation/usage/running.itely
+msgid "Warning staff affinities should only decrease"
+msgstr ""
+
 #. @node in Documentation/usage/updating.itely
 msgid "Updating files with convert-ly"
 msgstr ""
@@ -5523,6 +5824,19 @@ msgstr ""
 msgid "xelatex"
 msgstr ""
 
+#. @node in Documentation/usage/lilypond-book.itely
+#. @section in Documentation/usage/lilypond-book.itely
+msgid "Sharing the table of contents"
+msgstr ""
+
+#. @subsubheading in Documentation/usage/lilypond-book.itely
+msgid "Exporting the ToC from LilyPond"
+msgstr ""
+
+#. @subsubheading in Documentation/usage/lilypond-book.itely
+msgid "Importing the ToC into LaTeX"
+msgstr ""
+
 #. @node in Documentation/usage/lilypond-book.itely
 msgid "Alternate methods of mixing text and music"
 msgstr ""
@@ -5666,118 +5980,119 @@ msgstr ""
 msgid "Make and Makefiles"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:37 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:38 (variable)
 msgid "discant"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:40 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:41 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:66 (variable)
 msgid "dot"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:46 (comment)
+#. Documentation/snippets/accordion-discant-symbols.ly:47 (comment)
 msgid "16 voets register"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:47 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:48 (variable)
 msgid "accBasson"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:53 (comment)
+#. Documentation/snippets/accordion-discant-symbols.ly:54 (comment)
 msgid "een korig 8 en 16 voets register"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:54 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:55 (variable)
 msgid "accBandon"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:62 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:63 (variable)
 msgid "accVCello"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:72 (comment)
+#. Documentation/snippets/accordion-discant-symbols.ly:73 (comment)
 msgid "4-8-16 voets register"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:73 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:74 (variable)
 msgid "accHarmon"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:83 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:84 (variable)
 msgid "accTrombon"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:95 (comment)
+#. Documentation/snippets/accordion-discant-symbols.ly:96 (comment)
 msgid "eenkorig 4 en 16 voets register"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:96 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:97 (variable)
 msgid "accOrgan"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:104 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:105 (variable)
 msgid "accMaster"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:118 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:119 (variable)
 msgid "accAccord"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:130 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:131 (variable)
 msgid "accMusette"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:140 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:141 (variable)
 msgid "accCeleste"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:148 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:149 (variable)
 msgid "accOboe"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:156 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:157 (variable)
 msgid "accClarin"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:162 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:163 (variable)
 msgid "accPiccolo"
 msgstr ""
 
-#. Documentation/snippets/accordion-discant-symbols.ly:168 (variable)
+#. Documentation/snippets/accordion-discant-symbols.ly:169 (variable)
 msgid "accViolin"
 msgstr ""
 
-#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:49 (variable)
+#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:50 (variable)
 msgid "continuo"
 msgstr ""
 
-#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:61 (context id)
 #. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:62 (context id)
+#. Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly:63 (context id)
 msgid "bassStaff"
 msgstr ""
 
-#. Documentation/snippets/adding-drum-parts.ly:49 (variable)
+#. Documentation/snippets/adding-drum-parts.ly:50 (variable)
 msgid "drh"
 msgstr ""
 
-#. Documentation/snippets/adding-drum-parts.ly:50 (variable)
+#. Documentation/snippets/adding-drum-parts.ly:51 (variable)
 msgid "drl"
 msgstr ""
 
-#. Documentation/snippets/adding-drum-parts.ly:51 (variable)
+#. Documentation/snippets/adding-drum-parts.ly:52 (variable)
 msgid "timb"
 msgstr ""
 
-#. Documentation/snippets/adding-fingerings-to-tablatures.ly:26 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:218 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:227 (context id)
+#. Documentation/snippets/adding-fingerings-to-tablatures.ly:35 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:220 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:229 (context id)
 msgid "two"
 msgstr ""
 
-#. Documentation/snippets/adding-fingerings-to-tablatures.ly:27 (variable)
+#. Documentation/snippets/adding-fingerings-to-tablatures.ly:36 (variable)
 msgid "threeTwo"
 msgstr ""
 
-#. Documentation/snippets/adding-fingerings-to-tablatures.ly:34 (variable)
+#. Documentation/snippets/adding-fingerings-to-tablatures.ly:43 (variable)
 msgid "threeFour"
 msgstr ""
 
@@ -5789,145 +6104,177 @@ msgstr ""
 msgid "splitStaffBarLine"
 msgstr ""
 
-#. Documentation/snippets/adding-the-current-date-to-a-score.ly:32 (comment)
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:48 (variable)
+msgid "cueWhile"
+msgstr ""
+
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:61 (variable)
+msgid "flute"
+msgstr ""
+
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:67 (variable)
+msgid "clarinet"
+msgstr ""
+
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:76 (variable)
+msgid "pianoRH"
+msgstr ""
+
+#. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:81 (variable)
+msgid "pianoLH"
+msgstr ""
+
+#. Documentation/snippets/adding-the-current-date-to-a-score.ly:33 (comment)
 msgid "first, define a variable to hold the formatted date:"
 msgstr ""
 
-#. Documentation/snippets/adding-the-current-date-to-a-score.ly:33 (variable)
+#. Documentation/snippets/adding-the-current-date-to-a-score.ly:34 (variable)
 msgid "date"
 msgstr ""
 
-#. Documentation/snippets/adding-the-current-date-to-a-score.ly:33 (comment)
+#. Documentation/snippets/adding-the-current-date-to-a-score.ly:34 (comment)
 msgid "d-%m-%Y\\\" (localtime (current-time)))"
 msgstr ""
 
-#. Documentation/snippets/adding-the-current-date-to-a-score.ly:35 (comment)
+#. Documentation/snippets/adding-the-current-date-to-a-score.ly:36 (comment)
 msgid "use it in the title block:"
 msgstr ""
 
-#. Documentation/snippets/adding-the-current-date-to-a-score.ly:46 (comment)
+#. Documentation/snippets/adding-the-current-date-to-a-score.ly:47 (comment)
 msgid "and use it in a \\markup block:"
 msgstr ""
 
-#. Documentation/snippets/additional-voices-to-avoid-collisions.ly:50 (variable)
+#. Documentation/snippets/additional-voices-to-avoid-collisions.ly:52 (variable)
 msgid "voiceFive"
 msgstr ""
 
-#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:33 (comment)
+#. Documentation/snippets/adjusting-grace-note-spacing.ly:26 (variable)
+msgid "graceNotes"
+msgstr ""
+
+#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:35 (comment)
 msgid "Default layout:"
 msgstr ""
 
-#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:42 (comment)
+#. Documentation/snippets/adjusting-lyrics-vertical-spacing.ly:44 (comment)
 msgid "Reducing the minimum space below the staff and above the lyrics:"
 msgstr ""
 
-#. Documentation/snippets/aligning-bar-numbers.ly:59 (comment)
-#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:45 (comment)
+#. Documentation/snippets/aligning-bar-numbers.ly:61 (comment)
+#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:47 (comment)
 msgid "Increase the size of the bar number by 2"
 msgstr ""
 
-#. Documentation/snippets/aligning-bar-numbers.ly:61 (comment)
-#. Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly:57 (comment)
+#. Documentation/snippets/aligning-bar-numbers.ly:63 (comment)
+#. Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly:59 (comment)
 msgid "Print a bar number every second measure"
 msgstr ""
 
-#. Documentation/snippets/aligning-bar-numbers.ly:64 (comment)
+#. Documentation/snippets/aligning-bar-numbers.ly:66 (comment)
 msgid "Center-align bar numbers"
 msgstr ""
 
-#. Documentation/snippets/aligning-bar-numbers.ly:67 (comment)
+#. Documentation/snippets/aligning-bar-numbers.ly:69 (comment)
 msgid "Left-align bar numbers"
 msgstr ""
 
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:103 (comment)
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:90 (comment)
+msgid "the RehearsalMark will be centered above the Clef"
+msgstr ""
+
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:97 (comment)
+msgid "the RehearsalMark will be centered above the TimeSignature"
+msgstr ""
+
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:105 (comment)
 msgid "the RehearsalMark will be centered above the KeySignature"
 msgstr ""
 
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:114 (comment)
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:126 (comment)
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:116 (comment)
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:128 (comment)
 msgid ""
 "the RehearsalMark will be aligned with the left edge of the KeySignature"
 msgstr ""
 
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:120 (comment)
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:122 (comment)
 msgid ""
 "the RehearsalMark will be aligned with the right edge of the KeySignature"
 msgstr ""
 
-#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:127 (comment)
+#. Documentation/snippets/aligning-marks-with-various-notation-objects.ly:129 (comment)
 msgid "and then shifted right by one unit."
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:36 (variable)
-#. Documentation/snippets/ancient-fonts.ly:36 (context id)
+#. Documentation/snippets/ancient-fonts.ly:37 (variable)
+#. Documentation/snippets/ancient-fonts.ly:37 (context id)
 msgid "upperStaff"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:48 (comment)
+#. Documentation/snippets/ancient-fonts.ly:49 (comment)
 msgid "\\break % 1 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:59 (comment)
+#. Documentation/snippets/ancient-fonts.ly:60 (comment)
 msgid "\\break %2 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:71 (comment)
+#. Documentation/snippets/ancient-fonts.ly:72 (comment)
 msgid "\\break % 3 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:86 (comment)
+#. Documentation/snippets/ancient-fonts.ly:87 (comment)
 msgid "\\break % 4 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:95 (comment)
-#. Documentation/snippets/ancient-fonts.ly:157 (comment)
+#. Documentation/snippets/ancient-fonts.ly:96 (comment)
+#. Documentation/snippets/ancient-fonts.ly:158 (comment)
 msgid "\\break % 5 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:109 (comment)
-#. Documentation/snippets/ancient-fonts.ly:172 (comment)
+#. Documentation/snippets/ancient-fonts.ly:110 (comment)
+#. Documentation/snippets/ancient-fonts.ly:173 (comment)
 msgid "\\break % 6 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:118 (comment)
-#. Documentation/snippets/ancient-fonts.ly:182 (comment)
+#. Documentation/snippets/ancient-fonts.ly:119 (comment)
+#. Documentation/snippets/ancient-fonts.ly:183 (comment)
 msgid "\\break % 7 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:125 (comment)
+#. Documentation/snippets/ancient-fonts.ly:126 (comment)
 msgid "\\break % 8 (8*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:128 (comment)
+#. Documentation/snippets/ancient-fonts.ly:129 (comment)
 msgid "\\break % 12 (32*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:133 (variable)
-#. Documentation/snippets/ancient-fonts.ly:133 (context id)
+#. Documentation/snippets/ancient-fonts.ly:134 (variable)
+#. Documentation/snippets/ancient-fonts.ly:134 (context id)
 msgid "lowerStaff"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:143 (comment)
+#. Documentation/snippets/ancient-fonts.ly:144 (comment)
 msgid "\\break % 2 (16*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:148 (comment)
+#. Documentation/snippets/ancient-fonts.ly:149 (comment)
 msgid "\\break % 4 (16*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:187 (comment)
+#. Documentation/snippets/ancient-fonts.ly:188 (comment)
 msgid "\\break % 9 (16*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:189 (comment)
+#. Documentation/snippets/ancient-fonts.ly:190 (comment)
 msgid "lig"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:193 (comment)
+#. Documentation/snippets/ancient-fonts.ly:194 (comment)
 msgid "\\break % 11 (16*1)"
 msgstr ""
 
-#. Documentation/snippets/ancient-fonts.ly:204 (comment)
+#. Documentation/snippets/ancient-fonts.ly:205 (comment)
 msgid "\\break % 12 (8*1)"
 msgstr ""
 
@@ -6003,84 +6350,84 @@ msgstr ""
 msgid "Vi- ta, dul- cé- do, et spes no- stra, sal- ve."
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:51 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:53 (variable)
 msgid "chant"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:58 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly:60 (variable)
 msgid "verba"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:67 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:114 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:133 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:150 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:169 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:184 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:205 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:218 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:237 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:69 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:116 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:135 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:152 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:171 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:186 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:207 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:220 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:239 (comment)
 #. Documentation/snippets/incipit.ly:25 (variable)
 #. Documentation/snippets/incipit.ly:201 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:215 (comment)
 msgid "incipit"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:69 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:71 (comment)
 msgid "tight spacing"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:76 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:78 (comment)
 msgid "turn off bar lines"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:80 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:82 (comment)
 msgid "need this extra \\skip such that clef change comes"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:81 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:83 (comment)
 msgid "after bar line"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:85 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:87 (comment)
 msgid "CHECK: no effect?"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:86 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:88 (comment)
 msgid "turn bar lines on again"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:94 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:96 (comment)
 msgid "FIXME: setting printKeyCancellation back to #t must not"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:95 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:97 (comment)
 msgid "occur in the first bar after the incipit.  Dto. for forceClef."
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:96 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:98 (comment)
 msgid "Therefore, we need an extra \\skip."
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:101 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:103 (comment)
 #. Documentation/snippets/incipit.ly:75 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:38 (comment)
 msgid "the actual music"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:103 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:105 (comment)
 #. Documentation/snippets/incipit.ly:78 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:39 (comment)
 msgid "let finis bar go through all staves"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:106 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:108 (comment)
 #. Documentation/snippets/incipit.ly:81 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:41 (comment)
 msgid "finis bar"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:110 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:112 (variable)
 #. Documentation/snippets/incipit.ly:98 (variable)
 #. Documentation/snippets/incipit.ly:232 (context id)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:45 (variable)
@@ -6088,15 +6435,15 @@ msgstr ""
 msgid "discantusNotes"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:116 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:153 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:159 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:173 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:187 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:155 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:161 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:175 (comment)
 #. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:189 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:198 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:209 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:221 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:191 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:200 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:211 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:223 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:71 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:81 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:94 (comment)
@@ -6109,33 +6456,33 @@ msgstr ""
 msgid "two bars"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:117 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:220 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:119 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:222 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:137 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:216 (comment)
 msgid "eight bars"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:118 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:152 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:155 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:188 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:120 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:154 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:157 (comment)
 #. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:190 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:191 (comment)
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:222 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:192 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:193 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:224 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:161 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:189 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:191 (comment)
 msgid "one bar"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:132 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:134 (variable)
 #. Documentation/snippets/incipit.ly:112 (variable)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:58 (variable)
 msgid "discantusLyrics"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:146 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:148 (variable)
 #. Documentation/snippets/incipit.ly:135 (variable)
 #. Documentation/snippets/incipit.ly:239 (context id)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:68 (variable)
@@ -6143,18 +6490,18 @@ msgstr ""
 msgid "altusNotes"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:154 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:156 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:163 (comment)
 msgid "seven bars"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:168 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:170 (variable)
 #. Documentation/snippets/incipit.ly:149 (variable)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:80 (variable)
 msgid "altusLyrics"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:180 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:182 (variable)
 #. Documentation/snippets/incipit.ly:173 (variable)
 #. Documentation/snippets/incipit.ly:246 (context id)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:88 (variable)
@@ -6162,19 +6509,19 @@ msgstr ""
 msgid "tenorNotes"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:186 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:188 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:187 (comment)
 msgid "four bars"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:204 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:206 (variable)
 #. Documentation/snippets/incipit.ly:187 (variable)
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:70 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:81 (variable)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:100 (variable)
 msgid "tenorLyrics"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:214 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:216 (variable)
 #. Documentation/snippets/incipit.ly:209 (variable)
 #. Documentation/snippets/incipit.ly:253 (context id)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:106 (variable)
@@ -6182,83 +6529,108 @@ msgstr ""
 msgid "bassusNotes"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:236 (variable)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:238 (variable)
 #. Documentation/snippets/incipit.ly:223 (variable)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:119 (variable)
 msgid "bassusLyrics"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:247 (context id)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:249 (context id)
 #. Documentation/snippets/incipit.ly:231 (context id)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:233 (context id)
 msgid "choirStaff"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:269 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:271 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:269 (comment)
 msgid "no bars in staves"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:272 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:274 (comment)
 msgid "incipit should not start with a start delimiter"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:278 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:280 (comment)
 #. Documentation/snippets/incipit.ly:276 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:284 (comment)
 msgid "no slurs"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:281 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:283 (comment)
 #. Documentation/snippets/incipit.ly:278 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:286 (comment)
 msgid "Comment in the below \\\"\\remove\\\" command to allow line"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:282 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:284 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:287 (comment)
 msgid "breaking also at those barlines where a note overlaps"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:283 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:285 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:288 (comment)
 msgid "into the next bar.  The command is commented out in this"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:284 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:286 (comment)
 #. Documentation/snippets/incipit.ly:281 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:289 (comment)
 msgid "short example score, but especially for large scores, you"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:285 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:287 (comment)
 #. Documentation/snippets/incipit.ly:282 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:290 (comment)
 msgid "will typically yield better line breaking and thus improve"
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:286 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:288 (comment)
 #. Documentation/snippets/incipit.ly:283 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:291 (comment)
 msgid "overall spacing if you comment in the following command."
 msgstr ""
 
-#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:287 (comment)
+#. Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly:289 (comment)
 #. Documentation/snippets/incipit.ly:284 (comment)
 #. Documentation/snippets/transcription-of-ancient-music-with-incipit.ly:292 (comment)
 msgid "\\remove \\\"Forbid_line_break_engraver\\\""
 msgstr ""
 
-#. Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly:96 (variable)
+#. Documentation/snippets/anglican-psalm-template.ly:70 (variable)
+msgid "tick"
+msgstr ""
+
+#. Documentation/snippets/anglican-psalm-template.ly:74 (comment)
+msgid "Use markup to center the chant on the page"
+msgstr ""
+
+#. Documentation/snippets/anglican-psalm-template.ly:77 (comment)
+msgid "centered"
+msgstr ""
+
+#. Documentation/snippets/anglican-psalm-template.ly:117 (comment)
+#. Documentation/snippets/hymn-template.ly:115 (comment)
+msgid "End score"
+msgstr ""
+
+#. Documentation/snippets/anglican-psalm-template.ly:119 (comment)
+msgid "End markup"
+msgstr ""
+
+#. Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly:98 (variable)
 #. Documentation/snippets/clusters.ly:25 (variable)
 msgid "fragment"
 msgstr ""
 
-#. Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly:25 (comment)
+#. Documentation/snippets/asymmetric-slurs.ly:27 (variable)
+msgid "slurNotes"
+msgstr ""
+
+#. Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly:40 (comment)
 msgid "Default behavior"
 msgstr ""
 
-#. Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly:31 (comment)
+#. Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly:46 (comment)
 msgid "Corrected to avoid collisions"
 msgstr ""
 
@@ -6321,15 +6693,15 @@ msgstr ""
 msgid "Set default beaming for all staves"
 msgstr ""
 
-#. Documentation/snippets/beam-endings-in-score-context.ly:61 (comment)
+#. Documentation/snippets/beam-endings-in-score-context.ly:59 (comment)
 msgid "Modify beaming for just this staff"
 msgstr ""
 
-#. Documentation/snippets/beam-endings-in-score-context.ly:67 (comment)
+#. Documentation/snippets/beam-endings-in-score-context.ly:64 (comment)
 msgid "Inherit beaming from Score context"
 msgstr ""
 
-#. Documentation/snippets/beam-endings-in-score-context.ly:73 (comment)
+#. Documentation/snippets/beam-endings-in-score-context.ly:70 (comment)
 msgid "Modify beaming for this voice only"
 msgstr ""
 
@@ -6415,13 +6787,13 @@ msgstr ""
 msgid "hairpinMore"
 msgstr ""
 
-#. Documentation/snippets/centering-markup-on-note-heads-automatically.ly:23 (variable)
-msgid "textScriptCenterOnNote"
+#. Documentation/snippets/changing--flageolet-mark-size.ly:44 (variable)
+#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:24 (variable)
+msgid "smallFlageolet"
 msgstr ""
 
-#. Documentation/snippets/changing--flageolet-mark-size.ly:42 (variable)
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:29 (variable)
-msgid "smallFlageolet"
+#. Documentation/snippets/changing-the-ambitus-gap.ly:42 (comment)
+msgid "Default setting"
 msgstr ""
 
 #. Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly:36 (comment)
@@ -6441,52 +6813,56 @@ msgid "change for other default global staff size."
 msgstr ""
 
 #. Documentation/snippets/changing-the-default-text-font-family.ly:20 (comment)
-#. Documentation/snippets/engravers-one-by-one.ly:183 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:182 (comment)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:111 (comment)
 #. Documentation/snippets/utf-8.ly:24 (comment)
 msgid "{"
 msgstr ""
 
 #. Documentation/snippets/changing-the-default-text-font-family.ly:24 (comment)
-#. Documentation/snippets/engravers-one-by-one.ly:185 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:184 (comment)
 #. Documentation/snippets/expressive-headword.ly:32 (comment)
 #. Documentation/snippets/expressive-headword.ly:33 (comment)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:112 (comment)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:242 (comment)
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:203 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:206 (comment)
 #. Documentation/snippets/utf-8.ly:38 (comment)
 msgid "}"
 msgstr ""
 
-#. Documentation/snippets/chant-or-psalms-notation.ly:25 (variable)
+#. Documentation/snippets/changing-the-text-for-sustain-markings.ly:32 (variable)
+msgid "sustainNotes"
+msgstr ""
+
+#. Documentation/snippets/chant-or-psalms-notation.ly:35 (variable)
 msgid "stemOn"
 msgstr ""
 
-#. Documentation/snippets/chant-or-psalms-notation.ly:26 (variable)
+#. Documentation/snippets/chant-or-psalms-notation.ly:36 (variable)
 msgid "stemOff"
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:34 (comment)
+#. Documentation/snippets/chord-name-exceptions.ly:35 (comment)
 msgid "modify maj9 and 6(add9)"
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:35 (comment)
+#. Documentation/snippets/chord-name-exceptions.ly:36 (comment)
 msgid "Exception music is chords with markups"
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:36 (variable)
+#. Documentation/snippets/chord-name-exceptions.ly:37 (variable)
 msgid "chExceptionMusic"
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:41 (comment)
+#. Documentation/snippets/chord-name-exceptions.ly:42 (comment)
 msgid "Convert music to list and prepend to existing exceptions."
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:42 (variable)
+#. Documentation/snippets/chord-name-exceptions.ly:43 (variable)
 msgid "chExceptions"
 msgstr ""
 
-#. Documentation/snippets/chord-name-exceptions.ly:46 (variable)
+#. Documentation/snippets/chord-name-exceptions.ly:47 (variable)
 msgid "theMusic"
 msgstr ""
 
@@ -6516,23 +6892,23 @@ msgstr ""
 msgid "sop"
 msgstr ""
 
-#. Documentation/snippets/clip-systems.ly:38 (variable)
+#. Documentation/snippets/clip-systems.ly:65 (variable)
 msgid "origScore"
 msgstr ""
 
-#. Documentation/snippets/clip-systems.ly:56 (comment)
+#. Documentation/snippets/clip-systems.ly:83 (comment)
 msgid "Each clip-region is a (START . END) pair"
 msgstr ""
 
-#. Documentation/snippets/clip-systems.ly:57 (comment)
+#. Documentation/snippets/clip-systems.ly:84 (comment)
 msgid "where both are rhythmic-locations."
 msgstr ""
 
-#. Documentation/snippets/clip-systems.ly:59 (comment)
+#. Documentation/snippets/clip-systems.ly:86 (comment)
 msgid "(make-rhythmic-locations BAR-NUMBER NUM DEN)"
 msgstr ""
 
-#. Documentation/snippets/clip-systems.ly:60 (comment)
+#. Documentation/snippets/clip-systems.ly:87 (comment)
 msgid "means NUM/DEN whole-notes into bar numbered BAR-NUMBER"
 msgstr ""
 
@@ -6548,23 +6924,23 @@ msgstr ""
 msgid "piuF"
 msgstr ""
 
-#. Documentation/snippets/combining-two-parts-on-the-same-staff.ly:92 (variable)
+#. Documentation/snippets/combining-two-parts-on-the-same-staff.ly:94 (variable)
 msgid "musicUp"
 msgstr ""
 
-#. Documentation/snippets/combining-two-parts-on-the-same-staff.ly:99 (variable)
+#. Documentation/snippets/combining-two-parts-on-the-same-staff.ly:101 (variable)
 msgid "musicDown"
 msgstr ""
 
-#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:30 (comment)
+#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:52 (comment)
 msgid "show hairpin"
 msgstr ""
 
-#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:32 (comment)
+#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:54 (comment)
 msgid "hide text span"
 msgstr ""
 
-#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:36 (comment)
+#. Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly:58 (comment)
 msgid "show glissando"
 msgstr ""
 
@@ -6580,42 +6956,42 @@ msgstr ""
 msgid "\\cadenzaOn turns off automatic calculation of bar numbers"
 msgstr ""
 
-#. Documentation/snippets/cross-staff-tremolos.ly:31 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:254 (variable)
+#. Documentation/snippets/cross-staff-tremolos.ly:44 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:256 (variable)
 #. Documentation/snippets/screech-boink.ly:15 (context id)
 msgid "up"
 msgstr ""
 
-#. Documentation/snippets/cross-staff-tremolos.ly:36 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:260 (variable)
+#. Documentation/snippets/cross-staff-tremolos.ly:49 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:262 (variable)
 #. Documentation/snippets/screech-boink.ly:45 (context id)
 msgid "down"
 msgstr ""
 
-#. Documentation/snippets/customizing-fretboard-fret-diagrams.ly:54 (comment)
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:56 (comment)
+#. Documentation/snippets/customizing-fretboard-fret-diagrams.ly:55 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:58 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:27 (comment)
 msgid "Set global properties of fret diagram"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:54 (context id)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:56 (context id)
 #. Documentation/snippets/formatting-lyrics-syllables.ly:22 (variable)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:25 (context id)
-#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:75 (context id)
+#. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:78 (context id)
 msgid "mel"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:63 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:65 (comment)
 msgid "C major for guitar, no barre, using defaults"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:64 (comment)
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:114 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:66 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:116 (comment)
 msgid "terse style"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:67 (comment)
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:89 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:69 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:91 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:56 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:77 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:156 (comment)
@@ -6625,8 +7001,8 @@ msgstr ""
 msgid "C major for guitar, barred on third fret"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:68 (comment)
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:90 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:70 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:92 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:57 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:79 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:106 (comment)
@@ -6639,93 +7015,222 @@ msgstr ""
 msgid "verbose style"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:69 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:71 (comment)
 msgid "size 1.0"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:70 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:72 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:58 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:158 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:257 (comment)
 msgid "roman fret label, finger labels below string, straight barre"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:72 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:74 (comment)
 msgid "standard size"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:91 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:93 (comment)
 msgid "landscape orientation, arabic numbers, M for mute string"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:92 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:94 (comment)
 msgid "no barre, fret label down or left, small mute label font"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:113 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:115 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:128 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:228 (comment)
 #. Documentation/snippets/fret-diagrams-explained-and-developed.ly:327 (comment)
 msgid "simple D chord"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:115 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:117 (comment)
 msgid "larger dots, centered dots, fewer frets"
 msgstr ""
 
-#. Documentation/snippets/customizing-markup-fret-diagrams.ly:116 (comment)
+#. Documentation/snippets/customizing-markup-fret-diagrams.ly:118 (comment)
 msgid "label below string"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:82 (comment)
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:39 (comment)
+msgid "Grob utilities"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:41 (comment)
+msgid ""
+"These are literal rewrites of some C++ methods used by the ambitus engraver."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:76 (comment)
+msgid "Ambitus data structure"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:79 (comment)
+msgid "The <ambitus> class holds the various grobs that are created"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:80 (comment)
+msgid "to print an ambitus:"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:81 (comment)
+msgid "- ambitus-group: the grob that groups all the components of an ambitus"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:82 (comment)
+msgid "(Ambitus grob);"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:83 (comment)
+msgid "- ambitus-line: the vertical line between the upper and lower ambitus"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:84 (comment)
+msgid "notes (AmbitusLine grob);"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:85 (comment)
+msgid "- ambitus-up-note and ambitus-down-note: the note head and accidental"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:86 (comment)
+msgid "for the lower and upper note of the ambitus (see <ambitus-note> class"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:87 (comment)
+msgid "below)."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:88 (comment)
+msgid "The other slots define the key and clef context of the engraver:"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:89 (comment)
+msgid "- start-c0: position of middle c at the beginning of the piece.  It"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:90 (comment)
+msgid "is used to place the ambitus notes according to their pitch;"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:91 (comment)
+msgid "- start-key-sig: the key signature at the beginning of the piece.  It"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:92 (comment)
+msgid "is used to determine if accidentals shall be printed next to ambitus"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:93 (comment)
+msgid "notes."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:107 (comment)
+msgid "Accessor for the lower and upper note data of an ambitus"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:115 (comment)
+msgid "The <ambitus-note> class holds the grobs that are specific to ambitus"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:116 (comment)
+msgid "(lower and upper) notes:"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:117 (comment)
+msgid "- head: an AmbitusNoteHead grob;"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:118 (comment)
+msgid "- accidental: an AmbitusAccidental grob, to be possibly printed next"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:119 (comment)
+msgid "to the ambitus note head."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:120 (comment)
+msgid "Moreover:"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:121 (comment)
+msgid "- pitch is the absolute pitch of the note"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:122 (comment)
+msgid "- cause is the note event that causes this ambitus note, i.e. the lower"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:123 (comment)
+msgid "or upper note of the considered music sequence."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:136 (comment)
+msgid "Ambitus engraving logics"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:138 (comment)
+msgid "Rewrite of the code from @file{lily/ambitus-engraver.cc}."
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:307 (comment)
+msgid "Ambitus engraver definition"
+msgstr ""
+
+#. Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly:332 (comment)
+msgid "Example"
+msgstr ""
+
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:84 (comment)
 msgid "add FretBoards for the Cuatro"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:83 (comment)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:85 (comment)
 msgid "Note: This section could be put into a separate file"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:84 (comment)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:86 (comment)
 msgid "predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:85 (comment)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:87 (comment)
 msgid "and \\included into each of your compositions"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:87 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:89 (variable)
 msgid "cuatroTuning"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:89 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:91 (variable)
 msgid "dSix"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:90 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:92 (variable)
 msgid "dMajor"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:91 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:93 (variable)
 msgid "aMajSeven"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:92 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:94 (variable)
 msgid "dMajSeven"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:93 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:95 (variable)
 msgid "gMajor"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:111 (comment)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:113 (comment)
 msgid "end of potential include file /predefined-cuatro-fretboards.ly"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:116 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:118 (variable)
 msgid "primerosNames"
 msgstr ""
 
-#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:120 (variable)
+#. Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly:122 (variable)
 msgid "primeros"
 msgstr ""
 
@@ -6733,19 +7238,19 @@ msgstr ""
 msgid "baseMelody"
 msgstr ""
 
-#. Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly:71 (comment)
+#. Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly:73 (comment)
 msgid "Must be lower than the actual number of staff lines"
 msgstr ""
 
-#. Documentation/snippets/displaying-complex-chords.ly:17 (variable)
+#. Documentation/snippets/displaying-complex-chords.ly:26 (variable)
 msgid "fixA"
 msgstr ""
 
-#. Documentation/snippets/displaying-complex-chords.ly:20 (variable)
+#. Documentation/snippets/displaying-complex-chords.ly:29 (variable)
 msgid "fixB"
 msgstr ""
 
-#. Documentation/snippets/displaying-grob-ancestry.ly:127 (comment)
+#. Documentation/snippets/displaying-grob-ancestry.ly:197 (comment)
 msgid "\\\" (make-string 36 #\\-))"
 msgstr ""
 
@@ -6765,47 +7270,50 @@ msgstr ""
 msgid "glissando is attached to a & c"
 msgstr ""
 
-#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:17 (comment)
+#. Documentation/snippets/drawing-circles-around-note-heads.ly:16 (variable)
+msgid "circle"
+msgstr ""
+
+#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:54 (comment)
 msgid ""
 "Two functions for (de)crescendo spanners where you can explicitly give the"
 msgstr ""
 
-#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:18 (comment)
+#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:55 (comment)
 msgid "spanner text."
 msgstr ""
 
-#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:19 (variable)
+#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:56 (variable)
 msgid "mycresc"
 msgstr ""
 
-#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:25 (variable)
+#. Documentation/snippets/dynamics-custom-text-spanner-postfix.ly:62 (variable)
 msgid "mydecresc"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:18 (comment)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:61 (comment)
 msgid "Some sample text dynamic spanners, to be used as postfix operators"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:19 (variable)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:62 (variable)
 msgid "crpoco"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:24 (comment)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:67 (comment)
 msgid ""
 "Redefine the existing \\cresc, \\dim and \\decresc commands to use postfix "
 "syntax"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:25 (variable)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:68 (variable)
 msgid "cresc"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:30 (variable)
-#. Documentation/snippets/fretted-headword.ly:56 (variable)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:73 (variable)
 msgid "dim"
 msgstr ""
 
-#. Documentation/snippets/dynamics-text-spanner-postfix.ly:35 (variable)
+#. Documentation/snippets/dynamics-text-spanner-postfix.ly:78 (variable)
 msgid "decresc"
 msgstr ""
 
@@ -6868,37 +7376,37 @@ msgid "setup for Request->Element conversion. Guru-only"
 msgstr ""
 
 #. Documentation/snippets/engravers-one-by-one.ly:111 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:210 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:223 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:279 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:293 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:209 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:222 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:278 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:292 (variable)
 msgid "MyStaff"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:140 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:139 (comment)
 msgid "explicitly set instrumentName, so we don't get"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:141 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:140 (comment)
 msgid "weird effects when doing instrument names for"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:142 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:141 (comment)
 msgid "piano staves"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:151 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:237 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:250 (variable)
-#. Documentation/snippets/engravers-one-by-one.ly:263 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:150 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:236 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:249 (variable)
+#. Documentation/snippets/engravers-one-by-one.ly:262 (variable)
 msgid "MyVoice"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:166 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:165 (comment)
 msgid "must come before all"
 msgstr ""
 
-#. Documentation/snippets/engravers-one-by-one.ly:176 (comment)
+#. Documentation/snippets/engravers-one-by-one.ly:175 (comment)
 msgid "\\consists \\\"Rest_engraver\\\""
 msgstr ""
 
@@ -6970,144 +7478,144 @@ msgstr ""
 msgid "violone"
 msgstr ""
 
-#. Documentation/snippets/fingering-symbols-for-wind-instruments.ly:17 (variable)
-#. Documentation/snippets/recorder-fingering-chart.ly:19 (variable)
+#. Documentation/snippets/fingering-symbols-for-wind-instruments.ly:34 (variable)
+#. Documentation/snippets/recorder-fingering-chart.ly:40 (variable)
 msgid "centermarkup"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:54 (comment)
+#. Documentation/snippets/flamenco-notation.ly:94 (comment)
 msgid "Cut here ----- Start 'flamenco.ly'"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:56 (comment)
+#. Documentation/snippets/flamenco-notation.ly:96 (comment)
 msgid "Text indicators"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:57 (variable)
+#. Documentation/snippets/flamenco-notation.ly:97 (variable)
 msgid "abanico"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:58 (variable)
+#. Documentation/snippets/flamenco-notation.ly:98 (variable)
 msgid "rasgueaso"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:59 (variable)
+#. Documentation/snippets/flamenco-notation.ly:99 (variable)
 msgid "alzapua"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:61 (comment)
+#. Documentation/snippets/flamenco-notation.ly:101 (comment)
 msgid "Finger stroke symbols"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:62 (variable)
+#. Documentation/snippets/flamenco-notation.ly:102 (variable)
 msgid "strokeUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:72 (variable)
+#. Documentation/snippets/flamenco-notation.ly:112 (variable)
 msgid "strokeDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:82 (comment)
+#. Documentation/snippets/flamenco-notation.ly:122 (comment)
 msgid "Golpe symbol"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:83 (variable)
+#. Documentation/snippets/flamenco-notation.ly:123 (variable)
 msgid "golpe"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:97 (variable)
+#. Documentation/snippets/flamenco-notation.ly:137 (variable)
 msgid "strokeUpGolpe"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:98 (variable)
+#. Documentation/snippets/flamenco-notation.ly:138 (variable)
 msgid "iUpGolpe"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:100 (comment)
+#. Documentation/snippets/flamenco-notation.ly:140 (comment)
 msgid "Strokes for all fingers"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:101 (variable)
+#. Documentation/snippets/flamenco-notation.ly:141 (variable)
 msgid "pUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:102 (variable)
+#. Documentation/snippets/flamenco-notation.ly:142 (variable)
 msgid "pDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:103 (variable)
+#. Documentation/snippets/flamenco-notation.ly:143 (variable)
 msgid "iUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:104 (variable)
+#. Documentation/snippets/flamenco-notation.ly:144 (variable)
 msgid "iDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:105 (variable)
+#. Documentation/snippets/flamenco-notation.ly:145 (variable)
 msgid "mUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:106 (variable)
+#. Documentation/snippets/flamenco-notation.ly:146 (variable)
 msgid "mDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:107 (variable)
+#. Documentation/snippets/flamenco-notation.ly:147 (variable)
 msgid "aUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:108 (variable)
+#. Documentation/snippets/flamenco-notation.ly:148 (variable)
 msgid "aDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:109 (variable)
+#. Documentation/snippets/flamenco-notation.ly:149 (variable)
 msgid "xUp"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:110 (variable)
+#. Documentation/snippets/flamenco-notation.ly:150 (variable)
 msgid "xDown"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:113 (comment)
+#. Documentation/snippets/flamenco-notation.ly:153 (comment)
 msgid "Just handy :)"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:114 (variable)
+#. Documentation/snippets/flamenco-notation.ly:154 (variable)
 msgid "tupletOff"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:119 (variable)
+#. Documentation/snippets/flamenco-notation.ly:159 (variable)
 msgid "tupletsOff"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:124 (variable)
+#. Documentation/snippets/flamenco-notation.ly:164 (variable)
 msgid "tupletsOn"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:129 (variable)
+#. Documentation/snippets/flamenco-notation.ly:169 (variable)
 msgid "headsOff"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:135 (variable)
+#. Documentation/snippets/flamenco-notation.ly:175 (variable)
 msgid "headsOn"
 msgstr ""
 
-#. Documentation/snippets/flamenco-notation.ly:141 (comment)
+#. Documentation/snippets/flamenco-notation.ly:181 (comment)
 msgid "Cut here ----- End 'flamenco.ly'"
 msgstr ""
 
-#. Documentation/snippets/flat-flags-and-beam-nibs.ly:155 (comment)
+#. Documentation/snippets/flat-flags-and-beam-nibs.ly:157 (comment)
 msgid "Example 1"
 msgstr ""
 
-#. Documentation/snippets/flat-flags-and-beam-nibs.ly:161 (comment)
+#. Documentation/snippets/flat-flags-and-beam-nibs.ly:163 (comment)
 msgid "Example 2"
 msgstr ""
 
-#. Documentation/snippets/flat-flags-and-beam-nibs.ly:167 (comment)
+#. Documentation/snippets/flat-flags-and-beam-nibs.ly:169 (comment)
 msgid "Example 3"
 msgstr ""
 
-#. Documentation/snippets/flat-flags-and-beam-nibs.ly:175 (comment)
+#. Documentation/snippets/flat-flags-and-beam-nibs.ly:177 (comment)
 msgid "Example 4"
 msgstr ""
 
@@ -7188,6 +7696,22 @@ msgstr ""
 msgid "These chords will be in opposing-landscape orientation"
 msgstr ""
 
+#. Documentation/snippets/fretboards-alternate-tables.ly:49 (comment)
+msgid "Make a blank new fretboard table"
+msgstr ""
+
+#. Documentation/snippets/fretboards-alternate-tables.ly:52 (comment)
+msgid "Make a new fretboard table as a copy of default-fret-table"
+msgstr ""
+
+#. Documentation/snippets/fretboards-alternate-tables.ly:55 (comment)
+msgid "Add a chord to custom-fretboard-table-one"
+msgstr ""
+
+#. Documentation/snippets/fretboards-alternate-tables.ly:61 (comment)
+msgid "Add a chord to custom-fretboard-table-two"
+msgstr ""
+
 #. Documentation/snippets/fretted-headword.ly:35 (comment)
 msgid "shortcuts"
 msgstr ""
@@ -7252,6 +7776,10 @@ msgstr ""
 msgid "rit"
 msgstr ""
 
+#. Documentation/snippets/fretted-headword.ly:56 (variable)
+msgid "dimin"
+msgstr ""
+
 #. Documentation/snippets/fretted-headword.ly:57 (variable)
 msgid "andantino"
 msgstr ""
@@ -7288,7 +7816,7 @@ msgid "m. 4"
 msgstr ""
 
 #. Documentation/snippets/fretted-headword.ly:86 (comment)
-#. Documentation/snippets/fretted-headword.ly:126 (comment)
+#. Documentation/snippets/fretted-headword.ly:124 (comment)
 msgid "m. 5"
 msgstr ""
 
@@ -7297,7 +7825,7 @@ msgid "end of m. 6"
 msgstr ""
 
 #. Documentation/snippets/fretted-headword.ly:92 (comment)
-#. Documentation/snippets/fretted-headword.ly:131 (comment)
+#. Documentation/snippets/fretted-headword.ly:129 (comment)
 msgid "m. 7"
 msgstr ""
 
@@ -7314,7 +7842,7 @@ msgid "end of m. 9"
 msgstr ""
 
 #. Documentation/snippets/fretted-headword.ly:100 (comment)
-#. Documentation/snippets/fretted-headword.ly:138 (comment)
+#. Documentation/snippets/fretted-headword.ly:136 (comment)
 msgid "m. 10"
 msgstr ""
 
@@ -7338,51 +7866,59 @@ msgstr ""
 msgid "new section starts here in A minor"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:128 (comment)
+#. Documentation/snippets/fretted-headword.ly:126 (comment)
 msgid "beg m. 6"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:129 (comment)
+#. Documentation/snippets/fretted-headword.ly:127 (comment)
 msgid "end m. 6"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:133 (comment)
+#. Documentation/snippets/fretted-headword.ly:131 (comment)
 msgid "m. 8"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:135 (comment)
+#. Documentation/snippets/fretted-headword.ly:133 (comment)
 msgid "beg m. 9"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:136 (comment)
+#. Documentation/snippets/fretted-headword.ly:134 (comment)
 msgid "end m. 9"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:140 (comment)
-msgid "m. 11"
+#. Documentation/snippets/fretted-headword.ly:138 (comment)
+msgid "m. 11"
+msgstr ""
+
+#. Documentation/snippets/fretted-headword.ly:142 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:182 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:292 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:60 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:65 (context id)
+msgid "guitar"
+msgstr ""
+
+#. Documentation/snippets/generating-custom-flags.ly:29 (comment)
+msgid "Create a flag stencil by looking up the glyph from the font"
 msgstr ""
 
-#. Documentation/snippets/fretted-headword.ly:144 (context id)
-#. Documentation/snippets/jazz-combo-template.ly:180 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:290 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:58 (context id)
-#. Documentation/snippets/polyphony-in-tablature.ly:63 (context id)
-msgid "guitar"
+#. Documentation/snippets/generating-custom-flags.ly:43 (variable)
+msgid "snippetexamplenotes"
 msgstr ""
 
-#. Documentation/snippets/grid-lines--changing-their-appearance.ly:51 (comment)
+#. Documentation/snippets/grid-lines--changing-their-appearance.ly:53 (comment)
 msgid "this moves them up one staff space from the default position"
 msgstr ""
 
-#. Documentation/snippets/grid-lines--changing-their-appearance.ly:69 (comment)
+#. Documentation/snippets/grid-lines--changing-their-appearance.ly:71 (comment)
 msgid "set up grids"
 msgstr ""
 
-#. Documentation/snippets/grid-lines--changing-their-appearance.ly:71 (comment)
+#. Documentation/snippets/grid-lines--changing-their-appearance.ly:73 (comment)
 msgid "set the grid interval to one quarter note"
 msgstr ""
 
-#. Documentation/snippets/grid-lines--changing-their-appearance.ly:77 (comment)
+#. Documentation/snippets/grid-lines--changing-their-appearance.ly:79 (comment)
 msgid "this moves them to the right half a staff space"
 msgstr ""
 
@@ -7410,15 +7946,15 @@ msgstr ""
 msgid "to four spaces below center line on visible staff"
 msgstr ""
 
-#. Documentation/snippets/guitar-slides.ly:20 (comment)
+#. Documentation/snippets/guitar-slides.ly:33 (comment)
 msgid "Hide fret number: useful to draw slide into/from a casual point of"
 msgstr ""
 
-#. Documentation/snippets/guitar-slides.ly:21 (comment)
+#. Documentation/snippets/guitar-slides.ly:34 (comment)
 msgid "the fretboard."
 msgstr ""
 
-#. Documentation/snippets/guitar-slides.ly:22 (variable)
+#. Documentation/snippets/guitar-slides.ly:35 (variable)
 msgid "hideFretNumber"
 msgstr ""
 
@@ -7565,9 +8101,9 @@ msgstr ""
 
 #. Documentation/snippets/how-to-change-fret-diagram-position.ly:29 (variable)
 #. Documentation/snippets/score-for-diatonic-accordion.ly:62 (variable)
-#. Documentation/snippets/showing-chords-at-changes.ly:33 (variable)
-#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:57 (variable)
-#. Documentation/snippets/single-staff-template-with-notes-and-chords.ly:56 (variable)
+#. Documentation/snippets/showing-chords-at-changes.ly:34 (variable)
+#. Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly:60 (variable)
+#. Documentation/snippets/single-staff-template-with-notes-and-chords.ly:59 (variable)
 msgid "harmonies"
 msgstr ""
 
@@ -7587,6 +8123,86 @@ msgstr ""
 msgid "HERE IS THE SECOND METHOD"
 msgstr ""
 
+#. Documentation/snippets/hymn-template.ly:50 (variable)
+msgid "Timeline"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:82 (comment)
+msgid "Start score"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:84 (comment)
+msgid "Start pianostaff"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:85 (comment)
+msgid "Start Staff = RH"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:88 (comment)
+msgid "Start Voice = \\\"Soprano\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:92 (comment)
+msgid "End Voice = \\\"Soprano\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:93 (comment)
+msgid "Start Voice = \\\"Alto\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:97 (comment)
+msgid "End Voice = \\\"Alto\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:98 (comment)
+msgid "End Staff = RH"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:99 (comment)
+msgid "Start Staff = LH"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:102 (comment)
+msgid "Start Voice = \\\"Tenor\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:106 (comment)
+msgid "End Voice = \\\"Tenor\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:107 (comment)
+msgid "Start Voice = \\\"Bass\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:111 (comment)
+msgid "End Voice = \\\"Bass\\\""
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:112 (comment)
+msgid "End Staff = LH"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:113 (comment)
+msgid "End pianostaff"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:134 (comment)
+msgid "Start paper block"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:135 (comment)
+msgid "don't indent first system"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:136 (comment)
+msgid "shorten line length to suit music"
+msgstr ""
+
+#. Documentation/snippets/hymn-template.ly:137 (comment)
+msgid "End paper block"
+msgstr ""
+
 #. Documentation/snippets/incipit.ly:85 (variable)
 #. Documentation/snippets/incipit.ly:86 (context id)
 msgid "discantusIncipit"
@@ -7634,192 +8250,196 @@ msgstr ""
 msgid "tuning"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:65 (comment)
+#. Documentation/snippets/isolated-percent-repeats.ly:42 (variable)
+msgid "makePercent"
+msgstr ""
+
+#. Documentation/snippets/jazz-combo-template.ly:67 (comment)
 msgid "#(set-global-staff-size 16)"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:68 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:70 (comment)
 msgid "Some macros %%%%%%%%%%%%%%%%%%%"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:70 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:72 (variable)
 msgid "sl"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:74 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:76 (variable)
 msgid "nsl"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:78 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:80 (variable)
 msgid "crOn"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:79 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:81 (variable)
 msgid "crOff"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:81 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:83 (comment)
 msgid "insert chord name style stuff here."
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:83 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:85 (variable)
 msgid "jazzChords"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:85 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:87 (comment)
 msgid "Keys'n'thangs %%%%%%%%%%%%%%%%%"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:89 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:91 (variable)
 msgid "Key"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:91 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:93 (comment)
 msgid "############ Horns ############"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:93 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:95 (comment)
 msgid "------ Trumpet ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:94 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:96 (variable)
 msgid "trpt"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:98 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:100 (variable)
 msgid "trpHarmony"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:101 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:281 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:103 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:283 (context id)
 #. Documentation/snippets/staff-headword.ly:93 (context id)
 #. Documentation/snippets/staff-headword.ly:112 (context id)
 msgid "trumpet"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:110 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:112 (comment)
 msgid "------ Alto Saxophone ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:115 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:117 (variable)
 msgid "altoHarmony"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:118 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:120 (variable)
 msgid "altoSax"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:127 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:129 (comment)
 msgid "------ Baritone Saxophone ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:128 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:130 (variable)
 msgid "bari"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:136 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:138 (variable)
 msgid "bariHarmony"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:139 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:141 (variable)
 msgid "bariSax"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:148 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:150 (comment)
 msgid "------ Trombone ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:149 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:151 (variable)
 msgid "tbone"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:153 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:155 (variable)
 msgid "tboneHarmony"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:156 (variable)
-#. Documentation/snippets/jazz-combo-template.ly:285 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:158 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:287 (context id)
 msgid "trombone"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:165 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:167 (comment)
 msgid "############ Rhythm Section #############"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:167 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:169 (comment)
 msgid "------ Guitar ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:168 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:170 (variable)
 msgid "gtr"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:176 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:178 (variable)
 msgid "gtrHarmony"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:189 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:191 (comment)
 msgid "------ Piano ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:190 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:192 (variable)
 msgid "rhUpper"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:195 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:197 (variable)
 msgid "rhLower"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:201 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:203 (variable)
 msgid "lhUpper"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:206 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:208 (variable)
 msgid "lhLower"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:212 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:214 (variable)
 msgid "PianoRH"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:221 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:223 (variable)
 msgid "PianoLH"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:239 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:241 (comment)
 msgid "------ Bass Guitar ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:253 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:255 (comment)
 msgid "------ Drums ------"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:267 (variable)
+#. Documentation/snippets/jazz-combo-template.ly:269 (variable)
 msgid "drumContents"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:276 (comment)
+#. Documentation/snippets/jazz-combo-template.ly:278 (comment)
 #, python-format
 msgid "It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%%"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:280 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:282 (context id)
 msgid "horns"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:282 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:284 (context id)
 msgid "altosax"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:283 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:285 (context id)
 msgid "barichords"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:284 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:286 (context id)
 msgid "barisax"
 msgstr ""
 
-#. Documentation/snippets/jazz-combo-template.ly:289 (context id)
+#. Documentation/snippets/jazz-combo-template.ly:291 (context id)
 msgid "chords"
 msgstr ""
 
@@ -7855,7 +8475,7 @@ msgstr ""
 msgid "speakOn"
 msgstr ""
 
-#. Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly:34 (variable)
+#. Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly:35 (variable)
 msgid "speakOff"
 msgstr ""
 
@@ -7863,7 +8483,7 @@ msgstr ""
 msgid "Candide, Voltaire"
 msgstr ""
 
-#. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:54 (comment)
+#. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (comment)
 msgid "the final bar line is not interrupted"
 msgstr ""
 
@@ -7871,7 +8491,7 @@ msgstr ""
 msgid "normalPos"
 msgstr ""
 
-#. Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly:69 (variable)
+#. Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly:71 (variable)
 msgid "dashPlus"
 msgstr ""
 
@@ -7887,91 +8507,135 @@ msgstr ""
 msgid "...or to cover just whitespace"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:54 (variable)
-msgid "fluteMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:60 (comment)
+msgid "space for instrumentName"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:55 (variable)
-msgid "oboeMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:61 (comment)
+msgid "space for shortInstrumentName"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:56 (variable)
-msgid "clarinetMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:64 (variable)
+msgid "fluteMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:57 (variable)
-msgid "bassoonMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:65 (comment)
+msgid "Pitches as written on a manuscript for Clarinet in A"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:58 (variable)
-msgid "trumpetMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:66 (comment)
+msgid "are transposed to concert pitch."
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:67 (variable)
+msgid "clarinetMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:59 (variable)
-msgid "tromboneMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:69 (variable)
+msgid "trumpetMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:60 (variable)
-msgid "hornIMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:70 (comment)
+msgid "Key signature is often omitted for horns"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:61 (variable)
-msgid "hornIIMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:71 (variable)
+msgid "hornMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:62 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:73 (variable)
 msgid "percussionMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:65 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:76 (variable)
 msgid "altoIMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:66 (variable)
-msgid "altoILyrics"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:77 (variable)
+msgid "altoIIMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:67 (variable)
-msgid "altoIIMusic"
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:78 (variable)
+msgid "altoILyrics"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:68 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:79 (variable)
 msgid "altoIILyrics"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:71 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:82 (variable)
 msgid "pianoRHMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:72 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:83 (variable)
 msgid "pianoLHMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:73 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:84 (variable)
 msgid "violinIMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:74 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:85 (variable)
 msgid "violinIIMusic"
 msgstr ""
 
-#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:75 (variable)
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:86 (variable)
 msgid "violaMusic"
 msgstr ""
 
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:95 (comment)
+msgid "shortInstrumentName, midiInstrument, etc."
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:96 (comment)
+msgid "may be set here as well"
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:102 (comment)
+msgid "Declare that written Middle C in the music"
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:103 (comment)
+msgid "to follow sounds a concert B flat, for"
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:104 (comment)
+msgid "output using sounded pitches such as MIDI."
+msgstr ""
+
+#. Documentation/snippets/orchestra,-choir-and-piano-template.ly:106 (comment)
+msgid "Print music for a B-flat clarinet"
+msgstr ""
+
+#. Documentation/snippets/partcombine-and-autobeamoff.ly:146 (comment)
+msgid "\\set Staff.autoBeaming = ##f % turns off all autobeaming"
+msgstr ""
+
+#. Documentation/snippets/partcombine-and-autobeamoff.ly:149 (comment)
+msgid "applies to split up stems"
+msgstr ""
+
+#. Documentation/snippets/partcombine-and-autobeamoff.ly:151 (comment)
+msgid "\\autoBeamOff % applies to combined up stems"
+msgstr ""
+
+#. Documentation/snippets/partcombine-and-autobeamoff.ly:156 (comment)
+msgid "applies to down stems"
+msgstr ""
+
 #. Documentation/snippets/percussion-beaters.ly:19 (variable)
 msgid "stick"
 msgstr ""
 
-#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:51 (comment)
+#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:53 (comment)
 msgid "Permit line breaks within tuplets"
 msgstr ""
 
-#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:53 (comment)
+#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:55 (comment)
 msgid "Allow beams to be broken at line breaks"
 msgstr ""
 
-#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:60 (comment)
+#. Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly:62 (comment)
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
@@ -8007,43 +8671,43 @@ msgstr ""
 msgid "RH Voice 2"
 msgstr ""
 
-#. Documentation/snippets/polyphony-in-tablature.ly:57 (context id)
+#. Documentation/snippets/polyphony-in-tablature.ly:59 (context id)
 msgid "tab"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:58 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:60 (comment)
 msgid "MMR - Multi-Measure Rest"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:59 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:61 (comment)
 msgid "MMRs by default are set under the fourth line"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:61 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:63 (comment)
 msgid "They can be moved with an override"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:64 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:66 (comment)
 msgid "A value of 0 is the default position;"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:65 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:67 (comment)
 msgid "the following trick moves the rest to the center line"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:68 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:70 (comment)
 msgid "MMRs in odd-numbered voices are under the top line"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:70 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:72 (comment)
 msgid "MMRs in even-numbered voices are under the bottom line"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:72 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:74 (comment)
 msgid "They remain separated even in empty measures"
 msgstr ""
 
-#. Documentation/snippets/positioning-multi-measure-rests.ly:74 (comment)
+#. Documentation/snippets/positioning-multi-measure-rests.ly:76 (comment)
 msgid "This brings them together even though there are two voices"
 msgstr ""
 
@@ -8196,27 +8860,27 @@ msgstr ""
 msgid "The coda"
 msgstr ""
 
-#. Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly:55 (comment)
+#. Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly:57 (comment)
 msgid "Permit first bar number to be printed"
 msgstr ""
 
-#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:41 (comment)
+#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:43 (comment)
 msgid "Prevent bar numbers at the end of a line and permit them elsewhere"
 msgstr ""
 
-#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:48 (comment)
+#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:50 (comment)
 msgid "Draw a box round the following bar number(s)"
 msgstr ""
 
-#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:53 (comment)
+#. Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly:55 (comment)
 msgid "Draw a circle round the following bar number(s)"
 msgstr ""
 
-#. Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly:53 (comment)
+#. Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly:55 (comment)
 msgid "Metronome marks below the staff"
 msgstr ""
 
-#. Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly:58 (comment)
+#. Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly:60 (comment)
 msgid "Rehearsal marks below the staff"
 msgstr ""
 
@@ -8228,55 +8892,59 @@ msgstr ""
 msgid "Perkussion"
 msgstr ""
 
-#. Documentation/snippets/quoting-another-voice-with-transposition.ly:67 (variable)
+#. Documentation/snippets/putting-lyrics-inside-the-staff.ly:24 (context id)
+msgid "voc"
+msgstr ""
+
+#. Documentation/snippets/quoting-another-voice-with-transposition.ly:69 (variable)
 msgid "quoteTest"
 msgstr ""
 
-#. Documentation/snippets/quoting-another-voice-with-transposition.ly:68 (comment)
+#. Documentation/snippets/quoting-another-voice-with-transposition.ly:70 (comment)
 msgid "french horn"
 msgstr ""
 
-#. Documentation/snippets/quoting-another-voice.ly:74 (variable)
+#. Documentation/snippets/quoting-another-voice.ly:76 (variable)
 msgid "quoteMe"
 msgstr ""
 
-#. Documentation/snippets/quoting-another-voice.ly:79 (variable)
+#. Documentation/snippets/quoting-another-voice.ly:81 (variable)
 msgid "original"
 msgstr ""
 
-#. Documentation/snippets/recorder-fingering-chart.ly:17 (comment)
+#. Documentation/snippets/recorder-fingering-chart.ly:38 (comment)
 msgid "range chart for paetzold contrabass recorder"
 msgstr ""
 
-#. Documentation/snippets/redefining-grace-note-global-defaults.ly:62 (variable)
+#. Documentation/snippets/redefining-grace-note-global-defaults.ly:64 (variable)
 msgid "startAcciaccaturaMusic"
 msgstr ""
 
-#. Documentation/snippets/redefining-grace-note-global-defaults.ly:68 (variable)
+#. Documentation/snippets/redefining-grace-note-global-defaults.ly:70 (variable)
 msgid "stopAcciaccaturaMusic"
 msgstr ""
 
-#. Documentation/snippets/removing-the-first-empty-line.ly:79 (comment)
+#. Documentation/snippets/removing-the-first-empty-line.ly:81 (comment)
 msgid "To use the setting globally, uncomment the following line:"
 msgstr ""
 
-#. Documentation/snippets/removing-the-first-empty-line.ly:80 (comment)
+#. Documentation/snippets/removing-the-first-empty-line.ly:82 (comment)
 msgid "\\override VerticalAxisGroup #'remove-first = ##t"
 msgstr ""
 
-#. Documentation/snippets/removing-the-first-empty-line.ly:89 (comment)
+#. Documentation/snippets/removing-the-first-empty-line.ly:91 (comment)
 msgid "To use the setting globally, comment this line,"
 msgstr ""
 
-#. Documentation/snippets/removing-the-first-empty-line.ly:90 (comment)
+#. Documentation/snippets/removing-the-first-empty-line.ly:92 (comment)
 msgid "uncomment the line in the \\layout block above"
 msgstr ""
 
-#. Documentation/snippets/reverting-default-beam-endings.ly:53 (comment)
+#. Documentation/snippets/reverting-default-beam-endings.ly:50 (comment)
 msgid "Default beaming"
 msgstr ""
 
-#. Documentation/snippets/reverting-default-beam-endings.ly:56 (comment)
+#. Documentation/snippets/reverting-default-beam-endings.ly:53 (comment)
 msgid "Set new values for beam endings"
 msgstr ""
 
@@ -8316,133 +8984,44 @@ msgstr ""
 msgid "\\override SpacingSpanner #'strict-grace-spacing = ##t"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:26 (comment)
-msgid "Grob utilities"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:28 (comment)
-msgid ""
-"These are literal rewrites of some C++ methods used by the ambitus engraver."
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:63 (comment)
-msgid "Ambitus data structure"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:66 (comment)
-msgid "The <ambitus> class holds the various grobs that are created"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:67 (comment)
-msgid "to print an ambitus:"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:68 (comment)
-msgid "- ambitus-group: the grob that groups all the components of an ambitus"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:69 (comment)
-msgid "(Ambitus grob);"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:70 (comment)
-msgid "- ambitus-line: the vertical line between the upper and lower ambitus"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:71 (comment)
-msgid "notes (AmbitusLine grob);"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:72 (comment)
-msgid "- ambitus-up-note and ambitus-down-note: the note head and accidental"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:73 (comment)
-msgid "for the lower and upper note of the ambitus (see <ambitus-note> class"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:74 (comment)
-msgid "below)."
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:75 (comment)
-msgid "The other slots define the key and clef context of the engraver:"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:76 (comment)
-msgid "- start-c0: position of middle c at the beginning of the piece.  It"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:77 (comment)
-msgid "is used to place the ambitus notes according to their pitch;"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:78 (comment)
-msgid "- start-key-sig: the key signature at the beginning of the piece.  It"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:79 (comment)
-msgid "is used to determine if accidentals shall be printed next to ambitus"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:80 (comment)
-msgid "notes."
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:94 (comment)
-msgid "Accessor for the lower and upper note data of an ambitus"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:102 (comment)
-msgid "The <ambitus-note> class holds the grobs that are specific to ambitus"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:103 (comment)
-msgid "(lower and upper) notes:"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:104 (comment)
-msgid "- head: an AmbitusNoteHead grob;"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:105 (comment)
-msgid "- accidental: an AmbitusAccidental grob, to be possibly printed next"
-msgstr ""
-
-#. Documentation/snippets/scheme-engraver-ambitus.ly:106 (comment)
-msgid "to the ambitus note head."
+#. Documentation/snippets/satb-choir-template---four-staves.ly:40 (variable)
+msgid "sopranonotes"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:107 (comment)
-msgid "Moreover:"
+#. Documentation/snippets/satb-choir-template---four-staves.ly:43 (variable)
+msgid "sopranowords"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:108 (comment)
-msgid "- pitch is the absolute pitch of the note"
+#. Documentation/snippets/satb-choir-template---four-staves.ly:44 (variable)
+msgid "altonotes"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:109 (comment)
-msgid "- cause is the note event that causes this ambitus note, i.e. the lower"
+#. Documentation/snippets/satb-choir-template---four-staves.ly:47 (variable)
+msgid "altowords"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:110 (comment)
-msgid "or upper note of the considered music sequence."
+#. Documentation/snippets/satb-choir-template---four-staves.ly:48 (variable)
+msgid "tenornotes"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:123 (comment)
-msgid "Ambitus engraving logics"
+#. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
+msgid "tenorwords"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:125 (comment)
-msgid "Rewrite of the code from @file{lily/ambitus-engraver.cc}."
+#. Documentation/snippets/satb-choir-template---four-staves.ly:53 (variable)
+msgid "bassnotes"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:294 (comment)
-msgid "Ambitus engraver definition"
+#. Documentation/snippets/satb-choir-template---four-staves.ly:57 (variable)
+msgid "basswords"
 msgstr ""
 
-#. Documentation/snippets/scheme-engraver-ambitus.ly:319 (comment)
-msgid "Example"
+#. Documentation/snippets/score-for-diatonic-accordion.ly:60 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:59 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:73 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:89 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:105 (comment)
+msgid "verse"
 msgstr ""
 
 #. Documentation/snippets/score-for-diatonic-accordion.ly:70 (variable)
@@ -8700,24 +9279,16 @@ msgstr ""
 msgid "Search for 'grid' in this page to find all related functions"
 msgstr ""
 
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:28 (comment)
-msgid "The same as \\flageolet, just a little smaller"
-msgstr ""
-
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:38 (comment)
-msgid "The second fermata is ignored!"
-msgstr ""
-
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:41 (comment)
-msgid "it works only if you wrap the note inside a chord. By default,"
+#. Documentation/snippets/setting-system-separators.ly:34 (variable)
+msgid "notes"
 msgstr ""
 
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:42 (comment)
-msgid "all articulations will be printed above, so you have to tweak"
+#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:23 (comment)
+msgid "The same as \\flageolet, just a little smaller"
 msgstr ""
 
-#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:43 (comment)
-msgid "the direction."
+#. Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly:33 (comment)
+msgid "The second fermata is ignored!"
 msgstr ""
 
 #. Documentation/snippets/simultaneous-headword.ly:30 (comment)
@@ -8834,112 +9405,112 @@ msgstr ""
 msgid "stringNumberSpanner"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-simple.ly:52 (variable)
+#. Documentation/snippets/string-quartet-template-simple.ly:55 (variable)
 msgid "violinOne"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
+#. Documentation/snippets/string-quartet-template-simple.ly:64 (variable)
 msgid "violinTwo"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-simple.ly:70 (variable)
+#. Documentation/snippets/string-quartet-template-simple.ly:73 (variable)
 msgid "viola"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:103 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:106 (comment)
 msgid "piece.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:104 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:107 (comment)
 msgid "(This is the global definitions file)"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:111 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:114 (variable)
 msgid "Violinone"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:116 (comment)
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:122 (comment)
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:129 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:119 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:125 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:132 (comment)
 msgid "*********************************"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:117 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:120 (variable)
 msgid "Violintwo"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:123 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:126 (variable)
 msgid "Viola"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:130 (variable)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:133 (variable)
 msgid "Cello"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:136 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:139 (comment)
 msgid "**********************************"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:147 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:150 (comment)
 msgid "These are the other files you need to save on your computer"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:149 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:152 (comment)
 msgid "score.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:150 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:153 (comment)
 msgid "(This is the main file)"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:153 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:156 (comment)
 #, python-format
 msgid ""
 "\\include \\\"piece.ly\\\"             %%% uncomment this line when using a "
 "separate file"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:162 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:165 (comment)
 msgid "{ Uncomment this block when using separate files"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:164 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:167 (comment)
 msgid "vn1.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:165 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:168 (comment)
 msgid "(This is the Violin 1 part file)"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:174 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:177 (comment)
 msgid "vn2.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:175 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:178 (comment)
 msgid "(This is the Violin 2 part file)"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:184 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:187 (comment)
 msgid "vla.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:185 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:188 (comment)
 msgid "(This is the Viola part file)"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:194 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:197 (comment)
 msgid "vlc.ly"
 msgstr ""
 
-#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:195 (comment)
+#. Documentation/snippets/string-quartet-template-with-separate-parts.ly:198 (comment)
 msgid "(This is the Cello part file)"
 msgstr ""
 
-#. Documentation/snippets/sub-dividing-beams.ly:84 (comment)
+#. Documentation/snippets/subdividing-beams.ly:78 (comment)
 msgid "Set beam sub-group length to an eighth note"
 msgstr ""
 
-#. Documentation/snippets/sub-dividing-beams.ly:88 (comment)
+#. Documentation/snippets/subdividing-beams.ly:83 (comment)
 msgid "Set beam sub-group length to a sixteenth note"
 msgstr ""
 
@@ -8992,15 +9563,15 @@ msgstr ""
 msgid "Test it:"
 msgstr ""
 
-#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:25 (comment)
+#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:57 (comment)
 msgid "Change the style permanently"
 msgstr ""
 
-#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:31 (comment)
+#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:63 (comment)
 msgid "Revert to default style:"
 msgstr ""
 
-#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:35 (comment)
+#. Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly:67 (comment)
 msgid "single-digit style only for the next time signature"
 msgstr ""
 
@@ -9041,39 +9612,39 @@ msgstr ""
 msgid "the next three instructions keep the lyrics between the bar lines"
 msgstr ""
 
-#. Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:163 (variable)
+#. Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly:165 (variable)
 msgid "naturalizeMusic"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:150 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:151 (comment)
 msgid "The default treble clef"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:152 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:153 (comment)
 msgid "The standard bass clef"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:157 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:158 (comment)
 msgid "The baritone clef"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:162 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:163 (comment)
 msgid "The standard choral tenor clef"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:168 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:169 (comment)
 msgid "A non-standard clef"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:174 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:175 (comment)
 msgid "The following clef changes do not preserve"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:175 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:176 (comment)
 msgid "the normal relationship between notes and clefs:"
 msgstr ""
 
-#. Documentation/snippets/tweaking-clef-properties.ly:190 (comment)
+#. Documentation/snippets/tweaking-clef-properties.ly:191 (comment)
 msgid "Return to the normal clef:"
 msgstr ""
 
@@ -9241,15 +9812,19 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:73 (comment)
+#. Documentation/snippets/using-alternative-flag-styles.ly:31 (variable)
+msgid "testnotes"
+msgstr ""
+
+#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:113 (comment)
 msgid "display grobs for each note head:"
 msgstr ""
 
-#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:74 (comment)
+#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:114 (comment)
 msgid "\\override NoteHead #'before-line-breaking = #display-grobs"
 msgstr ""
 
-#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:76 (comment)
+#. Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly:116 (comment)
 msgid "or just for one:"
 msgstr ""
 
@@ -9345,67 +9920,102 @@ msgstr ""
 msgid "m"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:66 (variable)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:56 (variable)
-#. Documentation/snippets/vocal-ensemble-template.ly:65 (variable)
-msgid "sopMusic"
-msgstr ""
-
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:69 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:68 (variable)
+msgid "sopMusic"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:72 (variable)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:62 (variable)
+#. Documentation/snippets/vocal-ensemble-template.ly:71 (variable)
 msgid "sopWords"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:86 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:96 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:101 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:89 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:99 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:104 (context id)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:96 (context id)
-#. Documentation/snippets/vocal-ensemble-template.ly:108 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:107 (context id)
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:99 (context id)
+#. Documentation/snippets/vocal-ensemble-template.ly:111 (context id)
 msgid "men"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:133 (comment)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:108 (comment)
-#. Documentation/snippets/vocal-ensemble-template.ly:126 (comment)
-msgid "a little smaller so lyrics"
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:95 (comment)
+msgid "we could remove the line about this with the line below, since we want"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:134 (comment)
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:109 (comment)
-#. Documentation/snippets/vocal-ensemble-template.ly:127 (comment)
-msgid "can be closer to the staff"
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:96 (comment)
+msgid "the alto lyrics to be below the alto Voice anyway."
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:92 (comment)
-msgid "we could remove the line about this with the line below, since we want"
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:97 (comment)
+msgid "\\new Lyrics \\lyricsto \\\"altos\\\" \\altoWords"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:93 (comment)
-msgid "the alto lyrics to be below the alto Voice anyway."
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:106 (comment)
+msgid "again, we could replace the line above this with the line below."
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:94 (comment)
-msgid "\\new Lyrics \\lyricsto altos \\altoWords"
+#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:107 (comment)
+msgid "\\new Lyrics \\lyricsto \\\"basses\\\" \\bassWords"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (comment)
-msgid "again, we could replace the line above this with the line below."
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:64 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:77 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:92 (comment)
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:108 (comment)
+msgid "refrain"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:70 (variable)
+msgid "SoloNotes"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:81 (variable)
+msgid "SoloLyrics"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:86 (variable)
+msgid "SopranoNotes"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:97 (variable)
+msgid "SopranoLyrics"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:102 (variable)
+msgid "BassNotes"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:113 (variable)
+msgid "BassLyrics"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:120 (context id)
+msgid "SoloVoice"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:124 (context id)
+msgid "SopranoVoice"
+msgstr ""
+
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:127 (context id)
+msgid "BassVoice"
 msgstr ""
 
-#. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:104 (comment)
-msgid "\\new Lyrics \\lyricsto basses \\bassWords"
+#. Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly:134 (comment)
+msgid "these lines prevent empty staves from being printed"
 msgstr ""
 
 #. Documentation/snippets/volta-multi-staff.ly:17 (variable)
 msgid "voltaMusic"
 msgstr ""
 
-#. Documentation/snippets/volta-text-markup-using-repeatcommands.ly:24 (variable)
+#. Documentation/snippets/volta-text-markup-using-repeatcommands.ly:25 (variable)
 msgid "voltaAdLib"
 msgstr ""