From b319113e61dca137deead44f21280059fba35eca Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Sat, 22 Jun 2013 10:26:29 +0100
Subject: [PATCH] LSR updates

---
 Documentation/de/notation/rhythms.itely       |  2 +-
 Documentation/es/notation/rhythms.itely       |  2 +-
 Documentation/fr/notation/rhythms.itely       |  2 +-
 Documentation/it/notation/rhythms.itely       |  2 +-
 Documentation/ja/notation/rhythms.itely       |  2 +-
 Documentation/notation/rhythms.itely          |  2 +-
 .../snippets/adding-ambitus-per-voice.ly      |  2 +-
 .../adding-an-extra-staff-at-a-line-break.ly  |  2 +-
 .../snippets/adding-an-extra-staff.ly         |  2 +-
 ...ing-an-ottava-marking-to-a-single-voice.ly |  2 +-
 .../adding-bar-lines-to-chordnames-context.ly |  2 +-
 ...hen-using-tuplet-and-non-tuplet-rhythms.ly |  2 +-
 Documentation/snippets/adding-drum-parts.ly   |  2 +-
 ...to-staves-which-get-split-after-a-break.ly |  2 +-
 .../snippets/adding-links-to-objects.ly       |  4 +-
 ...ound-an-expressive-mark-or-chordal-note.ly |  2 +-
 .../snippets/adjusting-grace-note-spacing.ly  |  2 +-
 .../adjusting-lyrics-vertical-spacing.ly      |  2 +-
 .../adjusting-the-shape-of-falls-and-doits.ly |  2 +-
 ...aligning-and-centering-instrument-names.ly |  2 +-
 .../snippets/aligning-bar-numbers.ly          |  2 +-
 ...ing-marks-with-various-notation-objects.ly |  2 +-
 ...-objects-created-with-the--mark-command.ly |  2 +-
 ...ngerings-to-be-printed-inside-the-staff.ly |  2 +-
 .../altering-the-length-of-beamed-stems.ly    |  2 +-
 ...eve-note.ly => alternative-breve-notes.ly} | 10 ++--
 .../analysis-brackets-above-the-staff.ly      |  2 +-
 ...-modern-transcription-of-mensural-music.ly |  2 +-
 .../snippets/ancient-time-signatures.ly       |  2 +-
 .../snippets/anglican-psalm-template.ly       |  2 +-
 .../snippets/arabic-improvisation.ly          |  2 +-
 Documentation/snippets/asymmetric-slurs.ly    |  2 +-
 .../snippets/automatic-beam-subdivisions.ly   |  2 +-
 ...oiding-collisions-with-chord-fingerings.ly |  2 +-
 .../snippets/beam-endings-in-score-context.ly |  2 +-
 .../snippets/beams-across-line-breaks.ly      |  2 +-
 ...staff-lines-using-the--whiteout-command.ly |  2 +-
 Documentation/snippets/breathing-signs.ly     |  2 +-
 .../snippets/broken-crescendo-hairpin.ly      |  2 +-
 .../caesura-railtracks-with-fermata.ly        |  2 +-
 .../center-text-below-hairpin-dynamics.ly     |  2 +-
 ...changing-a-single-notes-size-in-a-chord.ly |  2 +-
 .../snippets/changing-beam-knee-gap.ly        |  2 +-
 .../changing-form-of-multi-measure-rests.ly   |  2 +-
 .../snippets/changing-fret-orientations.ly    |  2 +-
 ...ng-midi-output-to-one-channel-per-voice.ly |  2 +-
 .../snippets/changing-stanza-fonts.ly         |  2 +-
 ...xt-and-spanner-styles-for-text-dynamics.ly |  2 +-
 .../snippets/changing-the-ambitus-gap.ly      |  5 +-
 .../changing-the-breath-mark-symbol.ly        |  2 +-
 ...he-number-of-augmentation-dots-per-note.ly |  6 +--
 ...changing-the-number-of-lines-in-a-staff.ly |  2 +-
 .../snippets/changing-the-staff-size.ly       |  2 +-
 ...coloring-notes-depending-on-their-pitch.ly |  2 +-
 .../combining-two-parts-on-the-same-staff.ly  |  2 +-
 .../consistently-left-aligned-bar-numbers.ly  |  2 +-
 .../snippets/contemporary-glissando.ly        |  2 +-
 ...g-spanner-visibility-after-a-line-break.ly |  2 +-
 ...olling-the-vertical-ordering-of-scripts.ly |  2 +-
 .../controlling-tuplet-bracket-visibility.ly  |  2 +-
 .../snippets/creating-a-delayed-turn.ly       |  2 +-
 .../creating-simultaneous-rehearsal-marks.ly  |  2 +-
 .../snippets/creating-text-spanners.ly        |  2 +-
 ...ff-chords---beaming-problems-workaround.ly |  2 +-
 Documentation/snippets/custodes.ly            |  2 +-
 .../customizing-fretboard-fret-diagrams.ly    |  2 +-
 .../customizing-markup-fret-diagrams.ly       |  2 +-
 ...f-stems-on-the-center-line-of-the-staff.ly |  2 +-
 ...efined-fretboards-for-other-instruments.ly |  2 +-
 ...bracket-with-only-one-staff-in-a-system.ly | 51 +++++++++----------
 ...stem-if-only-one-of-its-staves-is-alive.ly |  2 +-
 .../snippets/displaying-complex-chords.ly     |  2 +-
 .../snippets/displaying-grob-ancestry.ly      |  2 +-
 .../snippets/drawing-boxes-around-grobs.ly    |  2 +-
 .../drawing-circles-around-note-heads.ly      |  2 +-
 .../drawing-circles-around-various-objects.ly |  2 +-
 Documentation/snippets/editorial-headword.ly  |  2 +-
 .../snippets/engraving-ties-manually.ly       |  2 +-
 .../engraving-tremolos-with-floating-beams.ly |  2 +-
 Documentation/snippets/expressive-headword.ly |  2 +-
 .../snippets/expressive-marks.snippet-list    |  2 +-
 .../snippets/figured-bass-headword.ly         |  2 +-
 .../snippets/fine-tuning-pedal-brackets.ly    |  2 +-
 .../fingering-symbols-for-wind-instruments.ly |  2 +-
 Documentation/snippets/flamenco-notation.ly   |  2 +-
 Documentation/snippets/flute-slap-notation.ly |  2 +-
 .../forcing-horizontal-shift-of-notes.ly      |  2 +-
 .../snippets/forcing-hyphens-to-be-shown.ly   |  2 +-
 ...-width-to-adapt-to-metronomemarks-width.ly |  2 +-
 .../fret-diagrams-explained-and-developed.ly  |  2 +-
 .../fretted-string-harmonics-in-tablature.ly  |  2 +-
 .../snippets/generating-random-notes.ly       |  2 +-
 ...arts-in-scheme-without-using-the-parser.ly |  2 +-
 .../grid-lines--changing-their-appearance.ly  |  2 +-
 ...izing-rhythms-and-notes-synchronization.ly |  2 +-
 .../hairpins-with-different-line-styles.ly    |  2 +-
 ...tied-notes-at-the-start-of-a-new-system.ly |  2 +-
 ...ing-the-extender-line-for-text-dynamics.ly |  2 +-
 .../how-to-change-fret-diagram-position.ly    |  2 +-
 ...ove-and-below-the-same-barline-method-1.ly |  2 +-
 ...ove-and-below-the-same-barline-method-2.ly |  2 +-
 ...ross-staff-chords-with-arpeggio-bracket.ly |  2 +-
 Documentation/snippets/inserting-a-caesura.ly |  2 +-
 .../snippets/keep-change-clefs-full-sized.ly  |  2 +-
 Documentation/snippets/keyboard-headword.ly   |  2 +-
 Documentation/snippets/laissez-vibrer-ties.ly |  2 +-
 Documentation/snippets/line-arrows.ly         |  2 +-
 Documentation/snippets/lyrics-alignment.ly    |  2 +-
 ...aking-slurs-with-complex-dash-structure.ly |  2 +-
 ...ome-staff-lines-thicker-than-the-others.ly |  2 +-
 .../manually-controlling-beam-positions.ly    |  2 +-
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |  2 +-
 Documentation/snippets/markup-lines.ly        |  2 +-
 Documentation/snippets/measure-counter.ly     |  2 +-
 ...che-layout-bar-lines-between-the-staves.ly |  2 +-
 .../modifying-tuplet-bracket-length.ly        |  2 +-
 .../moving-dotted-notes-in-polyphony.ly       |  2 +-
 .../moving-slur-positions-vertically.ly       |  2 +-
 .../snippets/non-default-tuplet-numbers.ly    |  2 +-
 ...g-2.12-lyrics-spacing-in-newer-versions.ly |  2 +-
 .../snippets/outputting-the-version-number.ly |  2 +-
 Documentation/snippets/page-label.ly          |  2 +-
 ...tting-line-breaks-within-beamed-tuplets.ly |  2 +-
 Documentation/snippets/pitches-headword.ly    |  2 +-
 .../snippets/positioning-arpeggios.ly         |  2 +-
 ...tioning-fingering-indications-precisely.ly |  2 +-
 ...eams-at-the-height-of-normal-note-beams.ly |  2 +-
 ...tioning-grace-notes-with-floating-space.ly |  2 +-
 ...itioning-segno-and-coda-with-line-break.ly |  2 +-
 .../positioning-text-markups-inside-slurs.ly  |  2 +-
 ...naturals-from-being-automatically-added.ly | 10 ++--
 ...g-final-mark-from-removing-final-tuplet.ly |  2 +-
 ...inting-bar-numbers-at-regular-intervals.ly |  2 +-
 ...ing-bar-numbers-inside-boxes-or-circles.ly |  2 +-
 ...nting-hairpins-using-al-niente-notation.ly |  2 +-
 .../printing-marks-at-the-end-of-a-line.ly    |  2 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly |  2 +-
 ...ng-music-with-different-time-signatures.ly |  2 +-
 .../proportional-strict-notespacing.ly        |  2 +-
 .../putting-lyrics-inside-the-staff.ly        |  2 +-
 .../snippets/quoting-another-voice.ly         |  2 +-
 .../snippets/recorder-fingering-chart.ly      |  2 +-
 ...n-staffgroup,-pianostaff,-or-grandstaff.ly |  2 +-
 .../snippets/removing-the-first-empty-line.ly |  2 +-
 Documentation/snippets/repeats-headword.ly    |  2 +-
 Documentation/snippets/rest-styles.ly         |  2 +-
 Documentation/snippets/rhythmic-slashes.ly    |  2 +-
 Documentation/snippets/rhythms-headword.ly    |  2 +-
 Documentation/snippets/rhythms.snippet-list   |  2 +-
 Documentation/snippets/screech-and-boink.ly   |  2 +-
 ...ancellations-from-key-signature-changes.ly |  2 +-
 .../setting-hairpin-behavior-at-bar-lines.ly  |  2 +-
 ...ing-the-double-repeat-default-for-volte.ly |  2 +-
 .../setting-the-minimum-length-of-hairpins.ly |  2 +-
 .../snippets/shortening-volta-brackets.ly     |  2 +-
 ...ulation-above-and-below-a-note-or-chord.ly |  2 +-
 .../snippets/simultaneous-headword.ly         |  2 +-
 Documentation/snippets/slides-in-tablature.ly |  2 +-
 .../stem-and-beam-behavior-in-tablature.ly    |  2 +-
 Documentation/snippets/stemlets.ly            |  2 +-
 Documentation/snippets/subdividing-beams.ly   |  2 +-
 ...sing-warnings-for-clashing-note-columns.ly |  2 +-
 Documentation/snippets/table-of-contents.ly   |  2 +-
 Documentation/snippets/text-headword.ly       |  2 +-
 ...ime-signature-in-parentheses---method-3.ly |  2 +-
 .../snippets/time-signature-in-parentheses.ly |  2 +-
 ...tor-as-a-number-instead-of-the-fraction.ly |  2 +-
 ...scription-of-ancient-music-with-incipit.ly |  2 +-
 .../snippets/tweaking-clef-properties.ly      | 26 +++++++---
 .../tweaking-grace-layout-within-music.ly     |  2 +-
 Documentation/snippets/unfretted-headword.ly  |  2 +-
 ...grob-object-to-access-grobs-with--tweak.ly |  2 +-
 ...pt-to-generate-special-note-head-shapes.ly |  2 +-
 ...tweak-command-to-tweak-individual-grobs.ly |  2 +-
 .../snippets/using-the-whiteout-property.ly   |  2 +-
 ...roups-without-connecting-systemstartbar.ly | 32 ++++++------
 ...ically-aligned-dynamics-and-textscripts.ly |  8 +--
 ...aligning-dynamics-across-multiple-notes.ly |  2 +-
 .../vertically-aligning-ossias-and-lyrics.ly  |  2 +-
 .../vertically-centered-common-lyrics.ly      |  2 +-
 ...template-with-automatic-piano-reduction.ly |  2 +-
 ...nsemble-template-with-verse-and-refrain.ly |  2 +-
 .../snippets/vocal-ensemble-template.ly       |  2 +-
 Documentation/snippets/vocal-headword.ly      |  2 +-
 Documentation/snippets/wind-headword.ly       |  2 +-
 185 files changed, 256 insertions(+), 248 deletions(-)
 rename Documentation/snippets/{alternative-breve-note.ly => alternative-breve-notes.ly} (67%)

diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely
index 903f5a7445..7590ab331d 100644
--- a/Documentation/de/notation/rhythms.itely
+++ b/Documentation/de/notation/rhythms.itely
@@ -154,7 +154,7 @@ siehe @ref{Richtung und Platzierung}.
 @snippets
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely
index 27d952aa8c..42e033bd40 100644
--- a/Documentation/es/notation/rhythms.itely
+++ b/Documentation/es/notation/rhythms.itely
@@ -151,7 +151,7 @@ pauta; véase @ref{Dirección y posición}.
 
 @snippets
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely
index e62e2e30a6..43484e2a1f 100644
--- a/Documentation/fr/notation/rhythms.itely
+++ b/Documentation/fr/notation/rhythms.itely
@@ -154,7 +154,7 @@ chapitre @ref{Direction et positionnement}.
 
 @snippets
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely
index 89e6d875b9..4e6cc9ab37 100644
--- a/Documentation/it/notation/rhythms.itely
+++ b/Documentation/it/notation/rhythms.itely
@@ -145,7 +145,7 @@ o sotto il rigo; si veda @ref{Direction and placement}.
 @snippets
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely
index 81e2140ccb..7ab58951ac 100644
--- a/Documentation/ja/notation/rhythms.itely
+++ b/Documentation/ja/notation/rhythms.itely
@@ -150,7 +150,7 @@ a4 b c4. b8 a4. b4.. c8.
 @snippets
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index a9acae8e84..d737ab53b2 100644
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -143,7 +143,7 @@ the staff; see @ref{Direction and placement}.
 @snippets
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
-{alternative-breve-note.ly}
+{alternative-breve-notes.ly}
 
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {changing-the-number-of-augmentation-dots-per-note.ly}
diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
index 7bbb2b88f8..f1526527fe 100644
--- a/Documentation/snippets/adding-ambitus-per-voice.ly
+++ b/Documentation/snippets/adding-ambitus-per-voice.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
diff --git a/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly b/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
index a72765ce44..da77339f4c 100644
--- a/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
+++ b/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "breaks, contexts-and-engravers, staff-notation, workaround"
diff --git a/Documentation/snippets/adding-an-extra-staff.ly b/Documentation/snippets/adding-an-extra-staff.ly
index aebfb4c5f4..2f73cd6fb3 100644
--- a/Documentation/snippets/adding-an-extra-staff.ly
+++ b/Documentation/snippets/adding-an-extra-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contexts-and-engravers, really-simple, staff-notation"
diff --git a/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly b/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
index c4375b789a..189e6bd58f 100644
--- a/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
+++ b/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index c8110e6465..c83540dfe3 100644
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "chords, specific-notation"
diff --git a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
index 968f846ddb..ab2a5d0729 100644
--- a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
+++ b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index bc3d8a2698..4a7b4ec66d 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "percussion, preparing-parts, really-simple, rhythms, specific-notation"
diff --git a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
index e33c79e28e..125eefab4a 100644
--- a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
+++ b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "staff-notation, symbols-and-glyphs, vocal-music"
diff --git a/Documentation/snippets/adding-links-to-objects.ly b/Documentation/snippets/adding-links-to-objects.ly
index d9d0d394fd..ccc1ac752d 100644
--- a/Documentation/snippets/adding-links-to-objects.ly
+++ b/Documentation/snippets/adding-links-to-objects.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
@@ -57,7 +57,7 @@ urlV =
 "http://lilypond.org/doc/v2.14/Documentation/notation/note-head-styles"
 
 \relative c' {
-  \key cis\minor
+  \key cis \minor
 
   \once \override Staff.Clef.color = #green
   \once \override Staff.Clef.after-line-breaking =
diff --git a/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
index b02159f1e6..fbc7f4f5e8 100644
--- a/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
+++ b/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, workaround"
diff --git a/Documentation/snippets/adjusting-grace-note-spacing.ly b/Documentation/snippets/adjusting-grace-note-spacing.ly
index ef48dbdc72..27c56037d0 100644
--- a/Documentation/snippets/adjusting-grace-note-spacing.ly
+++ b/Documentation/snippets/adjusting-grace-note-spacing.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index 135391e079..8c4c5a0377 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "correction-wanted, spacing, text, vocal-music, workaround"
diff --git a/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
index 6be1c88573..bae2867523 100644
--- a/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
+++ b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
index 271fa19067..42423671af 100644
--- a/Documentation/snippets/aligning-and-centering-instrument-names.ly
+++ b/Documentation/snippets/aligning-and-centering-instrument-names.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "paper-and-layout, text, titles"
diff --git a/Documentation/snippets/aligning-bar-numbers.ly b/Documentation/snippets/aligning-bar-numbers.ly
index fe1bc24ee3..0169d2bd41 100644
--- a/Documentation/snippets/aligning-bar-numbers.ly
+++ b/Documentation/snippets/aligning-bar-numbers.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
index fbb21f1f32..30ac47b22f 100644
--- a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
+++ b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
index 4d23d2f54f..62c873fbd5 100644
--- a/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
+++ b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly b/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
index a4c4fb073a..578166d1da 100644
--- a/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings, spacing, specific-notation"
diff --git a/Documentation/snippets/altering-the-length-of-beamed-stems.ly b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
index 271dc833f0..7bc55a46bf 100644
--- a/Documentation/snippets/altering-the-length-of-beamed-stems.ly
+++ b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/alternative-breve-note.ly b/Documentation/snippets/alternative-breve-notes.ly
similarity index 67%
rename from Documentation/snippets/alternative-breve-note.ly
rename to Documentation/snippets/alternative-breve-notes.ly
index 62f2a9eebe..d0a46a6900 100644
--- a/Documentation/snippets/alternative-breve-note.ly
+++ b/Documentation/snippets/alternative-breve-notes.ly
@@ -4,17 +4,17 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
 
   texidoc = "
-This code demonstrates how to use the alternative breve note with two
-vertical lines on each side of the notehead instead of one line.
+Breve notes are also available with two vertical lines on each side of
+the notehead instead of one line and in baroque style.
 
 "
-  doctitle = "Alternative breve note"
+  doctitle = "Alternative breve notes"
 } % begin verbatim
 
 \relative c'' {
@@ -22,6 +22,8 @@ vertical lines on each side of the notehead instead of one line.
   c\breve |
   \override Staff.NoteHead.style = #'altdefault
   b\breve
+  \override Staff.NoteHead.style = #'baroque
+  b\breve
   \revert Staff.NoteHead.style
   a\breve
 }
diff --git a/Documentation/snippets/analysis-brackets-above-the-staff.ly b/Documentation/snippets/analysis-brackets-above-the-staff.ly
index 1d017bfeb2..94f4fa693e 100644
--- a/Documentation/snippets/analysis-brackets-above-the-staff.ly
+++ b/Documentation/snippets/analysis-brackets-above-the-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, really-simple, tweaks-and-overrides"
diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
index 2174943686..1cc16afd5d 100644
--- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
+++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation, real-music, really-cool, template"
diff --git a/Documentation/snippets/ancient-time-signatures.ly b/Documentation/snippets/ancient-time-signatures.ly
index be2d034ee1..9121fd41fe 100644
--- a/Documentation/snippets/ancient-time-signatures.ly
+++ b/Documentation/snippets/ancient-time-signatures.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation"
diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index b416f073b7..cb44b02382 100644
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "template, vocal-music"
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index dd6a1509a7..1504812682 100644
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "world-music"
diff --git a/Documentation/snippets/asymmetric-slurs.ly b/Documentation/snippets/asymmetric-slurs.ly
index 4032f65c75..38ec88c04f 100644
--- a/Documentation/snippets/asymmetric-slurs.ly
+++ b/Documentation/snippets/asymmetric-slurs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
index dd1217ca59..4aee41074c 100644
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "automatic-notation, connecting-notes, rhythms"
diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index cd436d48c8..437d6f2e16 100644
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "chords, editorial-annotations, rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index 0e917a89fe..85b53bf4e5 100644
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/beams-across-line-breaks.ly b/Documentation/snippets/beams-across-line-breaks.ly
index 31016a6dad..3dbb16b8aa 100644
--- a/Documentation/snippets/beams-across-line-breaks.ly
+++ b/Documentation/snippets/beams-across-line-breaks.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
index 77c8ba6f8b..3f9b1cb164 100644
--- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, text"
diff --git a/Documentation/snippets/breathing-signs.ly b/Documentation/snippets/breathing-signs.ly
index 6de7514258..6a0e04445c 100644
--- a/Documentation/snippets/breathing-signs.ly
+++ b/Documentation/snippets/breathing-signs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, symbols-and-glyphs"
diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
index 496b280f22..f4eb1d81b4 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
diff --git a/Documentation/snippets/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
index a92d1a4f93..c7459189b1 100644
--- a/Documentation/snippets/caesura-railtracks-with-fermata.ly
+++ b/Documentation/snippets/caesura-railtracks-with-fermata.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, symbols-and-glyphs, tweaks-and-overrides"
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 2c49f43bf8..8ff363a61f 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, really-cool, scheme-language, text"
diff --git a/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly b/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
index c33594c4f0..75796a500c 100644
--- a/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
+++ b/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, really-simple, simultaneous-notes, specific-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/changing-beam-knee-gap.ly b/Documentation/snippets/changing-beam-knee-gap.ly
index ee62b27303..53951d78e9 100644
--- a/Documentation/snippets/changing-beam-knee-gap.ly
+++ b/Documentation/snippets/changing-beam-knee-gap.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
index 7c7fc1f3cb..3379a0e7bf 100644
--- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly
+++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly
index 66eeba5e9b..eb8621f004 100644
--- a/Documentation/snippets/changing-fret-orientations.ly
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
index 8a23b93b00..67aca5e5f1 100644
--- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
+++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contexts-and-engravers, midi, real-music"
diff --git a/Documentation/snippets/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
index 85416e2ecd..a1afe54ec1 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, vocal-music"
diff --git a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
index 42140648f2..feaa28fb9c 100644
--- a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
+++ b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/changing-the-ambitus-gap.ly b/Documentation/snippets/changing-the-ambitus-gap.ly
index bdf6cd76e4..1340a9a911 100644
--- a/Documentation/snippets/changing-the-ambitus-gap.ly
+++ b/Documentation/snippets/changing-the-ambitus-gap.ly
@@ -4,13 +4,14 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches"
 
   texidoc = "
-It is possible to change the default gap setting for ambitus.
+It is possible to change the default gap between the ambitus noteheads
+and the line joining them.
 
 "
   doctitle = "Changing the ambitus gap"
diff --git a/Documentation/snippets/changing-the-breath-mark-symbol.ly b/Documentation/snippets/changing-the-breath-mark-symbol.ly
index 6f60eeae9e..751e247f97 100644
--- a/Documentation/snippets/changing-the-breath-mark-symbol.ly
+++ b/Documentation/snippets/changing-the-breath-mark-symbol.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
index 148458a143..5b03828172 100644
--- a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
+++ b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
@@ -4,14 +4,14 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
 
   texidoc = "
-This code demonstrates how to change the number of augmentation dots on
-a single note.
+The number of augmentation dots on a single note can be changed
+indepently of the dots placed after the note.
 
 "
   doctitle = "Changing the number of augmentation dots per note"
diff --git a/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly b/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
index c4c3407ff0..2c9bd26458 100644
--- a/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
+++ b/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "specific-notation, staff-notation"
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index 2bae24bd60..badf2bb7ce 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
index 61c0926f80..99f19c46f0 100644
--- a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
+++ b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, pitches, really-cool"
diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
index 6755643400..628416a66d 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "simultaneous-notes, syntax-and-expressions, text"
diff --git a/Documentation/snippets/consistently-left-aligned-bar-numbers.ly b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
index 09a249ee21..0a3c0d849a 100644
--- a/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
+++ b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
index 77f640f792..aa885714e2 100644
--- a/Documentation/snippets/contemporary-glissando.ly
+++ b/Documentation/snippets/contemporary-glissando.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, expressive-marks, specific-notation"
diff --git a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
index 6e0a4fa06b..b44d09080a 100644
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
index 9b1e181d67..74dc40693a 100644
--- a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
+++ b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
index 7848983507..15b105a9d7 100644
--- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
+++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly
index d03593aa3d..4ac0ce78c3 100644
--- a/Documentation/snippets/creating-a-delayed-turn.ly
+++ b/Documentation/snippets/creating-a-delayed-turn.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
index 7429a8b13a..7a302b54ca 100644
--- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
+++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
diff --git a/Documentation/snippets/creating-text-spanners.ly b/Documentation/snippets/creating-text-spanners.ly
index d3f22e509a..9a9f5c2eaf 100644
--- a/Documentation/snippets/creating-text-spanners.ly
+++ b/Documentation/snippets/creating-text-spanners.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
index e1fc12417c..f443117fc2 100644
--- a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "chords, keyboards, tweaks-and-overrides, workaround"
diff --git a/Documentation/snippets/custodes.ly b/Documentation/snippets/custodes.ly
index 9a50dd54f8..4b8ea3ecc0 100644
--- a/Documentation/snippets/custodes.ly
+++ b/Documentation/snippets/custodes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation, specific-notation, symbols-and-glyphs, tweaks-and-overrides"
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index 3f9f147c3b..57f0549767 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/customizing-markup-fret-diagrams.ly b/Documentation/snippets/customizing-markup-fret-diagrams.ly
index 15ec25191c..00d4272b44 100644
--- a/Documentation/snippets/customizing-markup-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-markup-fret-diagrams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
index b4984d98d3..fe3caef840 100644
--- a/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
+++ b/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
index 59f9a46783..b4d6b9b24f 100644
--- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
+++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
index 0213ae17dc..93ab298b8b 100644
--- a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
@@ -4,16 +4,17 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
 
   texidoc = "
 If there is only one staff in one of the staff types @code{ChoirStaff}
-or @code{StaffGroup}, the bracket and the starting bar line will not be
-displayed as standard behavior.  This can be changed by overriding the
-relevant properties.
+or @code{StaffGroup}, by default the bracket and the starting bar line
+will not be displayed.  This can be changed by overriding
+@code{collapse-height} to set its value to be less than the number of
+staff lines in the staff.
 
 Note that in contexts such as @code{PianoStaff} and @code{GrandStaff}
 where the systems begin with a brace instead of a bracket, another
@@ -23,28 +24,22 @@ property has to be set, as shown on the second system in the example.
   doctitle = "Display bracket with only one staff in a system"
 } % begin verbatim
 
-
-\markup \left-column {
-  \score {
-    \new StaffGroup <<
-      % Must be lower than the actual number of staff lines
-      \override StaffGroup.SystemStartBracket.collapse-height = #1
-      \override Score.SystemStartBar.collapse-height = #1
-      \new Staff {
-        c'1
-      }
-    >>
-    \layout { }
-  }
-  \null
-  \score {
-    \new PianoStaff <<
-      \override PianoStaff.SystemStartBrace.collapse-height = #1
-      \override Score.SystemStartBar.collapse-height = #1
-      \new Staff {
-        c'1
-      }
-    >>
-    \layout { }
-  }
+\score {
+  \new StaffGroup <<
+    % Must be lower than the actual number of staff lines
+    \override StaffGroup.SystemStartBracket.collapse-height = #4
+    \override Score.SystemStartBar.collapse-height = #4
+    \new Staff {
+      c'1
+    }
+  >>
+}
+\score {
+  \new PianoStaff <<
+    \override PianoStaff.SystemStartBrace.collapse-height = #4
+    \override Score.SystemStartBar.collapse-height = #4
+    \new Staff {
+      c'1
+    }
+  >>
 }
diff --git a/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly b/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
index bb20ae2d0e..88580be58e 100644
--- a/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
+++ b/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contexts-and-engravers"
diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 1475f849c2..22a9347604 100644
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "chords, simultaneous-notes, workaround"
diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index 6d24f80b9c..91ced54b3c 100644
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "devel, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index 1f57c6af97..db877d1ba0 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/drawing-circles-around-note-heads.ly b/Documentation/snippets/drawing-circles-around-note-heads.ly
index bdefd884b5..571133282a 100644
--- a/Documentation/snippets/drawing-circles-around-note-heads.ly
+++ b/Documentation/snippets/drawing-circles-around-note-heads.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/drawing-circles-around-various-objects.ly b/Documentation/snippets/drawing-circles-around-various-objects.ly
index b429489a50..c1536c85b6 100644
--- a/Documentation/snippets/drawing-circles-around-various-objects.ly
+++ b/Documentation/snippets/drawing-circles-around-various-objects.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly
index a70cdc0822..8195dedcca 100644
--- a/Documentation/snippets/editorial-headword.ly
+++ b/Documentation/snippets/editorial-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/engraving-ties-manually.ly b/Documentation/snippets/engraving-ties-manually.ly
index 9d7334e2b6..309f7d7e2a 100644
--- a/Documentation/snippets/engraving-ties-manually.ly
+++ b/Documentation/snippets/engraving-ties-manually.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
index e009e39d75..90a5b4197d 100644
--- a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
+++ b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "repeats, rhythms"
diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly
index f85966b705..600176f493 100644
--- a/Documentation/snippets/expressive-headword.ly
+++ b/Documentation/snippets/expressive-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/expressive-marks.snippet-list b/Documentation/snippets/expressive-marks.snippet-list
index a2e5e4daaa..0bc43e26f9 100644
--- a/Documentation/snippets/expressive-marks.snippet-list
+++ b/Documentation/snippets/expressive-marks.snippet-list
@@ -2,7 +2,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
 adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
 adding-timing-marks-to-long-glissandi.ly
 adjusting-the-shape-of-falls-and-doits.ly
-alternative-breve-note.ly
+alternative-breve-notes.ly
 asymmetric-slurs.ly
 breathing-signs.ly
 broken-crescendo-hairpin.ly
diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index 7d51da86ef..ea05a99949 100644
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
index 0a55d7d30c..b604c78918 100644
--- a/Documentation/snippets/fine-tuning-pedal-brackets.ly
+++ b/Documentation/snippets/fine-tuning-pedal-brackets.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
diff --git a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
index 69e9ba280f..4e720cd602 100644
--- a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
+++ b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "symbols-and-glyphs, winds"
diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index 9fc5a82deb..b5264548a2 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific"
diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index 61ad10eaa6..1ccc3f15f6 100644
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, winds"
diff --git a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
index d2e0fdeafc..df76752ddd 100644
--- a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
+++ b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
index 3d809dfc21..2cf3c297a8 100644
--- a/Documentation/snippets/forcing-hyphens-to-be-shown.ly
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly b/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly
index 7d5ee5eccb..3973ceaf42 100644
--- a/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly
+++ b/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "staff-notation, workaround"
diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index a726c36c36..d420094cb5 100644
--- a/Documentation/snippets/fret-diagrams-explained-and-developed.ly
+++ b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
index f194ceef8b..b8e84a35d0 100644
--- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index aab467a429..46bac65c33 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, really-cool, scheme-language"
diff --git a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
index a8cc69047a..4a1a2e18d5 100644
--- a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "automatic-notation, really-cool, scheme-language"
diff --git a/Documentation/snippets/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly
index 326f53c224..5692e8b7cc 100644
--- a/Documentation/snippets/grid-lines--changing-their-appearance.ly
+++ b/Documentation/snippets/grid-lines--changing-their-appearance.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
index 5c99a078fe..0d4520a538 100644
--- a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+++ b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/hairpins-with-different-line-styles.ly b/Documentation/snippets/hairpins-with-different-line-styles.ly
index 3f425b9085..8ba6384747 100644
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
index 6860d66693..10ef37bc4f 100644
--- a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
+++ b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches"
diff --git a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
index cb9265d3c0..fbf03c8796 100644
--- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
+++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
index e86330ea51..68b3298279 100644
--- a/Documentation/snippets/how-to-change-fret-diagram-position.ly
+++ b/Documentation/snippets/how-to-change-fret-diagram-position.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
index 72e4407cbb..52ec0d2809 100644
--- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
+++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
index 1b91f1dbe8..1cb2a4cf7e 100644
--- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
+++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-2.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
index 810b9e06f3..e5836492b3 100644
--- a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "keyboards, real-music"
diff --git a/Documentation/snippets/inserting-a-caesura.ly b/Documentation/snippets/inserting-a-caesura.ly
index 0f47d66fa6..dee831f9f7 100644
--- a/Documentation/snippets/inserting-a-caesura.ly
+++ b/Documentation/snippets/inserting-a-caesura.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/keep-change-clefs-full-sized.ly b/Documentation/snippets/keep-change-clefs-full-sized.ly
index c232349709..73e4fa8ac7 100644
--- a/Documentation/snippets/keep-change-clefs-full-sized.ly
+++ b/Documentation/snippets/keep-change-clefs-full-sized.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/keyboard-headword.ly b/Documentation/snippets/keyboard-headword.ly
index bdffde49dc..779276ad17 100644
--- a/Documentation/snippets/keyboard-headword.ly
+++ b/Documentation/snippets/keyboard-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/laissez-vibrer-ties.ly b/Documentation/snippets/laissez-vibrer-ties.ly
index cec9ece6e2..84f71bc4d3 100644
--- a/Documentation/snippets/laissez-vibrer-ties.ly
+++ b/Documentation/snippets/laissez-vibrer-ties.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "connecting-notes, contemporary-notation, expressive-marks, fretted-strings, keyboards, specific-notation"
diff --git a/Documentation/snippets/line-arrows.ly b/Documentation/snippets/line-arrows.ly
index 4b183ca8b1..e217162ba0 100644
--- a/Documentation/snippets/line-arrows.ly
+++ b/Documentation/snippets/line-arrows.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
index f2320378ec..d9885a5a1a 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, text, vocal-music"
diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index f457f79834..ff675e01f8 100644
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
diff --git a/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly b/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
index 52931da3cc..3fd6982480 100644
--- a/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
+++ b/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, staff-notation, workaround"
diff --git a/Documentation/snippets/manually-controlling-beam-positions.ly b/Documentation/snippets/manually-controlling-beam-positions.ly
index ee3c1e5dfb..de306e8629 100644
--- a/Documentation/snippets/manually-controlling-beam-positions.ly
+++ b/Documentation/snippets/manually-controlling-beam-positions.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "connecting-notes, rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
index 740c6d2d82..6fcef7755a 100644
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, editorial-annotations, vocal-music, workaround"
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 41acc3aa80..b7d9b0ef63 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/measure-counter.ly b/Documentation/snippets/measure-counter.ly
index 1aeec7b051..cd71c0a0f7 100644
--- a/Documentation/snippets/measure-counter.ly
+++ b/Documentation/snippets/measure-counter.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, repeats, staff-notation, workaround"
diff --git a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
index a5def77609..bd8d0a7d94 100644
--- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation, contexts-and-engravers, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly
index a7741bf9e3..35f535a43e 100644
--- a/Documentation/snippets/modifying-tuplet-bracket-length.ly
+++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, rhythms"
diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
index 746d118b5d..88d76ca63f 100644
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
diff --git a/Documentation/snippets/moving-slur-positions-vertically.ly b/Documentation/snippets/moving-slur-positions-vertically.ly
index 90c0ac5e35..b54fcce28e 100644
--- a/Documentation/snippets/moving-slur-positions-vertically.ly
+++ b/Documentation/snippets/moving-slur-positions-vertically.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
index 15d1db3e97..575feba3f6 100644
--- a/Documentation/snippets/non-default-tuplet-numbers.ly
+++ b/Documentation/snippets/non-default-tuplet-numbers.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
index 411ae22bb0..8706e041e4 100644
--- a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
+++ b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/outputting-the-version-number.ly b/Documentation/snippets/outputting-the-version-number.ly
index 5952c5d79c..56043dfed6 100644
--- a/Documentation/snippets/outputting-the-version-number.ly
+++ b/Documentation/snippets/outputting-the-version-number.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, scheme-language, text, titles"
diff --git a/Documentation/snippets/page-label.ly b/Documentation/snippets/page-label.ly
index 497bedb12f..6e4ee79e08 100644
--- a/Documentation/snippets/page-label.ly
+++ b/Documentation/snippets/page-label.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "spacing"
diff --git a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
index 9691289857..819d95998a 100644
--- a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
+++ b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, version-specific"
diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly
index 779e0c4ad9..d3f67ec64e 100644
--- a/Documentation/snippets/pitches-headword.ly
+++ b/Documentation/snippets/pitches-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/positioning-arpeggios.ly b/Documentation/snippets/positioning-arpeggios.ly
index 9f8a81950d..ef672eda46 100644
--- a/Documentation/snippets/positioning-arpeggios.ly
+++ b/Documentation/snippets/positioning-arpeggios.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/positioning-fingering-indications-precisely.ly b/Documentation/snippets/positioning-fingering-indications-precisely.ly
index 4ac2b399f3..0b6a277d34 100644
--- a/Documentation/snippets/positioning-fingering-indications-precisely.ly
+++ b/Documentation/snippets/positioning-fingering-indications-precisely.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly b/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
index 299d4ad57e..68e4c5bff6 100644
--- a/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
+++ b/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
index 7403b67aa1..97d40b2c39 100644
--- a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
+++ b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
index 78da3919f4..1b6b52bf17 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "breaks, repeats, symbols-and-glyphs, workaround"
diff --git a/Documentation/snippets/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
index 284d051202..d8e4c3aad5 100644
--- a/Documentation/snippets/positioning-text-markups-inside-slurs.ly
+++ b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
index 8324912159..b788c3cd10 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -10,10 +10,11 @@
   lsrtags = "automatic-notation, pitches"
 
   texidoc = "
-In accordance with standard typesetting rules, a natural sign is
-printed before a sharp or flat if a previous accidental on the same
-note needs to be canceled.  To change this behavior, set the
-@code{extraNatural} property to @code{f} in the @code{Staff} context.
+In accordance with traditional typesetting rules, a natural sign is
+printed before a sharp or flat if a previous double sharp or flat on
+the same note  is canceled.  To change this behavior to contemporary
+practice, set the  @code{extraNatural} property to @code{f} in the
+@code{Staff} context.
 
 
 
@@ -21,7 +22,6 @@ note needs to be canceled.  To change this behavior, set the
   doctitle = "Preventing extra naturals from being automatically added"
 } % begin verbatim
 
-
 \relative c'' {
   aeses4 aes ais a
   \set Staff.extraNatural = ##f
diff --git a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
index df36257d66..4d82d6890e 100644
--- a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
+++ b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
index 94b4df81fa..acb87bc1a1 100644
--- a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
+++ b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
index 34128fc717..0360028f61 100644
--- a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
+++ b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
index 3689123de0..f669707a9b 100644
--- a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
+++ b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
index 3ccd0074b9..c9c257f35f 100644
--- a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
+++ b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
index 9383943c94..6569ea4878 100644
--- a/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
+++ b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index 1ba168738f..902709236a 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, percussion, real-music, really-cool, rhythms"
diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
index 660b1ee114..5fdf93ee9c 100644
--- a/Documentation/snippets/proportional-strict-notespacing.ly
+++ b/Documentation/snippets/proportional-strict-notespacing.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides"
diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
index e2c19a4a0c..28c185ae05 100644
--- a/Documentation/snippets/putting-lyrics-inside-the-staff.ly
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "staff-notation, text, vocal-music"
diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
index 9162ff14c9..ec7db5d4c6 100644
--- a/Documentation/snippets/quoting-another-voice.ly
+++ b/Documentation/snippets/quoting-another-voice.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index e244d3aec1..540f40c197 100644
--- a/Documentation/snippets/recorder-fingering-chart.ly
+++ b/Documentation/snippets/recorder-fingering-chart.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly b/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
index 9e093aa51b..49f187fbc2 100644
--- a/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
+++ b/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index 253ecadc97..368613aedb 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "breaks, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/repeats-headword.ly b/Documentation/snippets/repeats-headword.ly
index 612b4d5bee..118caf18b4 100644
--- a/Documentation/snippets/repeats-headword.ly
+++ b/Documentation/snippets/repeats-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index acdc83c10b..9af2492c81 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation, rhythms, symbols-and-glyphs, tweaks-and-overrides"
diff --git a/Documentation/snippets/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly
index 7ed0adfef9..8e9985b01c 100644
--- a/Documentation/snippets/rhythmic-slashes.ly
+++ b/Documentation/snippets/rhythmic-slashes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly
index 8554234480..30e393ebdf 100644
--- a/Documentation/snippets/rhythms-headword.ly
+++ b/Documentation/snippets/rhythms-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list
index 6f964e1c63..99c7a93f80 100644
--- a/Documentation/snippets/rhythms.snippet-list
+++ b/Documentation/snippets/rhythms.snippet-list
@@ -2,7 +2,7 @@ adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
 adding-drum-parts.ly
 adjusting-grace-note-spacing.ly
 aligning-bar-numbers.ly
-alternative-breve-note.ly
+alternative-breve-notes.ly
 automatic-beam-subdivisions.ly
 automatically-change-durations.ly
 avoiding-collisions-with-chord-fingerings.ly
diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly
index 94013aa8e2..d320a4aa80 100644
--- a/Documentation/snippets/screech-and-boink.ly
+++ b/Documentation/snippets/screech-and-boink.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
index f1a59ef5e7..5ab445a6ea 100644
--- a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
+++ b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
index 9955846c68..83ec1e4162 100644
--- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
+++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
index c206a60804..1b8e46697f 100644
--- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
+++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "repeats"
diff --git a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
index d71719fb56..21c1bfba8b 100644
--- a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
+++ b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly
index f73568efd7..0caae49e84 100644
--- a/Documentation/snippets/shortening-volta-brackets.ly
+++ b/Documentation/snippets/shortening-volta-brackets.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "repeats"
diff --git a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
index ea8981852f..b6f01f7194 100644
--- a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+++ b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides, version-specific"
diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index f11e002b77..43b9fc7f63 100644
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly
index c2175eb12d..415351d177 100644
--- a/Documentation/snippets/slides-in-tablature.ly
+++ b/Documentation/snippets/slides-in-tablature.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
index 58a4ee8e77..71c7637331 100644
--- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
+++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/stemlets.ly b/Documentation/snippets/stemlets.ly
index 2ce9721b96..3586b1c539 100644
--- a/Documentation/snippets/stemlets.ly
+++ b/Documentation/snippets/stemlets.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contemporary-notation, rhythms"
diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index 75596203ec..653cb7baf0 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 2b4d54e22b..83f5c23851 100644
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index cd1bbe2b9b..68acbc379c 100644
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "paper-and-layout"
diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly
index 052f60c004..cdb6178978 100644
--- a/Documentation/snippets/text-headword.ly
+++ b/Documentation/snippets/text-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/time-signature-in-parentheses---method-3.ly b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
index 6d6bf93ecc..d2ce70059c 100644
--- a/Documentation/snippets/time-signature-in-parentheses---method-3.ly
+++ b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
index 83b6e47425..cf91f8d33f 100644
--- a/Documentation/snippets/time-signature-in-parentheses.ly
+++ b/Documentation/snippets/time-signature-in-parentheses.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly b/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
index dcc877d1b1..b1726069c2 100644
--- a/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
+++ b/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
index dff1783af0..b816f06644 100644
--- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
+++ b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "ancient-notation, specific-notation, tweaks-and-overrides, workaround"
diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index 0526c67876..a05387a380 100644
--- a/Documentation/snippets/tweaking-clef-properties.ly
+++ b/Documentation/snippets/tweaking-clef-properties.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.18"
+\version "2.17.20"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
@@ -20,10 +20,12 @@ except @code{middleCPosition} are changed.
 Note that changing the glyph, the position of the clef, or the
 octavation does not in itself change the position of subsequent notes
 on the staff: the position of middle C must also be specified to do
-this. The positional parameters are relative to the staff center line,
-positive numbers displacing upwards, counting one for each line and
-space. The @code{clefTransposition} value would normally be set to 7, -7,
-15 or -15, but other values are valid.
+this. In order to get key signatures on the correct staff lines,
+@code{middleCClefPosition} must also be set.  The positional parameters
+are relative to the staff center line, positive numbers displacing
+upwards, counting one for each line and space. The
+@code{clefTransposition} value would normally be set to 7, -7, 15 or -15,
+but other values are valid.
 
 
 When a clef change takes place at a line break the new clef symbol is
@@ -43,36 +45,44 @@ line, they do not.
   doctitle = "Tweaking clef properties"
 } % begin verbatim
 
-
 \layout { ragged-right = ##t }
-
 {
   % The default treble clef
+  \key f \major
   c'1
   % The standard bass clef
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
   \set Staff.middleCPosition = #6
+  \set Staff.middleCClefPosition = #6
+  \key g \major
   c'1
   % The baritone clef
   \set Staff.clefGlyph = #"clefs.C"
   \set Staff.clefPosition = #4
   \set Staff.middleCPosition = #4
+  \set Staff.middleCClefPosition = #4
+  \key f \major
   c'1
   % The standard choral tenor clef
   \set Staff.clefGlyph = #"clefs.G"
   \set Staff.clefPosition = #-2
   \set Staff.clefTransposition = #-7
   \set Staff.middleCPosition = #1
+  \set Staff.middleCClefPosition = #1
+  \key f \major
   c'1
   % A non-standard clef
   \set Staff.clefPosition = #0
   \set Staff.clefTransposition = #0
   \set Staff.middleCPosition = #-4
+  \set Staff.middleCClefPosition = #-4
+  \key g \major
   c'1 \break
 
   % The following clef changes do not preserve
-  % the normal relationship between notes and clefs:
+  % the normal relationship between notes, key signatures
+  % and clefs:
 
   \set Staff.clefGlyph = #"clefs.F"
   \set Staff.clefPosition = #2
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index 8421507ab7..d4e6ea61f6 100644
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 0b71a75ab5..18793e40dd 100644
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
index 8e1ebeaca7..f6aa5a8e06 100644
--- a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
+++ b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "devel, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
index b29bff1616..89c69bd440 100644
--- a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
+++ b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly b/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
index fddce864d7..b2aea0c5ed 100644
--- a/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, tweaks-and-overrides"
diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly
index 38a39f6af7..85bb6a7045 100644
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks"
diff --git a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
index ca6a3ac017..3cfa3cb1dd 100644
--- a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
+++ b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
@@ -4,16 +4,14 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.19"
+\version "2.17.20"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, syntax-and-expressions"
 
   texidoc = "
-The code of this snippet shows how to achieve vertical aligned
-StaffGroups with a SystemStartBar for each StaffGroup, but without
-connecting them. This might be helpful for educational uses, but of
-course other  utilizations are thinkable.
+This snippet shows how to achieve vertically aligned StaffGroups with a
+SystemStartBar for each StaffGroup, but without connecting them.
 
 "
   doctitle = "Vertical aligned StaffGroups without connecting SystemStartBar"
@@ -67,7 +65,7 @@ eI =
                 \bold Teacher:
                 This is a simple setting of the choral. Please improve it.
                 }
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceOne
 
@@ -83,7 +81,7 @@ eI =
 
 eII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceTwo
         \partial 4
@@ -98,7 +96,7 @@ eII =
 
 eIII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceOne
@@ -114,7 +112,7 @@ eIII =
 
 eIV =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceTwo
@@ -153,7 +151,7 @@ exercise =
 sbI =
 \relative c' {
         \mark \markup { \bold" Pupil:" Here's my version! }
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceOne
 
@@ -169,7 +167,7 @@ sbI =
 
 sbII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceTwo
         \partial 4
@@ -184,7 +182,7 @@ sbII =
 
 sbIII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceOne
@@ -200,7 +198,7 @@ sbIII =
 
 sbIV =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceTwo
@@ -245,7 +243,7 @@ cbI =
                         "Do you know this one?"
                 }
         }
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceOne
 
@@ -261,7 +259,7 @@ cbI =
 
 cbII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \voiceTwo
         \partial 4
@@ -276,7 +274,7 @@ cbII =
 
 cbIII =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceOne
@@ -292,7 +290,7 @@ cbIII =
 
 cbIV =
 \relative c' {
-        \key a\minor
+        \key a \minor
         \time 4/4
         \clef bass
         \voiceTwo
diff --git a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
index 6c6fde759b..aafcba176a 100644
--- a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
+++ b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides, workaround"
@@ -16,13 +16,15 @@ aligned to a common reference point, regardless of their actual extent.
 This way, every element will be vertically aligned, thus producing a
 more pleasing output.
 
-The same idea, together with \\textLengthOn, is used to align the text
-scripts along their baseline.
+The same idea, together with @code{\\textLengthOn}, is used to align
+the text scripts along their baseline.
 
 "
   doctitle = "Vertically aligned dynamics and textscripts"
 } % begin verbatim
 
+\markup \vspace #1 %avoid LSR-bug
+
 music = \relative c' {
   a'2\p b\f
   e4\p f\f\> g, b\p
diff --git a/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
index 7e7634fe02..e1b721edd4 100644
--- a/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
+++ b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
index 584208687f..57c632fcf4 100644
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides, vocal-music"
diff --git a/Documentation/snippets/vertically-centered-common-lyrics.ly b/Documentation/snippets/vertically-centered-common-lyrics.ly
index c4bb6434c3..ef6dc99f8d 100644
--- a/Documentation/snippets/vertically-centered-common-lyrics.ly
+++ b/Documentation/snippets/vertically-centered-common-lyrics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
index a8575912bd..28e9344b7a 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "automatic-notation, keyboards, template, vocal-music"
diff --git a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
index 988080611a..9e48aea17a 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "contexts-and-engravers, template, vocal-music"
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index c6bb18f7f0..dcf727cafc 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "really-simple, template, vocal-music"
diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly
index 6551c97daa..27617725aa 100644
--- a/Documentation/snippets/vocal-headword.ly
+++ b/Documentation/snippets/vocal-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly
index d45434d60b..a52e96a773 100644
--- a/Documentation/snippets/wind-headword.ly
+++ b/Documentation/snippets/wind-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.17.20"
 
 \header {
   lsrtags = "headword"
-- 
2.39.2