From f71ede90de06fdc16dad9ed75f38558efe819080 Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Sun, 8 Apr 2012 18:35:34 +0100
Subject: [PATCH] New version of LSR upgrade

---
 Documentation/cs/learning/templates.itely     |   6 -
 Documentation/cs/usage/lilypond-book.itely    |   6 +-
 Documentation/de/learning/templates.itely     |   6 -
 Documentation/de/notation/vocal.itely         |   2 +-
 Documentation/de/usage/lilypond-book.itely    |   6 +-
 Documentation/es/learning/templates.itely     |   5 -
 Documentation/es/notation/vocal.itely         |   2 +-
 Documentation/es/usage/lilypond-book.itely    |   6 +-
 Documentation/fr/learning/templates.itely     |   5 -
 Documentation/fr/notation/vocal.itely         |   2 +-
 Documentation/fr/usage/lilypond-book.itely    |   6 +-
 Documentation/hu/usage/lilypond-book.itely    |   4 +-
 Documentation/it/learning/templates.itely     |   5 -
 Documentation/it/usage/lilypond-book.itely    |   6 +-
 Documentation/ja/learning/templates.itely     |   5 -
 Documentation/ja/notation/vocal.itely         |   2 +-
 Documentation/ja/usage/lilypond-book.itely    |   6 +-
 Documentation/learning/templates.itely        |   5 -
 Documentation/notation/vocal.itely            |   2 +-
 Documentation/po/cs.po                        |  40 +--
 Documentation/po/de.po                        |  40 +--
 Documentation/po/es.po                        |  40 +--
 Documentation/po/fr.po                        |  40 +--
 Documentation/po/hu.po                        |  40 +--
 Documentation/po/it.po                        |  40 +--
 Documentation/po/ja.po                        |  40 +--
 Documentation/po/lilypond-doc.pot             |  40 +--
 Documentation/po/nl.po                        |  40 +--
 Documentation/po/zh.po                        |  40 +--
 .../snippets/accordion-discant-symbols.ly     |   5 +-
 ...a-figured-bass-above-or-below-the-notes.ly |  13 +-
 .../snippets/adding-ambitus-per-voice.ly      |   5 +-
 .../adding-an-extra-staff-at-a-line-break.ly  |   5 +-
 .../snippets/adding-an-extra-staff.ly         |   5 +-
 .../adding-bar-lines-to-chordnames-context.ly |   5 +-
 ...hen-using-tuplet-and-non-tuplet-rhythms.ly |   3 +-
 Documentation/snippets/adding-drum-parts.ly   |   3 +-
 .../adding-extra-fingering-with-scheme.ly     |  53 +++
 .../snippets/adding-fingerings-to-a-score.ly  |   5 +-
 .../adding-fingerings-to-tablatures.ly        |  20 +-
 ...to-staves-which-get-split-after-a-break.ly |   4 +-
 ...ound-an-expressive-mark-or-chordal-note.ly |   5 +-
 .../adding-the-current-date-to-a-score.ly     |   5 +-
 ...ing-volta-brackets-to-additional-staves.ly |   3 +-
 .../additional-voices-to-avoid-collisions.ly  |   3 +-
 .../snippets/adjusting-grace-note-spacing.ly  |   5 +-
 .../adjusting-lyrics-vertical-spacing.ly      |  22 +-
 .../adjusting-the-shape-of-falls-and-doits.ly |   3 +-
 ...aligning-and-centering-instrument-names.ly |   3 +-
 .../snippets/aligning-bar-numbers.ly          |   3 +-
 ...ing-marks-with-various-notation-objects.ly |   3 +-
 ...-objects-created-with-the--mark-command.ly |   3 +-
 ...ngerings-to-be-printed-inside-the-staff.ly |   5 +-
 .../altering-the-length-of-beamed-stems.ly    |   3 +-
 .../snippets/alternative-breve-note.ly        |  34 +-
 .../snippets/ambitus-with-multiple-voices.ly  |   5 +-
 Documentation/snippets/ambitus.ly             |   5 +-
 .../analysis-brackets-above-the-staff.ly      |   5 +-
 Documentation/snippets/ancient-headword.ly    |  29 +-
 ...-modern-transcription-of-mensural-music.ly |   5 +-
 .../snippets/ancient-time-signatures.ly       |   3 +-
 .../snippets/anglican-psalm-template.ly       |   5 +-
 ...yles-depending-on-the-step-of-the-scale.ly |   5 +-
 .../snippets/arabic-improvisation.ly          |   3 +-
 Documentation/snippets/asymmetric-slurs.ly    |   5 +-
 .../snippets/automatic-beam-subdivisions.ly   |  22 +-
 .../snippets/automatic-notation.snippet-list  |   6 +
 .../automatically-change-durations.ly         |   3 +-
 ...oiding-collisions-with-chord-fingerings.ly |   5 +-
 .../snippets/beam-endings-in-score-context.ly |  21 +-
 .../snippets/beam-grouping-in-7-8-time.ly     |  28 +-
 .../snippets/beams-across-line-breaks.ly      |   3 +-
 ...staff-lines-using-the--whiteout-command.ly |   5 +-
 Documentation/snippets/book-parts.ly          |   3 +-
 Documentation/snippets/breathing-signs.ly     |   5 +-
 .../snippets/broken-crescendo-hairpin.ly      |   5 +-
 .../caesura-railtracks-with-fermata.ly        |   5 +-
 .../center-text-below-hairpin-dynamics.ly     |   5 +-
 .../snippets/changing--flageolet-mark-size.ly |   5 +-
 ...changing-a-single-notes-size-in-a-chord.ly |   5 +-
 .../snippets/changing-beam-knee-gap.ly        |   3 +-
 .../snippets/changing-chord-separator.ly      |   3 +-
 .../changing-form-of-multi-measure-rests.ly   |   5 +-
 .../snippets/changing-fret-orientations.ly    |   3 +-
 ...ng-midi-output-to-one-channel-per-voice.ly |   3 +-
 .../snippets/changing-partcombine-texts.ly    |   3 +-
 ...hanging-properties-for-individual-grobs.ly |   5 +-
 .../snippets/changing-stanza-fonts.ly         |   4 +-
 ...xt-and-spanner-styles-for-text-dynamics.ly |   5 +-
 .../snippets/changing-the-ambitus-gap.ly      |  26 +-
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly |   5 +-
 .../changing-the-breath-mark-symbol.ly        |   3 +-
 ...names-to-german-or-semi-german-notation.ly |   5 +-
 .../changing-the-default-text-font-family.ly  |   3 +-
 ...ging-the-interval-of-lines-on-the-stave.ly |   3 +-
 ...he-number-of-augmentation-dots-per-note.ly |  27 +-
 ...changing-the-number-of-lines-in-a-staff.ly |   5 +-
 ...e-positions-of-figured-bass-alterations.ly |   3 +-
 .../changing-the-size-of-woodwind-diagrams.ly |  23 +-
 .../snippets/changing-the-staff-size.ly       |   5 +-
 ...ging-the-tempo-without-a-metronome-mark.ly |   5 +-
 .../changing-the-text-for-sustain-markings.ly |   3 +-
 ...signature-without-affecting-the-beaming.ly |  68 ----
 .../snippets/changing-the-tuplet-number.ly    |   3 +-
 ...olymetric-section-using--scaledurations.ly |   5 +-
 .../snippets/chord-glissando-in-tablature.ly  |  27 +-
 .../snippets/chord-name-exceptions.ly         |   5 +-
 Documentation/snippets/chord-name-major7.ly   |   5 +-
 .../snippets/chordchanges-for-fretboards.ly   |  30 +-
 ...-can-be-transposed-by-arbitrary-amounts.ly |   3 +-
 Documentation/snippets/clip-systems.ly        |  21 +-
 Documentation/snippets/clusters.ly            |   5 +-
 ...coloring-notes-depending-on-their-pitch.ly |   4 +-
 .../combining-dynamics-with-markup-texts.ly   |   5 +-
 .../combining-two-parts-on-the-same-staff.ly  |   5 +-
 .../snippets/compound-time-signatures.ly      |  46 ++-
 .../snippets/connecting-notes.snippet-list    |   5 +
 .../snippets/contemporary-glissando.ly        |   5 +-
 .../contemporary-notation.snippet-list        |  13 +
 .../contexts-and-engravers.snippet-list       |   2 +-
 ...g-spanner-visibility-after-a-line-break.ly |  33 +-
 ...lling-the-placement-of-chord-fingerings.ly |   5 +-
 ...olling-the-vertical-ordering-of-scripts.ly |   5 +-
 .../controlling-tuplet-bracket-visibility.ly  |   5 +-
 .../snippets/correction-wanted.snippet-list   |   2 +
 .../snippets/creating-a-delayed-turn.ly       |   5 +-
 ...eggios-across-notes-in-different-voices.ly |   3 +-
 .../snippets/creating-blank-staves.ly         |   5 +-
 ...-cross-staff-arpeggios-in-a-piano-staff.ly |   3 +-
 ...cross-staff-arpeggios-in-other-contexts.ly |   3 +-
 .../creating-double-digit-fingerings.ly       |   5 +-
 ...creating-metronome-marks-in-markup-mode.ly |   3 +-
 .../creating-real-parenthesized-dynamics.ly   |   5 +-
 .../creating-simultaneous-rehearsal-marks.ly  |   4 +-
 .../snippets/creating-slurs-across-voices.ly  |   5 +-
 .../snippets/creating-text-spanners.ly        |   5 +-
 ...ff-chords---beaming-problems-workaround.ly |   6 +-
 .../snippets/cross-staff-tremolos.ly          |   5 +-
 Documentation/snippets/custodes.ly            |   5 +-
 .../customizing-fretboard-fret-diagrams.ly    |   3 +-
 .../customizing-markup-fret-diagrams.ly       |   3 +-
 ...f-stems-on-the-center-line-of-the-staff.ly |   3 +-
 ...n-engraver-in-scheme--ambitus-engraver.ly} |  13 -
 ...efined-fretboards-for-other-instruments.ly |  19 +-
 .../snippets/demo-midiinstruments.ly          |   5 +-
 .../snippets/demonstrating-all-headers.ly     |   3 +-
 Documentation/snippets/devel.snippet-list     |   2 +
 ...bracket-with-only-one-staff-in-a-system.ly |   3 +-
 .../snippets/displaying-complex-chords.ly     |  20 +-
 .../snippets/displaying-grob-ancestry.ly      |  66 ++--
 ...entals-for-each-note-including-naturals.ly |  75 -----
 Documentation/snippets/dotted-harmonics.ly    |   5 +-
 Documentation/snippets/double-glissando.ly    |   5 +-
 .../snippets/drawing-boxes-around-grobs.ly    |   5 +-
 .../drawing-circles-around-note-heads.ly      |   2 +-
 .../drawing-circles-around-various-objects.ly |   4 +-
 .../dynamics-custom-text-spanner-postfix.ly   |  31 +-
 .../snippets/dynamics-text-spanner-postfix.ly |  29 +-
 Documentation/snippets/editorial-headword.ly  |  33 +-
 ...ng-native-postscript-in-a--markup-block.ly |   5 +-
 .../snippets/engravers-one-by-one.ly          |  20 +-
 .../snippets/engraving-ties-manually.ly       |   3 +-
 .../engraving-tremolos-with-floating-beams.ly |   5 +-
 ...l-tuplets-using-only-one--times-command.ly |   5 +-
 Documentation/snippets/expressive-headword.ly |  34 +-
 .../snippets/expressive-marks.snippet-list    |   3 +-
 .../snippets/faking-a-hammer-in-tablatures.ly |  19 +-
 .../snippets/figured-bass-headword.ly         |  34 +-
 .../snippets/fine-tuning-pedal-brackets.ly    |   3 +-
 .../fingering-symbols-for-wind-instruments.ly |   4 +-
 ...-indications,-and-right-hand-fingerings.ly |   3 +-
 Documentation/snippets/flamenco-notation.ly   |  52 +--
 .../snippets/flat-flags-and-beam-nibs.ly      |   4 +-
 Documentation/snippets/flute-slap-notation.ly |   5 +-
 .../forcing-a-clef-symbol-to-be-displayed.ly  |   3 +-
 .../forcing-horizontal-shift-of-notes.ly      |   3 +-
 .../snippets/forcing-hyphens-to-be-shown.ly   |   3 +-
 ...-width-to-adapt-to-metronomemarks-width.ly |   5 +-
 ...-to-start-from-a-given-letter-or-number.ly |   5 +-
 .../snippets/formatting-lyrics-syllables.ly   |   6 +-
 .../fret-diagrams-explained-and-developed.ly  |   3 +-
 .../snippets/fretboards-alternate-tables.ly   |  36 +-
 .../fretted-string-harmonics-in-tablature.ly  |  22 +-
 .../snippets/fretted-strings.snippet-list     |   1 -
 .../snippets/generating-random-notes.ly       |   5 +-
 ...arts-in-scheme-without-using-the-parser.ly | 119 +++++++
 .../graphical-and-text-woodwind-diagrams.ly   |  27 +-
 .../grid-lines--changing-their-appearance.ly  |   3 +-
 ...izing-rhythms-and-notes-synchronization.ly |   3 +-
 Documentation/snippets/grouping-beats.ly      |  50 ---
 .../snippets/guitar-strum-rhythms.ly          |   5 +-
 .../hairpins-with-different-line-styles.ly    |   5 +-
 Documentation/snippets/headword.snippet-list  |  16 +
 ...y-customized-polymetric-time-signatures.ly |   5 +-
 ...tied-notes-at-the-start-of-a-new-system.ly |  30 +-
 ...ing-the-extender-line-for-text-dynamics.ly |   3 +-
 ...ynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly |   5 +-
 .../how-to-change-fret-diagram-position.ly    |   5 +-
 ...ove-and-below-the-same-barline-method-1.ly |   5 +-
 ...ove-and-below-the-same-barline-method-2.ly |   5 +-
 ...to-put-ties-between-syllables-in-lyrics.ly |   5 +-
 Documentation/snippets/hymn-template.ly       |   6 +-
 ...ross-staff-chords-with-arpeggio-bracket.ly |   5 +-
 Documentation/snippets/inserting-a-caesura.ly |   5 +-
 ...ore-fragments-above-a-staff,-as-markups.ly |   5 +-
 .../snippets/isolated-percent-repeats.ly      |   3 +-
 .../snippets/keep-change-clefs-full-sized.ly  |   3 +-
 Documentation/snippets/keyboard-headword.ly   |  35 +-
 Documentation/snippets/keyboards.snippet-list |   1 -
 Documentation/snippets/laissez-vibrer-ties.ly |   5 +-
 .../snippets/letter-tablature-formatting.ly   |  19 +-
 Documentation/snippets/line-arrows.ly         |   5 +-
 Documentation/snippets/lyrics-alignment.ly    |   5 +-
 .../snippets/lyrics-old-spacing-settings.ly   | 141 --------
 Documentation/snippets/makam-example.ly       |  20 +-
 ...aking-slurs-with-complex-dash-structure.ly |  43 ++-
 ...ome-staff-lines-thicker-than-the-others.ly |   5 +-
 ...ed-bass-extenders-for-only-some-numbers.ly |   3 +-
 .../manually-controlling-beam-positions.ly    |   5 +-
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |   5 +-
 Documentation/snippets/markup-lines.ly        |   3 +-
 Documentation/snippets/measure-counter.ly     |   4 +-
 ...che-layout-bar-lines-between-the-staves.ly |   5 +-
 ...ulti-measure-rests-in-a-polyphonic-part.ly |   5 +-
 .../snippets/modern-tab-text-clef.ly          |  32 --
 ...ues-for-articulation-shorthand-notation.ly |   3 +-
 .../modifying-tuplet-bracket-length.ly        |   5 +-
 .../moving-dotted-notes-in-polyphony.ly       |   5 +-
 .../moving-slur-positions-vertically.ly       |   5 +-
 .../snippets/multi-measure-rest-markup.ly     |   5 +-
 Documentation/snippets/nesting-staves.ly      |   5 +-
 .../new/adding-fingerings-to-tablatures.ly    |  37 ---
 .../new/adjusting-lyrics-vertical-spacing.ly  |  33 --
 .../snippets/new/alternative-breve-note.ly    |  13 -
 .../snippets/new/ancient-headword.ly          | 134 --------
 .../new/automatic-beam-subdivisions.ly        |  39 ---
 .../new/beam-endings-in-score-context.ly      |  43 ---
 .../snippets/new/beam-grouping-in-7-8-time.ly |  20 --
 .../snippets/new/changing-the-ambitus-gap.ly  |  40 ---
 ...he-number-of-augmentation-dots-per-note.ly |  17 -
 .../changing-the-size-of-woodwind-diagrams.ly |  31 --
 ...signature-without-affecting-the-beaming.ly |  19 --
 .../new/chord-glissando-in-tablature.ly       |  27 --
 .../new/chordchanges-for-fretboards.ly        |  23 --
 Documentation/snippets/new/clip-systems.ly    |  88 -----
 .../snippets/new/compound-time-signatures.ly  |  19 --
 ...g-spanner-visibility-after-a-line-break.ly |  37 ---
 ...n-engraver-in-scheme--ambitus-engraver.ly} |   0
 ...efined-fretboards-for-other-instruments.ly | 110 ------
 .../snippets/new/displaying-complex-chords.ly |  25 --
 .../snippets/new/displaying-grob-ancestry.ly  | 132 --------
 ...entals-for-each-note-including-naturals.ly |  23 --
 .../dynamics-custom-text-spanner-postfix.ly   |  35 --
 .../new/dynamics-text-spanner-postfix.ly      |  25 --
 .../snippets/new/editorial-headword.ly        |  99 ------
 .../snippets/new/engravers-one-by-one.ly      | 273 ---------------
 .../snippets/new/expressive-headword.ly       | 270 ---------------
 .../new/faking-a-hammer-in-tablatures.ly      |  19 --
 .../snippets/new/figured-bass-headword.ly     | 112 -------
 .../snippets/new/flamenco-notation.ly         | 250 --------------
 .../new/fretboards-alternate-tables.ly        |  75 -----
 .../fretted-string-harmonics-in-tablature.ly  |  74 -----
 .../graphical-and-text-woodwind-diagrams.ly   |  30 --
 Documentation/snippets/new/grouping-beats.ly  |  15 -
 ...tied-notes-at-the-start-of-a-new-system.ly |  15 -
 .../snippets/new/keyboard-headword.ly         | 248 --------------
 .../new/letter-tablature-formatting.ly        |  30 --
 Documentation/snippets/new/makam-example.ly   |  22 --
 ...aking-slurs-with-complex-dash-structure.ly |  36 --
 .../snippets/new/modern-tab-text-clef.ly      |  16 -
 .../new/non-default-tuplet-numbers.ly         |  41 ---
 .../new/non-traditional-key-signatures.ly     |  36 --
 .../new/open-string-harmonics-in-tablature.ly |  64 ----
 .../piano-template-with-centered-dynamics.ly  |  53 ---
 .../snippets/new/pitches-headword.ly          | 143 --------
 .../snippets/new/repeats-headword.ly          | 131 --------
 .../new/reverting-default-beam-endings.ly     |  21 --
 .../snippets/new/rhythms-headword.ly          | 216 ------------
 Documentation/snippets/new/screech-boink.ly   |  70 ----
 ...ing-the-double-repeat-default-for-volte.ly |  19 --
 ...ulation-above-and-below-a-note-or-chord.ly |  36 --
 .../snippets/new/simultaneous-headword.ly     | 314 ------------------
 .../snippets/new/slides-in-tablature.ly       |  38 ---
 .../stem-and-beam-behavior-in-tablature.ly    |  21 --
 .../snippets/new/subdividing-beams.ly         |  40 ---
 Documentation/snippets/new/text-headword.ly   | 234 -------------
 .../snippets/new/unfretted-headword.ly        | 230 -------------
 ...grob-object-to-access-grobs-with--tweak.ly |  75 -----
 .../new/using-the-whiteout-property.ly        |  30 --
 ...template-with-automatic-piano-reduction.ly | 101 ------
 ...nsemble-template-with-verse-and-refrain.ly |  99 ------
 .../snippets/new/vocal-ensemble-template.ly   |  94 ------
 Documentation/snippets/new/vocal-headword.ly  |  73 ----
 Documentation/snippets/new/wind-headword.ly   |  52 ---
 .../snippets/new/woodwind-diagrams-listing.ly |  95 ------
 .../snippets/non-default-tuplet-numbers.ly    |  27 +-
 .../non-traditional-key-signatures.ly         |  48 +--
 ...-2.12-lyrics-spacing-in-newer-versions.ly} |  23 +-
 .../open-string-harmonics-in-tablature.ly     |  24 +-
 .../orchestra,-choir-and-piano-template.ly    |   5 +-
 Documentation/snippets/ottava-text.ly         |   5 +-
 .../snippets/outputting-the-version-number.ly |   5 +-
 Documentation/snippets/page-label.ly          |   3 +-
 .../snippets/partcombine-and-autobeamoff.ly   |   5 +-
 .../percent-repeat-count-visibility.ly        |   3 +-
 .../snippets/percent-repeat-counter.ly        |   3 +-
 Documentation/snippets/percussion-beaters.ly  |   3 +-
 ...tting-line-breaks-within-beamed-tuplets.ly |   5 +-
 .../snippets/piano-template-simple.ly         |   5 +-
 .../piano-template-with-centered-dynamics.ly  | 106 ------
 .../piano-template-with-centered-lyrics.ly    |   5 +-
 .../piano-template-with-melody-and-lyrics.ly  |   5 +-
 Documentation/snippets/pitches-headword.ly    |  36 +-
 Documentation/snippets/pitches.snippet-list   |   1 -
 .../placement-of-right-hand-fingerings.ly     |   3 +-
 .../snippets/polyphony-in-tablature.ly        |   3 +-
 .../snippets/positioning-arpeggios.ly         |   5 +-
 ...tioning-fingering-indications-precisely.ly |   3 +-
 ...eams-at-the-height-of-normal-note-beams.ly |   3 +-
 ...tioning-grace-notes-with-floating-space.ly |   3 +-
 ...itioning-segno-and-coda-with-line-break.ly |   5 +-
 .../positioning-text-markups-inside-slurs.ly  |   5 +-
 .../snippets/preparing-parts.snippet-list     |   4 +
 ...naturals-from-being-automatically-added.ly |   5 +-
 ...g-final-mark-from-removing-final-tuplet.ly |  13 +-
 ...-printed-when-the-key-signature-changes.ly |   5 +-
 ...repeat-sign-at-the-beginning-of-a-piece.ly |   3 +-
 ...inting-bar-numbers-at-regular-intervals.ly |   3 +-
 ...ing-bar-numbers-inside-boxes-or-circles.ly |   5 +-
 ...nting-hairpins-using-al-niente-notation.ly |   3 +-
 .../printing-marks-at-the-end-of-a-line.ly    |   3 +-
 .../snippets/printing-marks-on-every-staff.ly |   3 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly |   5 +-
 ...ng-music-with-different-time-signatures.ly |   4 +-
 ...names-with-and-without-an-octave-marker.ly |   3 +-
 .../printing-text-from-right-to-left.ly       |   5 +-
 ...ng-the-bar-number-for-the-first-measure.ly |   3 +-
 .../proportional-strict-notespacing.ly        |   3 +-
 .../putting-lyrics-inside-the-staff.ly        |   4 +-
 ...uoting-another-voice-with-transposition.ly |   3 +-
 .../snippets/quoting-another-voice.ly         |   3 +-
 .../snippets/real-music.snippet-list          |  13 +
 .../snippets/really-cool.snippet-list         |  16 +
 .../snippets/really-simple.snippet-list       |  27 ++
 .../snippets/recorder-fingering-chart.ly      |   2 +-
 .../removing-bar-numbers-from-a-score.ly      |   5 +-
 ...n-staffgroup,-pianostaff,-or-grandstaff.ly |   5 +-
 .../snippets/removing-the-first-empty-line.ly |   5 +-
 Documentation/snippets/repeats-headword.ly    |  39 +--
 Documentation/snippets/rest-styles.ly         |   5 +-
 .../reverting-default-beam-endings.ly         |  24 +-
 Documentation/snippets/rhythmic-slashes.ly    |   5 +-
 Documentation/snippets/rhythms-headword.ly    |  35 +-
 Documentation/snippets/rhythms.snippet-list   |   2 -
 .../satb-choir-template---four-staves.ly      |   5 +-
 .../snippets/scheme-language.snippet-list     |  18 +
 ...{screech-boink.ly => screech-and-boink.ly} |  23 +-
 ...ancellations-from-key-signature-changes.ly |   2 +-
 .../setting-hairpin-behavior-at-bar-lines.ly  |   5 +-
 .../snippets/setting-system-separators.ly     |   5 +-
 ...ing-the-double-repeat-default-for-volte.ly |  27 +-
 .../setting-the-minimum-length-of-hairpins.ly |   3 +-
 .../snippets/shortening-volta-brackets.ly     |   3 +-
 .../snippets/showing-chords-at-changes.ly     |   3 +-
 ...ulation-above-and-below-a-note-or-chord.ly |  32 +-
 Documentation/snippets/simple-lead-sheet.ly   |   3 +-
 .../snippets/simultaneous-headword.ly         |  33 +-
 ...template-with-notes,-lyrics,-and-chords.ly |   5 +-
 ...te-with-notes,-lyrics,-chords-and-frets.ly |   5 +-
 ...le-staff-template-with-notes-and-chords.ly |   5 +-
 ...le-staff-template-with-notes-and-lyrics.ly |   5 +-
 .../single-staff-template-with-only-notes.ly  |   5 +-
 .../snippets/skips-in-lyric-mode-2.ly         |   5 +-
 Documentation/snippets/skips-in-lyric-mode.ly |   5 +-
 Documentation/snippets/slides-in-tablature.ly |  23 +-
 .../snap-pizzicato-bartok-pizzicato.ly        |  53 ---
 ... => snap-pizzicato-or-bartok-pizzicato.ly} |  16 +-
 .../snippets/specific-notation.snippet-list   |  29 ++
 .../snippets/staff-notation.snippet-list      |   2 +-
 .../snippets/stand-alone-two-column-markup.ly |   3 +-
 .../stem-and-beam-behavior-in-tablature.ly    |  21 +-
 Documentation/snippets/stemlets.ly            |   5 +-
 .../string-quartet-template-simple.ly         |   5 +-
 ...ng-quartet-template-with-separate-parts.ly |   5 +-
 .../snippets/stylesheet.snippet-list          |   1 +
 Documentation/snippets/subdividing-beams.ly   |  42 ++-
 ...sing-warnings-for-clashing-note-columns.ly |   3 +-
 .../snippets/symbols-and-glyphs.snippet-list  |  13 +
 .../syntax-and-expressions.snippet-list       |   2 +
 Documentation/snippets/table-of-contents.ly   |   3 +-
 Documentation/snippets/template.snippet-list  |   1 -
 Documentation/snippets/text-headword.ly       |  33 +-
 Documentation/snippets/three-sided-box.ly     |   5 +-
 Documentation/snippets/tick-bar-lines.ly      |   3 +-
 ...ime-signature-in-parentheses---method-3.ly |  25 ++
 .../snippets/time-signature-in-parentheses.ly |   5 +-
 ...tor-as-a-number-instead-of-the-fraction.ly |   5 +-
 ...scription-of-ancient-music-with-incipit.ly |   5 +-
 ...ith-minimum-accidentals-smart-transpose.ly |   5 +-
 .../snippets/tweaking-clef-properties.ly      |   3 +-
 .../tweaking-grace-layout-within-music.ly     |   5 +-
 .../tweaks-and-overrides.snippet-list         |   1 +
 Documentation/snippets/unfretted-headword.ly  |  38 +--
 .../snippets/unfretted-strings.snippet-list   |   2 +-
 ...e-bracket-at-the-start-of-a-staff-group.ly |   5 +-
 ...ggiobracket-to-make-divisi-more-visible.ly |   5 +-
 .../using-double-slurs-for-legato-chords.ly   |   3 +-
 ...grob-object-to-access-grobs-with--tweak.ly |  32 +-
 ...pt-to-generate-special-note-head-shapes.ly |   5 +-
 ...tweak-command-to-tweak-individual-grobs.ly |   5 +-
 .../snippets/using-the-whiteout-property.ly   |  41 +--
 .../snippets/using-ties-with-arpeggios.ly     |   3 +-
 Documentation/snippets/utf-8.ly               |   2 +-
 .../snippets/version-specific.snippet-list    |   8 +
 ...cal-line-as-a-baroque-articulation-mark.ly |   5 +-
 ...ically-aligned-dynamics-and-textscripts.ly |   5 +-
 ...aligning-dynamics-across-multiple-notes.ly |   3 +-
 .../vertically-aligning-ossias-and-lyrics.ly  |   3 +-
 .../vertically-centered-common-lyrics.ly      |   2 +-
 ...centering-paired-figured-bass-extenders.ly |   3 +-
 ...template-with-automatic-piano-reduction.ly |  20 +-
 ...rics-aligned-below-and-above-the-staves.ly |   5 +-
 ...nsemble-template-with-verse-and-refrain.ly |  27 +-
 .../snippets/vocal-ensemble-template.ly       |  20 +-
 Documentation/snippets/vocal-headword.ly      |  33 +-
 .../snippets/vocal-music.snippet-list         |   2 +-
 Documentation/snippets/volta-below-chords.ly  |   3 +-
 Documentation/snippets/volta-multi-staff.ly   |   5 +-
 .../volta-text-markup-using-repeatcommands.ly |   5 +-
 Documentation/snippets/wind-headword.ly       |  40 +--
 .../snippets/woodwind-diagrams-listing.ly     |  23 +-
 .../snippets/workaround.snippet-list          |  19 ++
 Documentation/usage/lilypond-book.itely       |   6 +-
 .../lilypond-book/tex-verbatim.lytex          |   2 +-
 434 files changed, 2102 insertions(+), 7022 deletions(-)
 create mode 100644 Documentation/snippets/adding-extra-fingering-with-scheme.ly
 create mode 100644 Documentation/snippets/automatic-notation.snippet-list
 delete mode 100644 Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
 create mode 100644 Documentation/snippets/connecting-notes.snippet-list
 create mode 100644 Documentation/snippets/contemporary-notation.snippet-list
 create mode 100644 Documentation/snippets/correction-wanted.snippet-list
 rename Documentation/snippets/{defining-an-engraver-in-scheme-ambitus-engraver.ly => defining-an-engraver-in-scheme--ambitus-engraver.ly} (97%)
 create mode 100644 Documentation/snippets/devel.snippet-list
 delete mode 100644 Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 create mode 100644 Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
 delete mode 100644 Documentation/snippets/grouping-beats.ly
 create mode 100644 Documentation/snippets/headword.snippet-list
 delete mode 100644 Documentation/snippets/lyrics-old-spacing-settings.ly
 delete mode 100644 Documentation/snippets/modern-tab-text-clef.ly
 delete mode 100644 Documentation/snippets/new/adding-fingerings-to-tablatures.ly
 delete mode 100644 Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
 delete mode 100644 Documentation/snippets/new/alternative-breve-note.ly
 delete mode 100644 Documentation/snippets/new/ancient-headword.ly
 delete mode 100644 Documentation/snippets/new/automatic-beam-subdivisions.ly
 delete mode 100644 Documentation/snippets/new/beam-endings-in-score-context.ly
 delete mode 100644 Documentation/snippets/new/beam-grouping-in-7-8-time.ly
 delete mode 100644 Documentation/snippets/new/changing-the-ambitus-gap.ly
 delete mode 100644 Documentation/snippets/new/changing-the-number-of-augmentation-dots-per-note.ly
 delete mode 100644 Documentation/snippets/new/changing-the-size-of-woodwind-diagrams.ly
 delete mode 100644 Documentation/snippets/new/changing-the-time-signature-without-affecting-the-beaming.ly
 delete mode 100644 Documentation/snippets/new/chord-glissando-in-tablature.ly
 delete mode 100644 Documentation/snippets/new/chordchanges-for-fretboards.ly
 delete mode 100644 Documentation/snippets/new/clip-systems.ly
 delete mode 100644 Documentation/snippets/new/compound-time-signatures.ly
 delete mode 100644 Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly
 rename Documentation/snippets/new/{defining-an-engraver-in-scheme-ambitus-engraver.ly => defining-an-engraver-in-scheme--ambitus-engraver.ly} (100%)
 delete mode 100644 Documentation/snippets/new/defining-predefined-fretboards-for-other-instruments.ly
 delete mode 100644 Documentation/snippets/new/displaying-complex-chords.ly
 delete mode 100644 Documentation/snippets/new/displaying-grob-ancestry.ly
 delete mode 100644 Documentation/snippets/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 delete mode 100644 Documentation/snippets/new/dynamics-custom-text-spanner-postfix.ly
 delete mode 100644 Documentation/snippets/new/dynamics-text-spanner-postfix.ly
 delete mode 100644 Documentation/snippets/new/editorial-headword.ly
 delete mode 100644 Documentation/snippets/new/engravers-one-by-one.ly
 delete mode 100644 Documentation/snippets/new/expressive-headword.ly
 delete mode 100644 Documentation/snippets/new/faking-a-hammer-in-tablatures.ly
 delete mode 100644 Documentation/snippets/new/figured-bass-headword.ly
 delete mode 100644 Documentation/snippets/new/flamenco-notation.ly
 delete mode 100644 Documentation/snippets/new/fretboards-alternate-tables.ly
 delete mode 100644 Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly
 delete mode 100644 Documentation/snippets/new/graphical-and-text-woodwind-diagrams.ly
 delete mode 100644 Documentation/snippets/new/grouping-beats.ly
 delete mode 100644 Documentation/snippets/new/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
 delete mode 100644 Documentation/snippets/new/keyboard-headword.ly
 delete mode 100644 Documentation/snippets/new/letter-tablature-formatting.ly
 delete mode 100644 Documentation/snippets/new/makam-example.ly
 delete mode 100644 Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly
 delete mode 100644 Documentation/snippets/new/modern-tab-text-clef.ly
 delete mode 100644 Documentation/snippets/new/non-default-tuplet-numbers.ly
 delete mode 100644 Documentation/snippets/new/non-traditional-key-signatures.ly
 delete mode 100644 Documentation/snippets/new/open-string-harmonics-in-tablature.ly
 delete mode 100644 Documentation/snippets/new/piano-template-with-centered-dynamics.ly
 delete mode 100644 Documentation/snippets/new/pitches-headword.ly
 delete mode 100644 Documentation/snippets/new/repeats-headword.ly
 delete mode 100644 Documentation/snippets/new/reverting-default-beam-endings.ly
 delete mode 100644 Documentation/snippets/new/rhythms-headword.ly
 delete mode 100644 Documentation/snippets/new/screech-boink.ly
 delete mode 100644 Documentation/snippets/new/setting-the-double-repeat-default-for-volte.ly
 delete mode 100644 Documentation/snippets/new/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
 delete mode 100644 Documentation/snippets/new/simultaneous-headword.ly
 delete mode 100644 Documentation/snippets/new/slides-in-tablature.ly
 delete mode 100644 Documentation/snippets/new/stem-and-beam-behavior-in-tablature.ly
 delete mode 100644 Documentation/snippets/new/subdividing-beams.ly
 delete mode 100644 Documentation/snippets/new/text-headword.ly
 delete mode 100644 Documentation/snippets/new/unfretted-headword.ly
 delete mode 100644 Documentation/snippets/new/using-ly-grob-object-to-access-grobs-with--tweak.ly
 delete mode 100644 Documentation/snippets/new/using-the-whiteout-property.ly
 delete mode 100644 Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly
 delete mode 100644 Documentation/snippets/new/vocal-ensemble-template-with-verse-and-refrain.ly
 delete mode 100644 Documentation/snippets/new/vocal-ensemble-template.ly
 delete mode 100644 Documentation/snippets/new/vocal-headword.ly
 delete mode 100644 Documentation/snippets/new/wind-headword.ly
 delete mode 100644 Documentation/snippets/new/woodwind-diagrams-listing.ly
 rename Documentation/snippets/{new/lyrics-old-spacing-settings.ly => obtaining-2.12-lyrics-spacing-in-newer-versions.ly} (75%)
 delete mode 100644 Documentation/snippets/piano-template-with-centered-dynamics.ly
 create mode 100644 Documentation/snippets/preparing-parts.snippet-list
 create mode 100644 Documentation/snippets/real-music.snippet-list
 create mode 100644 Documentation/snippets/really-cool.snippet-list
 create mode 100644 Documentation/snippets/really-simple.snippet-list
 create mode 100644 Documentation/snippets/scheme-language.snippet-list
 rename Documentation/snippets/{screech-boink.ly => screech-and-boink.ly} (81%)
 delete mode 100644 Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
 rename Documentation/snippets/{new/snap-pizzicato-bartok-pizzicato.ly => snap-pizzicato-or-bartok-pizzicato.ly} (52%)
 create mode 100644 Documentation/snippets/specific-notation.snippet-list
 create mode 100644 Documentation/snippets/stylesheet.snippet-list
 create mode 100644 Documentation/snippets/symbols-and-glyphs.snippet-list
 create mode 100644 Documentation/snippets/syntax-and-expressions.snippet-list
 create mode 100644 Documentation/snippets/time-signature-in-parentheses---method-3.ly
 create mode 100644 Documentation/snippets/version-specific.snippet-list
 create mode 100644 Documentation/snippets/workaround.snippet-list

diff --git a/Documentation/cs/learning/templates.itely b/Documentation/cs/learning/templates.itely
index 47bc383003..7cf3641076 100644
--- a/Documentation/cs/learning/templates.itely
+++ b/Documentation/cs/learning/templates.itely
@@ -83,12 +83,6 @@ not!
 {piano-template-with-centered-lyrics.ly}
 
 
-@appendixsubsec Klavír s vystředěným označením hlasitosti
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
-
 @node Smyčcový kvartet
 @appendixsec Smyčcový kvartet
 @translationof String quartet
diff --git a/Documentation/cs/usage/lilypond-book.itely b/Documentation/cs/usage/lilypond-book.itely
index 979a1ad5fa..cbc89e16a9 100644
--- a/Documentation/cs/usage/lilypond-book.itely
+++ b/Documentation/cs/usage/lilypond-book.itely
@@ -108,9 +108,9 @@ Optionen für \verb+lilypond+ werden dabei in eckige Klammern gesetzt.
 Größere Beispiele können auch in einer eigenständigen Datei gespeichert
 und dann mit \verb+\lilypondfile+ eingebunden werden.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(Falls nötig kann @file{screech-boink.ly} durch eine beliebige andere
+(Falls nötig kann @file{screech-and-boink.ly} durch eine beliebige andere
 @file{.ly}-Datei im selben Verzeichnis wie diese Datei ersetzt werden.)
 
 \end{document}
@@ -168,7 +168,7 @@ c'4 f16
 Größere Beispiele können auch in einer eigenständigen Datei gespeichert
 und dann mit @code{\lilypondfile} eingebunden werden.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 
 @page
diff --git a/Documentation/de/learning/templates.itely b/Documentation/de/learning/templates.itely
index 73e066c6a7..716c64140a 100644
--- a/Documentation/de/learning/templates.itely
+++ b/Documentation/de/learning/templates.itely
@@ -83,12 +83,6 @@ schönen Notenbild erfreuen!
 {piano-template-with-centered-lyrics.ly}
 
 
-@appendixsubsec Klavier mit zentrierten Lautstärkebezeichnungen
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
-
 @node Streichquartett
 @appendixsec Streichquartett
 @translationof String quartet
diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely
index 0b42e92543..dec9c62c78 100644
--- a/Documentation/de/notation/vocal.itely
+++ b/Documentation/de/notation/vocal.itely
@@ -1108,7 +1108,7 @@ indem man die gegebenen Beispiele modifiziert oder auch die
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 Handbuch zum Lernen:
diff --git a/Documentation/de/usage/lilypond-book.itely b/Documentation/de/usage/lilypond-book.itely
index 2069e0b3e0..fa95139ecf 100644
--- a/Documentation/de/usage/lilypond-book.itely
+++ b/Documentation/de/usage/lilypond-book.itely
@@ -109,9 +109,9 @@ Optionen für \verb+lilypond+ werden dabei in eckige Klammern gesetzt.
 Größere Beispiele können auch in einer eigenständigen Datei gespeichert
 und dann mit \verb+\lilypondfile+ eingebunden werden.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(Falls nötig kann @file{screech-boink.ly} durch eine beliebige andere
+(Falls nötig kann @file{screech-and-boink.ly} durch eine beliebige andere
 @file{.ly}-Datei im selben Verzeichnis wie diese Datei ersetzt werden.)
 
 \end{document}
@@ -170,7 +170,7 @@ c'4 f16
 Größere Beispiele können auch in einer eigenständigen Datei gespeichert
 und dann mit @code{\lilypondfile} eingebunden werden.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 Wenn man eine @code{tagline} (die Zeile unten auf der Seite) braucht
 (in Standard oder angepasst), dann muss der ganze Schnipsel in eine
diff --git a/Documentation/es/learning/templates.itely b/Documentation/es/learning/templates.itely
index ed3bcdc5b5..250f12ce78 100644
--- a/Documentation/es/learning/templates.itely
+++ b/Documentation/es/learning/templates.itely
@@ -75,11 +75,6 @@ unas hermosas partituras impresas!
 @lilypondfile[verbatim,quote,ragged-right,texidoc]
 {piano-template-with-centered-lyrics.ly}
 
-@appendixsubsec Piano con dinámicas centradas
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
 
 @node Cuarteto de cuerda
 @appendixsec Cuarteto de cuerda
diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely
index 1f2ec7fa8f..86c3a402d0 100644
--- a/Documentation/es/notation/vocal.itely
+++ b/Documentation/es/notation/vocal.itely
@@ -1126,7 +1126,7 @@ elaboración de los ejemplos anteriores, o examinando las plantillas de
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 Manual de aprendizaje:
diff --git a/Documentation/es/usage/lilypond-book.itely b/Documentation/es/usage/lilypond-book.itely
index 0917a8368b..c421d6f539 100644
--- a/Documentation/es/usage/lilypond-book.itely
+++ b/Documentation/es/usage/lilypond-book.itely
@@ -105,9 +105,9 @@ Las opciones se escriben entre corchetes.
 Los ejemplos grandes se pueden grabar en archivos separados e
 introducirse con \verb+\lilypondfile+.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(Si es necesario, sustituya @file{screech-boink.ly}
+(Si es necesario, sustituya @file{screech-and-boink.ly}
 por cualquier archivo @file{.ly}
 situado en el mismo directorio que este archivo.)
 
@@ -167,7 +167,7 @@ c'4 f16
 Los ejemplos grandes se pueden grabar en archivos separados e
 introducirse con @code{\lilypondfile}.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 Si se requiere un campo @code{tagline}, ya sea predeterminado o
 personalizado, entonces el fragmento completo se debe incluir dentro
diff --git a/Documentation/fr/learning/templates.itely b/Documentation/fr/learning/templates.itely
index fe31845c5d..bc071ab284 100644
--- a/Documentation/fr/learning/templates.itely
+++ b/Documentation/fr/learning/templates.itely
@@ -75,11 +75,6 @@ de lancer LilyPond, et d'aprécier le résultat.
 @lilypondfile[verbatim,quote,ragged-right,texidoc]
 {piano-template-with-centered-lyrics.ly}
 
-@appendixsubsec Piano et nuances entre les portées
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
 
 @node Quatuor à cordes
 @appendixsec Quatuor à cordes
diff --git a/Documentation/fr/notation/vocal.itely b/Documentation/fr/notation/vocal.itely
index 70c28a2df2..424980ae0a 100644
--- a/Documentation/fr/notation/vocal.itely
+++ b/Documentation/fr/notation/vocal.itely
@@ -1115,7 +1115,7 @@ d'initiation.
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 Manuel d'initiation :
diff --git a/Documentation/fr/usage/lilypond-book.itely b/Documentation/fr/usage/lilypond-book.itely
index c4de53c390..141c316731 100644
--- a/Documentation/fr/usage/lilypond-book.itely
+++ b/Documentation/fr/usage/lilypond-book.itely
@@ -113,9 +113,9 @@ Les options sont indiquées entre crochets.
 Des extraits plus conséquents peuvent faire l'objet d'un fichier
 indépendant, alors inclus avec \verb+\lilypondfile+.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(Si besoin, remplacez @file{screech-boink.ly} par
+(Si besoin, remplacez @file{screech-and-boink.ly} par
 n'importe quel fichier @file{.ly} qui se trouve dans
 le même répertoire que le présent fichier.)
 
@@ -178,7 +178,7 @@ c'4 f16
 Des extraits plus conséquents peuvent faire l'objet d'un fichier
 indépendant, alors inclus avec @code{\lilypondfile}.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 Lorsque vous désirez y inclure un @code{tagline}, personnalisé ou non,
 l'intégralité de l'extrait devra apparaître dans une construction de
diff --git a/Documentation/hu/usage/lilypond-book.itely b/Documentation/hu/usage/lilypond-book.itely
index 62151e72d4..9218de8264 100644
--- a/Documentation/hu/usage/lilypond-book.itely
+++ b/Documentation/hu/usage/lilypond-book.itely
@@ -98,7 +98,7 @@ A beállításokat szögletes zárójelbe kell tenni:
 A nagyobb kottapéldákat ki lehet emelni külön fájlba, majd beilleszteni
 őket a \verb+\lilypondfile+ paranccsal:
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 \end{document}
 @end verbatim
@@ -154,7 +154,7 @@ c'4 f16
 A nagyobb kottapéldákat ki lehet emelni külön fájlba, majd beilleszteni
 őket a @code{\lilypondfile} paranccsal:
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 
 @page
diff --git a/Documentation/it/learning/templates.itely b/Documentation/it/learning/templates.itely
index 6814ae2b6d..069d7f5d67 100644
--- a/Documentation/it/learning/templates.itely
+++ b/Documentation/it/learning/templates.itely
@@ -75,11 +75,6 @@ LilyPond e goderti dei belli spartiti!
 @lilypondfile[verbatim,quote,ragged-right,texidoc]
 {piano-template-with-centered-lyrics.ly}
 
-@appendixsubsec Pianoforte con dinamiche al centro
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
 
 @node Quartetto d'archi
 @appendixsec Quartetto d'archi
diff --git a/Documentation/it/usage/lilypond-book.itely b/Documentation/it/usage/lilypond-book.itely
index bc7561ea3b..6738940531 100644
--- a/Documentation/it/usage/lilypond-book.itely
+++ b/Documentation/it/usage/lilypond-book.itely
@@ -100,9 +100,9 @@ Le opzioni vengono specificate tra parentesi quadre.
 Se l'esempio è più grande, è possibile metterlo in un file separato e inserirlo
 con \verb+\lilypondfile+.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(Se vuoi provare, sostituisci @file{screech-boink.ly} con qualsiasi file @file{.ly}
+(Se vuoi provare, sostituisci @file{screech-and-boink.ly} con qualsiasi file @file{.ly}
 che si trovi nella stessa directory di questo file.)
 
 \end{document}
@@ -160,7 +160,7 @@ c'4 f16
 Se l'esempio è più grande, è possibile riportarlo in un file a parte e inserirlo
 con \verb+\lilypondfile+.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 Perché sia visibile la @code{tagline}, predefinita o personalizzata, l'intero
 frammento deve essere compreso in un costrutto @code{\book @{ @}}.
diff --git a/Documentation/ja/learning/templates.itely b/Documentation/ja/learning/templates.itely
index a2ccae7dae..59dbe20645 100644
--- a/Documentation/ja/learning/templates.itely
+++ b/Documentation/ja/learning/templates.itely
@@ -79,11 +79,6 @@
 @lilypondfile[verbatim,quote,ragged-right,texidoc]
 {piano-template-with-centered-lyrics.ly}
 
-@appendixsubsec 強弱記号が中央に配置されたピアノ譜
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
 
 @node 弦楽四重奏
 @appendixsec 弦楽四重奏
diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely
index 9b60692ed3..d781ac533c 100644
--- a/Documentation/ja/notation/vocal.itely
+++ b/Documentation/ja/notation/vocal.itely
@@ -1105,7 +1105,7 @@ contraltoWords = \lyricmode { Con -- tral -- to words }
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 学習マニュアル:
diff --git a/Documentation/ja/usage/lilypond-book.itely b/Documentation/ja/usage/lilypond-book.itely
index 96c03db943..6c1f34f6c4 100644
--- a/Documentation/ja/usage/lilypond-book.itely
+++ b/Documentation/ja/usage/lilypond-book.itely
@@ -108,9 +108,9 @@ Windows や Mac OS X のコマンド ラインを用いて @code{lilypond-book}
 大きな楽譜例は別のファイルに配置して、\verb+\lilypondfile+ で
 インポートすることができます。
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(必要があれば、@file{screech-boink.ly} をこのファイルと同じディレクトリ
+(必要があれば、@file{screech-and-boink.ly} をこのファイルと同じディレクトリ
 にある任意の @file{.ly} に置き換えてください。)
 
 \end{document}
@@ -170,7 +170,7 @@ c'4 f16
 大きな楽譜例は別のファイルに配置して、@code{\lilypondfile} で
 インポートすることができます。
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 デフォルトあるいはカスタムの @code{tagline} が必要であれば、
 楽譜コード断片全体を @code{\book @{ @}} 構造で囲んでください。
diff --git a/Documentation/learning/templates.itely b/Documentation/learning/templates.itely
index 039d4a9725..22e8be8771 100644
--- a/Documentation/learning/templates.itely
+++ b/Documentation/learning/templates.itely
@@ -72,11 +72,6 @@ beautiful printed scores!
 @lilypondfile[verbatim,quote,ragged-right,texidoc]
 {piano-template-with-centered-lyrics.ly}
 
-@appendixsubsec Piano centered dynamics
-
-@lilypondfile[verbatim,quote,ragged-right,texidoc]
-{piano-template-with-centered-dynamics.ly}
-
 
 @node String quartet
 @appendixsec String quartet
diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index c159c4cf18..f2ea75ca29 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -1092,7 +1092,7 @@ elaborating these examples, or by examining the
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 Learning Manual:
diff --git a/Documentation/po/cs.po b/Documentation/po/cs.po
index 3c73e6ba6a..b308bbe35d 100644
--- a/Documentation/po/cs.po
+++ b/Documentation/po/cs.po
@@ -1174,7 +1174,6 @@ msgstr "Hudební značky určující hlasitost (dynamika)"
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "Hudební značky určující hlasitost"
 
@@ -1451,7 +1450,6 @@ msgstr "Klavír"
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1479,7 +1477,6 @@ msgstr "nahoře"
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1693,9 +1690,8 @@ msgstr "jeden"
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1999,7 +1995,7 @@ msgstr "SopránText"
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -2017,7 +2013,7 @@ msgstr "AltText"
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2036,7 +2032,7 @@ msgstr "TenorText"
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2061,7 +2057,7 @@ msgstr "Dávat dohromady souběžně SborOsnova a PianoOsnova"
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2072,7 +2068,7 @@ msgstr "Soprány"
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2083,7 +2079,7 @@ msgstr "Alty"
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2094,7 +2090,7 @@ msgstr "Tenory"
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5355,7 +5351,7 @@ msgstr "Doprovod"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr "Slova"
 
@@ -8458,13 +8454,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr "Nahoře"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr "Dole"
 
@@ -10028,26 +10024,26 @@ msgstr "První věta"
 msgid "fermataLong"
 msgstr "DlouháFermáta"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr "SopránNoty"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr "Ženy"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10294,10 +10290,6 @@ msgstr "Povolit zalomení trámců na zalomeních řádků"
 msgid "Insert a manual line break within a tuplet"
 msgstr "Vložit do rytmické notové skupiny ruční zalomení řádku"
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr "Pedál"
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr "L. v. Beethoven"
diff --git a/Documentation/po/de.po b/Documentation/po/de.po
index d3eee73c6d..cdc50927d7 100644
--- a/Documentation/po/de.po
+++ b/Documentation/po/de.po
@@ -1164,7 +1164,6 @@ msgstr "Dynamik"
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "Dynamik"
 
@@ -1441,7 +1440,6 @@ msgstr "Klavier"
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1469,7 +1467,6 @@ msgstr "oben"
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1681,9 +1678,8 @@ msgstr "eins"
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1987,7 +1983,7 @@ msgstr "SopranText"
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -2005,7 +2001,7 @@ msgstr "AltText"
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2024,7 +2020,7 @@ msgstr "TenorText"
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2049,7 +2045,7 @@ msgstr "ChoirStaff und PianoStaff parallel kombinieren"
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2060,7 +2056,7 @@ msgstr "Sopran"
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2071,7 +2067,7 @@ msgstr "Alt"
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2082,7 +2078,7 @@ msgstr "Tenor"
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5304,7 +5300,7 @@ msgstr "Begleitung"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr "Worte"
 
@@ -8356,13 +8352,13 @@ msgstr "(7 ist der Standard)"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr "oben"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr "unten"
 
@@ -9919,26 +9915,26 @@ msgstr "Erster Satz"
 msgid "fermataLong"
 msgstr "LangeFermate"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr "SopranNoten"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr "Strophe 1"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr "Frauen"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10174,10 +10170,6 @@ msgstr "Balken können an Umbrüchen gebrochen werden"
 msgid "Insert a manual line break within a tuplet"
 msgstr "Manuellen Zeilenumbruch in N-tole"
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr "Pedal"
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr "L. v. Beethoven"
diff --git a/Documentation/po/es.po b/Documentation/po/es.po
index fa51bf1c00..b30b887c14 100644
--- a/Documentation/po/es.po
+++ b/Documentation/po/es.po
@@ -1162,7 +1162,6 @@ msgstr "Matices dinámicos"
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "matices dinámicos"
 
@@ -1439,7 +1438,6 @@ msgstr "piano"
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1467,7 +1465,6 @@ msgstr "superior"
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1680,9 +1677,8 @@ msgstr "uno"
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1989,7 +1985,7 @@ msgstr "letraSoprano"
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -2007,7 +2003,7 @@ msgstr "letraContralto"
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2026,7 +2022,7 @@ msgstr "letraTenor"
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2051,7 +2047,7 @@ msgstr "combinar ChoirStaff y PianoStaff en paralelo"
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2062,7 +2058,7 @@ msgstr "sopranos"
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2073,7 +2069,7 @@ msgstr "altos"
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2084,7 +2080,7 @@ msgstr "tenores"
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5312,7 +5308,7 @@ msgstr "acompanamiento"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr "letra"
 
@@ -8365,13 +8361,13 @@ msgstr "(7 es la longitud de plica predeterminada)"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr "arriba"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr "abajo"
 
@@ -9934,26 +9930,26 @@ msgstr "Primer movimiento"
 msgid "fermataLong"
 msgstr "calderonLargo"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr "musicaSoprano"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr "ESTROFA UNO"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr "mujeres"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10189,10 +10185,6 @@ msgstr "Permitir romper barras en saltos de línea"
 msgid "Insert a manual line break within a tuplet"
 msgstr "Insertar salto de línea manual dentro de un grupo especial"
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr "pedal"
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr "L. van Beethoven"
diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po
index e27fece463..912bb288f7 100644
--- a/Documentation/po/fr.po
+++ b/Documentation/po/fr.po
@@ -1110,7 +1110,6 @@ msgstr "Nuances"
 #. @rglos in Documentation/learning/common-notation.itely
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "nuances"
 
@@ -1364,7 +1363,6 @@ msgstr "piano"
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1387,7 +1385,6 @@ msgstr "superieur"
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1563,9 +1560,8 @@ msgstr "un"
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1806,7 +1802,7 @@ msgstr "sopranoParoles"
 
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -1822,7 +1818,7 @@ msgstr "altoParoles"
 
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -1839,7 +1835,7 @@ msgstr "tenorParoles"
 
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -1860,7 +1856,7 @@ msgstr "combinaison en parallèle du ChoirStaff et du PianoStaff"
 
 #. Documentation/learning/fundamental.itely:2613 (context id)
 #. Documentation/learning/fundamental.itely:2615 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -1869,7 +1865,7 @@ msgstr "soprani"
 
 #. Documentation/learning/fundamental.itely:2623 (context id)
 #. Documentation/learning/fundamental.itely:2625 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -1878,7 +1874,7 @@ msgstr "alti"
 
 #. Documentation/learning/fundamental.itely:2633 (context id)
 #. Documentation/learning/fundamental.itely:2635 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -1887,7 +1883,7 @@ msgstr "tenors"
 
 #. Documentation/learning/fundamental.itely:2643 (context id)
 #. Documentation/learning/fundamental.itely:2645 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -4979,7 +4975,7 @@ msgstr "accompagnement"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr "mots"
 
@@ -7182,13 +7178,13 @@ msgstr "(7 est la longueur par défaut des hampes)"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr "haut"
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr "bas"
 
@@ -8726,26 +8722,26 @@ msgstr "Premier mouvement"
 msgid "fermataLong"
 msgstr "pointdOrgue"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr "sopranoMusique"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr "PREMIER COUPLET"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr "femmes"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -8980,10 +8976,6 @@ msgstr "Autorise le saut de ligne dans une ligature"
 msgid "Insert a manual line break within a tuplet"
 msgstr "Insertion d'un saut de ligne manuel au milieu du triolet"
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr "pedale"
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr "L. van Beethoven"
diff --git a/Documentation/po/hu.po b/Documentation/po/hu.po
index f913d56ad6..abfdfb7078 100644
--- a/Documentation/po/hu.po
+++ b/Documentation/po/hu.po
@@ -1196,7 +1196,6 @@ msgstr "Dinamika"
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "dinamika"
 
@@ -1476,7 +1475,6 @@ msgstr "Szólózongora"
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1504,7 +1502,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1721,9 +1718,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -2032,7 +2028,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -2050,7 +2046,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2069,7 +2065,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2094,7 +2090,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2105,7 +2101,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2116,7 +2112,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2127,7 +2123,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5489,7 +5485,7 @@ msgstr "módosítójel"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 #, fuzzy
 msgid "words"
 msgstr "akkord"
@@ -8607,13 +8603,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -10178,26 +10174,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10437,10 +10433,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/po/it.po b/Documentation/po/it.po
index b804c423b8..1d9e2464fb 100644
--- a/Documentation/po/it.po
+++ b/Documentation/po/it.po
@@ -1151,7 +1151,6 @@ msgstr ""
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr ""
 
@@ -1428,7 +1427,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1456,7 +1454,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1669,9 +1666,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1975,7 +1971,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -1993,7 +1989,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2012,7 +2008,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2037,7 +2033,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2048,7 +2044,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2059,7 +2055,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2070,7 +2066,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5285,7 +5281,7 @@ msgstr ""
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr ""
 
@@ -8311,13 +8307,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -9851,26 +9847,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10105,10 +10101,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/po/ja.po b/Documentation/po/ja.po
index 78205f379b..76ffe4467f 100644
--- a/Documentation/po/ja.po
+++ b/Documentation/po/ja.po
@@ -1214,7 +1214,6 @@ msgstr "強弱記号"
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr "強弱記号 (dynamics)"
 
@@ -1498,7 +1497,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1527,7 +1525,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1743,9 +1740,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -2049,7 +2045,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -2067,7 +2063,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2086,7 +2082,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2111,7 +2107,7 @@ msgstr "ChoirStaff と PianoStaff を並列に組み合わせる"
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2122,7 +2118,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2133,7 +2129,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2144,7 +2140,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5497,7 +5493,7 @@ msgstr "臨時記号 (accidental)"
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 #, fuzzy
 msgid "words"
 msgstr "和音 (chord)"
@@ -8573,13 +8569,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -10129,26 +10125,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10386,10 +10382,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot
index 445b6ab5d7..ab5444e930 100644
--- a/Documentation/po/lilypond-doc.pot
+++ b/Documentation/po/lilypond-doc.pot
@@ -1149,7 +1149,6 @@ msgstr ""
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr ""
 
@@ -1426,7 +1425,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1454,7 +1452,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1666,9 +1663,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1972,7 +1968,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -1990,7 +1986,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2009,7 +2005,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2034,7 +2030,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2045,7 +2041,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2056,7 +2052,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2067,7 +2063,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5275,7 +5271,7 @@ msgstr ""
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr ""
 
@@ -8296,13 +8292,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -9830,26 +9826,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10084,10 +10080,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/po/nl.po b/Documentation/po/nl.po
index 5346a25f24..0ce4b27c82 100644
--- a/Documentation/po/nl.po
+++ b/Documentation/po/nl.po
@@ -1152,7 +1152,6 @@ msgstr ""
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr ""
 
@@ -1429,7 +1428,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1457,7 +1455,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1673,9 +1670,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1979,7 +1975,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -1997,7 +1993,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2016,7 +2012,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2041,7 +2037,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2052,7 +2048,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2063,7 +2059,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2074,7 +2070,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5293,7 +5289,7 @@ msgstr ""
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr ""
 
@@ -8325,13 +8321,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -9865,26 +9861,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10119,10 +10115,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/po/zh.po b/Documentation/po/zh.po
index 69eaad25c0..fdaeb1ddd0 100644
--- a/Documentation/po/zh.po
+++ b/Documentation/po/zh.po
@@ -1157,7 +1157,6 @@ msgstr ""
 #. @node in Documentation/music-glossary.tely
 #. @section in Documentation/music-glossary.tely
 #. @rglos in Documentation/cs/learning/common-notation.itely
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:82 (variable)
 msgid "dynamics"
 msgstr ""
 
@@ -1434,7 +1433,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:253 (context id)
 #. Documentation/snippets/piano-template-simple.ly:49 (variable)
 #. Documentation/snippets/piano-template-simple.ly:68 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:72 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:59 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:81 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:71 (variable)
@@ -1462,7 +1460,6 @@ msgstr ""
 #. Documentation/snippets/jazz-combo-template.ly:254 (context id)
 #. Documentation/snippets/piano-template-simple.ly:57 (variable)
 #. Documentation/snippets/piano-template-simple.ly:69 (context id)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:77 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:67 (variable)
 #. Documentation/snippets/piano-template-with-centered-lyrics.ly:83 (context id)
 #. Documentation/snippets/piano-template-with-melody-and-lyrics.ly:79 (variable)
@@ -1674,9 +1671,8 @@ msgstr ""
 #. Documentation/snippets/hymn-template.ly:89 (variable)
 #. Documentation/snippets/incipit.ly:73 (variable)
 #. Documentation/snippets/jazz-combo-template.ly:106 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:48 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:48 (variable)
 #. Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly:56 (variable)
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:67 (variable)
 #. Documentation/snippets/printing-music-with-different-time-signatures.ly:36 (variable)
 #. Documentation/snippets/satb-choir-template---four-staves.ly:52 (variable)
 #. Documentation/snippets/string-quartet-template-simple.ly:61 (variable)
@@ -1980,7 +1976,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2580 (variable)
 #. Documentation/notation/input.itely:1603 (variable)
 #. Documentation/cs/learning/fundamental.itely:2807 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:59 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:59 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:96 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:98 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:78 (variable)
@@ -1998,7 +1994,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2585 (variable)
 #. Documentation/notation/input.itely:1604 (variable)
 #. Documentation/cs/learning/fundamental.itely:2812 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:65 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:65 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:93 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:103 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:105 (variable)
@@ -2017,7 +2013,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2590 (variable)
 #. Documentation/notation/input.itely:1605 (variable)
 #. Documentation/cs/learning/fundamental.itely:2817 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:70 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:70 (variable)
 #. Documentation/snippets/orchestra,-choir-and-piano-template.ly:101 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:110 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:112 (variable)
@@ -2042,7 +2038,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2615 (context id)
 #. Documentation/cs/learning/fundamental.itely:2840 (context id)
 #. Documentation/cs/learning/fundamental.itely:2842 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:83 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:83 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:124 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:127 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:102 (context id)
@@ -2053,7 +2049,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2625 (context id)
 #. Documentation/cs/learning/fundamental.itely:2850 (context id)
 #. Documentation/cs/learning/fundamental.itely:2852 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:87 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:87 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:128 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:103 (context id)
@@ -2064,7 +2060,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2635 (context id)
 #. Documentation/cs/learning/fundamental.itely:2860 (context id)
 #. Documentation/cs/learning/fundamental.itely:2862 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:96 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:96 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:140 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:115 (context id)
@@ -2075,7 +2071,7 @@ msgstr ""
 #. Documentation/learning/fundamental.itely:2645 (context id)
 #. Documentation/cs/learning/fundamental.itely:2870 (context id)
 #. Documentation/cs/learning/fundamental.itely:2872 (context id)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:100 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:100 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:144 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:139 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:116 (context id)
@@ -5286,7 +5282,7 @@ msgstr ""
 #. Documentation/notation/changing-defaults.itely:491 (variable)
 #. Documentation/notation/changing-defaults.itely:540 (variable)
 #. Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly:117 (variable)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:75 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:75 (variable)
 msgid "words"
 msgstr ""
 
@@ -8309,13 +8305,13 @@ msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:47 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:273 (variable)
-#. Documentation/snippets/screech-boink.ly:18 (context id)
+#. Documentation/snippets/screech-and-boink.ly:18 (context id)
 msgid "up"
 msgstr ""
 
 #. Documentation/snippets/cross-staff-tremolos.ly:52 (context id)
 #. Documentation/snippets/jazz-combo-template.ly:279 (variable)
-#. Documentation/snippets/screech-boink.ly:48 (context id)
+#. Documentation/snippets/screech-and-boink.ly:48 (context id)
 msgid "down"
 msgstr ""
 
@@ -9843,26 +9839,26 @@ msgstr ""
 msgid "fermataLong"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:53 (variable)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:53 (variable)
 #. Documentation/snippets/vocal-ensemble-template.ly:89 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:91 (variable)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:71 (variable)
 msgid "sopMusic"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:54 (comment)
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:60 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:54 (comment)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:60 (comment)
 msgid "VERSE ONE"
 msgstr ""
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:82 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:82 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:123 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:126 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:101 (context id)
 msgid "women"
 msgstr "女"
 
-#. Documentation/snippets/lyrics-old-spacing-settings.ly:94 (context id)
+#. Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly:94 (context id)
 #. Documentation/snippets/vocal-ensemble-template.ly:138 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly:136 (context id)
 #. Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly:113 (context id)
@@ -10097,10 +10093,6 @@ msgstr ""
 msgid "Insert a manual line break within a tuplet"
 msgstr ""
 
-#. Documentation/snippets/piano-template-with-centered-dynamics.ly:86 (variable)
-msgid "pedal"
-msgstr ""
-
 #. Documentation/snippets/pitches-headword.ly:27 (comment)
 msgid "L. v. Beethoven"
 msgstr ""
diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index eb06bb7fc5..fa75b68e40 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "keyboards"
+  lsrtags = "specific-notation, keyboards, workaround, symbols-and-glyphs"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -38,6 +38,7 @@ vertical placement of the symbols can be tweaked by changing the
   doctitle = "Accordion-discant symbols"
 } % begin verbatim
 
+
 discant = \markup {
   \musicglyph #"accordion.discant"
 }
diff --git a/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly b/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
index d5fa2f1c3d..1fdbc0e770 100644
--- a/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords, ancient-notation, contexts-and-engravers"
+  lsrtags = "ancient-notation, contexts-and-engravers, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -45,19 +45,20 @@ whole score.
   doctitle = "Adding a figured bass above or below the notes"
 } % begin verbatim
 
+
 bass = {
   \clef bass
   g4 b, c d
   e d8 c d2
 }
 continuo = \figuremode {
-  <_>4 <6>8
-  \once \override Staff.BassFigureAlignmentPositioning #'direction = #CENTER
-  <5/>8 <_>4
+  <_>4 <6>4 <5/>4
   \override Staff.BassFigureAlignmentPositioning #'direction = #UP
-  <_+>4 <6>
+  %\bassFigureStaffAlignmentUp
+  < _+ >4 <6>
   \set Staff.useBassFigureExtenders = ##t
   \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN
+  %\bassFigureStaffAlignmentDown
   <4>4. <4>8 <_+>4
 }
 \score {
diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
index 0578e2d158..5be4ccd60f 100644
--- a/Documentation/snippets/adding-ambitus-per-voice.ly
+++ b/Documentation/snippets/adding-ambitus-per-voice.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, staff-notation, vocal-music"
+  lsrtags = "vocal-music, pitches, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   doctitlees = "Añadir un ámbito por voz"
@@ -50,6 +50,7 @@ manually to prevent collisions.
   doctitle = "Adding ambitus per voice"
 } % begin verbatim
 
+
 \new Staff <<
   \new Voice \with {
     \consists "Ambitus_engraver"
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 5ab3cd9432..155e25f5df 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, contexts-and-engravers, breaks"
+  lsrtags = "workaround, breaks, contexts-and-engravers, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -33,6 +33,7 @@ workaround is to add a setting of
   doctitle = "Adding an extra staff at a line break"
 } % begin verbatim
 
+
 \score {
   \new StaffGroup \relative c'' {
     \new Staff
diff --git a/Documentation/snippets/adding-an-extra-staff.ly b/Documentation/snippets/adding-an-extra-staff.ly
index e765b91988..73918168ab 100644
--- a/Documentation/snippets/adding-an-extra-staff.ly
+++ b/Documentation/snippets/adding-an-extra-staff.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, staff-notation, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -25,6 +25,7 @@ piece.
   doctitle = "Adding an extra staff"
 } % begin verbatim
 
+
 \score {
   <<
     \new Staff \relative c'' {
diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index dbfd4278cf..d988abb0da 100644
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords"
+  lsrtags = "specific-notation, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -43,6 +43,7 @@ To add bar line indications in the @code{ChordNames} context, add the
   doctitle = "Adding bar lines to ChordNames context"
 } % begin verbatim
 
+
 \new ChordNames \with {
   \override BarLine #'bar-extent = #'(-2 . 2)
   \consists "Bar_engraver"
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 9daffa3dc3..2f4ffc5f79 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms, expressive-marks"
@@ -41,6 +41,7 @@ sections (enclosed within curly braces).
   doctitle = "Adding beams slurs ties etc. when using tuplet and non-tuplet rhythms"
 } % begin verbatim
 
+
 {
   r16[ g16 \times 2/3 { r16 e'8] }
   g16( a \times 2/3 { b d e') }
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 1330b5c197..a290166166 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -7,7 +7,7 @@
 \version "2.15.32"
 
 \header {
-  lsrtags = "rhythms, percussion"
+  lsrtags = "preparing-parts, specific-notation, percussion, really-simple, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -49,6 +49,7 @@ lines is possible.
   doctitle = "Adding drum parts"
 } % begin verbatim
 
+
 drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh hhc8 hho hhc8 hh16 hh hhc4 r4 r2 }
 drl = \drummode { bd4 sn8 bd bd4 << bd ss >>  bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
 timb = \drummode { timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb }
diff --git a/Documentation/snippets/adding-extra-fingering-with-scheme.ly b/Documentation/snippets/adding-extra-fingering-with-scheme.ly
new file mode 100644
index 0000000000..00d00492c7
--- /dev/null
+++ b/Documentation/snippets/adding-extra-fingering-with-scheme.ly
@@ -0,0 +1,53 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "scheme-language"
+
+  texidoc = "
+You can add various stuff to notes using @code{make-music}. In this
+example, an extra fingering is attached to a note.
+
+
+In general, first do a @code{display} of the music you want to create,
+then write a function that will structure the music for you.
+
+
+
+"
+  doctitle = "Adding extra fingering with scheme"
+} % begin verbatim
+
+
+#(define (make-text-script x)
+   (make-music 'TextScriptEvent
+               'direction DOWN
+               'text (make-simple-markup x)))
+
+#(define (add-text-script m x)
+   (if (equal? (ly:music-property m 'name) 'EventChord)
+       (set! (ly:music-property m 'elements)
+             (cons (make-text-script x)
+                  (ly:music-property m 'elements)))
+       (let ((es (ly:music-property m 'elements))
+	     (e (ly:music-property m 'element)))
+	 (map (lambda (y) (add-text-script y x)) es)
+	 (if (ly:music? e)
+	     (add-text-script e x))))
+   m)
+
+addScript =
+#(define-music-function (parser location script music )
+					( string? ly:music? )
+		(add-text-script music script))
+
+\score {
+  {
+    \addScript "6" { c'4-3 }
+  }
+}
diff --git a/Documentation/snippets/adding-fingerings-to-a-score.ly b/Documentation/snippets/adding-fingerings-to-a-score.ly
index 9be53a6096..c976ace387 100644
--- a/Documentation/snippets/adding-fingerings-to-a-score.ly
+++ b/Documentation/snippets/adding-fingerings-to-a-score.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, fretted-strings"
+  lsrtags = "editorial-annotations, fretted-strings, really-simple"
 
   texidoc = "
 Fingering instructions can be entered using a simple syntax.
@@ -16,6 +16,7 @@ Fingering instructions can be entered using a simple syntax.
   doctitle = "Adding fingerings to a score"
 } % begin verbatim
 
+
 \relative c'' {
   c4-1 d-2 f-4 e-3
 }
diff --git a/Documentation/snippets/adding-fingerings-to-tablatures.ly b/Documentation/snippets/adding-fingerings-to-tablatures.ly
index d874f03cda..b85e45cc4a 100644
--- a/Documentation/snippets/adding-fingerings-to-tablatures.ly
+++ b/Documentation/snippets/adding-fingerings-to-tablatures.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Para añadir digitaciones a las tablaturas, utilice una combinación de
@@ -25,15 +26,16 @@ L'ajout de doigtés à des tablatures s'obtient en conjuguant des
 "
   doctitlefr = "Ajout de doigtés à des tablatures"
 
-  lsrtags = "fretted-strings"
   texidoc = "
 To add fingerings to tablatures, use a combination of @code{\\markup}
 and @code{\\finger}.
+
 "
   doctitle = "Adding fingerings to tablatures"
 } % begin verbatim
 
 
+
 one = \markup { \finger 1 }
 two = \markup { \finger 2 }
 threeTwo = \markup {
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 4bf11a8362..4d666d5fc8 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, vocal-music"
+  lsrtags = "vocal-music, symbols-and-glyphs, staff-notation"
 
   texidoc = "
 This snippet defines the @code{\\splitStaffBarLine} command, which adds
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 5b88027b35..1752ba0006 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "workaround, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -26,6 +26,7 @@ objects in parentheses.  The associated grob is @code{ParenthesesItem}.
   doctitle = "Adding parentheses around an expressive mark or chordal note"
 } % begin verbatim
 
+
 \relative c' {
   c2-\parenthesize ->
   \override ParenthesesItem #'padding = #0.1
diff --git a/Documentation/snippets/adding-the-current-date-to-a-score.ly b/Documentation/snippets/adding-the-current-date-to-a-score.ly
index 0faa84c6b4..8f0ee5833b 100644
--- a/Documentation/snippets/adding-the-current-date-to-a-score.ly
+++ b/Documentation/snippets/adding-the-current-date-to-a-score.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, titles"
+  lsrtags = "text, really-cool, titles, scheme-language"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -32,6 +32,7 @@ score.
   doctitle = "Adding the current date to a score"
 } % begin verbatim
 
+
 % first, define a variable to hold the formatted date:
 date = #(strftime "%d-%m-%Y" (localtime (current-time)))
 
diff --git a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
index 5bfcae9cb1..9cd608229b 100644
--- a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
+++ b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats"
@@ -56,6 +56,7 @@ should appear; see also the @qq{Volta multi staff} snippet.
   doctitle = "Adding volta brackets to additional staves"
 } % begin verbatim
 
+
 <<
   \new Staff { \repeat volta 2 { c'1 } \alternative { c' } }
   \new Staff { \repeat volta 2 { c'1 } \alternative { c' } }
diff --git a/Documentation/snippets/additional-voices-to-avoid-collisions.ly b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
index a3b2dec582..ebdf72e013 100644
--- a/Documentation/snippets/additional-voices-to-avoid-collisions.ly
+++ b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "simultaneous-notes"
@@ -51,6 +51,7 @@ a variable using the Scheme function @code{context-spec-music}.
   doctitle = "Additional voices to avoid collisions"
 } % begin verbatim
 
+
 voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 \relative c'' {
diff --git a/Documentation/snippets/adjusting-grace-note-spacing.ly b/Documentation/snippets/adjusting-grace-note-spacing.ly
index e6aa391fa7..645acd39e0 100644
--- a/Documentation/snippets/adjusting-grace-note-spacing.ly
+++ b/Documentation/snippets/adjusting-grace-note-spacing.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -26,6 +26,7 @@ The space given to grace notes can be adjusted using the
   doctitle = "Adjusting grace note spacing"
 } % begin verbatim
 
+
 graceNotes = {
   \grace { c4 c8 c16 c32 }
   c8
diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index 11f6268aba..267119636c 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "correction-wanted, vocal-music, workaround, text, spacing"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Este fragmento de código muestra cómo situar la línea de base de la
@@ -26,15 +27,16 @@ de la portée.
   doctitlefr = "Ajustement de l'espacement vertical des paroles"
 
 
-  lsrtags = "text, vocal-music, spacing"
   texidoc = "
 This snippet shows how to bring the lyrics line closer to the staff.
+[This behaviour is no longer used from version 2.13 onwards.]
 
 "
   doctitle = "Adjusting lyrics vertical spacing"
 } % begin verbatim
 
 
+
 % Default layout:
 <<
   \new Staff \new Voice = melody \relative c' {
@@ -44,7 +46,6 @@ This snippet shows how to bring the lyrics line closer to the staff.
   }
   \new Lyrics \lyricsto melody { aa aa aa aa aa aa aa aa aa }
 
-  % Reducing the minimum space below the staff and above the lyrics:
   \new Staff {
     \new Voice = melody \relative c' {
       c4 d e f
@@ -52,6 +53,7 @@ This snippet shows how to bring the lyrics line closer to the staff.
       c1
     }
   }
+  % Reducing the minimum space below the staff and above the lyrics:
   \new Lyrics \with {
     \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((basic-distance . 1))
   }
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 37f7fa372e..18bd8efaf6 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -44,6 +44,7 @@ adjust the shape of falls and doits.
   doctitle = "Adjusting the shape of falls and doits"
 } % begin verbatim
 
+
 \relative c'' {
   \override Score.SpacingSpanner #'shortest-duration-space = #4.0
   c2-\bendAfter #5
diff --git a/Documentation/snippets/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
index 547c31a181..6b18419444 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
@@ -32,6 +32,7 @@ and the following systems, respectively.
   doctitle = "Aligning and centering instrument names"
 } % begin verbatim
 
+
 \paper {
   left-margin = 3\cm
 }
diff --git a/Documentation/snippets/aligning-bar-numbers.ly b/Documentation/snippets/aligning-bar-numbers.ly
index 314e55888d..9a50378be9 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -58,6 +58,7 @@ positioned directly over the bar line or left-aligned to the bar line.
   doctitle = "Aligning bar numbers"
 } % begin verbatim
 
+
 \relative c' {
   \set Score.currentBarNumber = #111
   \override Score.BarNumber #'break-visibility = #all-visible
diff --git a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
index 9eab5e7f4e..cca927d4a6 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
@@ -83,6 +83,7 @@ be done for all the staves).
   doctitle = "Aligning marks with various notation objects"
 } % begin verbatim
 
+
 \relative c' {
   e1
 
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 5c55788f94..bb807fa7f2 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
@@ -17,6 +17,7 @@ This behavior can be modified to align at right or left.
   doctitle = "Aligning objects created with the \\mark command"
 } % begin verbatim
 
+
 \relative c' {
   c1 \mark "(Center)"
   c1
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 862816efa3..8a1b4edd7b 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, fretted-strings, spacing"
+  lsrtags = "specific-notation, editorial-annotations, fretted-strings, spacing"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
@@ -48,6 +48,7 @@ chord construct <>, even if it is only a single note.
   doctitle = "Allowing fingerings to be printed inside the staff"
 } % begin verbatim
 
+
 \relative c' {
   <c-1 e-2 g-3 b-5>2
   \override Fingering #'staff-padding = #'()
diff --git a/Documentation/snippets/altering-the-length-of-beamed-stems.ly b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
index 953db32461..a6cf24896b 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
@@ -40,6 +40,7 @@ of the final argument.  Non-integer arguments may also be used.
   doctitle = "Altering the length of beamed stems"
 } % begin verbatim
 
+
 \relative c'' {
   \override Stem #'(details beamed-lengths) = #'(2)
   a8[ a] a16[ a] a32[ a]
diff --git a/Documentation/snippets/alternative-breve-note.ly b/Documentation/snippets/alternative-breve-note.ly
index 7b90b4982a..a3508cc1ed 100644
--- a/Documentation/snippets/alternative-breve-note.ly
+++ b/Documentation/snippets/alternative-breve-note.ly
@@ -1,12 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
 \header {
+  lsrtags = "rhythms, expressive-marks"
+
 %% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
 Este código muestra cómo usar la forma alternativa de la breve con dos
@@ -31,15 +33,19 @@ flanquée de deux barres verticales, au lieu d'une comme habituellement.
 "
   doctitlefr = "Brève alternative avec deux barres verticales"
 
-  lsrtags = "rhythms,expressive-marks"
-  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."
-  doctitle = "Alternative breve notehead with double vertical lines"
-} % begin verbatim
+  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.
 
+"
+  doctitle = "Alternative breve note"
+} % begin verbatim
 
 \relative c'' {
   \time 4/2
+  c\breve |
   \override Staff.NoteHead #'style = #'altdefault
-  c\breve | b\breve
+  b\breve
+  \revert Staff.NoteHead #'style
+  a\breve
 }
diff --git a/Documentation/snippets/ambitus-with-multiple-voices.ly b/Documentation/snippets/ambitus-with-multiple-voices.ly
index 3e35634b2c..cf8049dc95 100644
--- a/Documentation/snippets/ambitus-with-multiple-voices.ly
+++ b/Documentation/snippets/ambitus-with-multiple-voices.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, vocal-music"
+  lsrtags = "vocal-music, pitches"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   doctitlees = "Ámbitos con varias voces"
@@ -55,6 +55,7 @@ voices.
   doctitle = "Ambitus with multiple voices"
 } % begin verbatim
 
+
 \new Staff \with {
   \consists "Ambitus_engraver"
   }
diff --git a/Documentation/snippets/ambitus.ly b/Documentation/snippets/ambitus.ly
index 882dab4608..9bd73a090c 100644
--- a/Documentation/snippets/ambitus.ly
+++ b/Documentation/snippets/ambitus.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, vocal-music"
+  lsrtags = "vocal-music, pitches"
 
   texidoc = "
 Ambitus indicate pitch ranges for voices.
@@ -20,6 +20,7 @@ Accidentals only show up if they are not part of the key signature.
   doctitle = "Ambitus"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Voice
diff --git a/Documentation/snippets/analysis-brackets-above-the-staff.ly b/Documentation/snippets/analysis-brackets-above-the-staff.ly
index a4d0431fa9..1efc7b6f3e 100644
--- a/Documentation/snippets/analysis-brackets-above-the-staff.ly
+++ b/Documentation/snippets/analysis-brackets-above-the-staff.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, tweaks-and-overrides, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ staff instead.
   doctitle = "Analysis brackets above the staff"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Voice
diff --git a/Documentation/snippets/ancient-headword.ly b/Documentation/snippets/ancient-headword.ly
index dc9cc0c34b..360be3f64f 100644
--- a/Documentation/snippets/ancient-headword.ly
+++ b/Documentation/snippets/ancient-headword.ly
@@ -1,11 +1,21 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "headword"
+
+  texidoc = "
+.
+
+"
+  doctitle = "Ancient headword"
+} % begin verbatim
+
 
 #(set-global-staff-size 15)
 \paper {
@@ -19,8 +29,7 @@
   lsrtags = "headwords"
   texidoc = ""
   doctitle = "headword"
-} % begin verbatim
-
+}
 
 \include "gregorian.ly"
 
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 7301cd2b62..092931e5c1 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, template"
+  lsrtags = "template, ancient-notation, really-cool, real-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -79,6 +79,7 @@ on the staves.
   doctitle = "Ancient notation template -- modern transcription of mensural music"
 } % begin verbatim
 
+
 global = {
   \set Score.skipBars = ##t
 
diff --git a/Documentation/snippets/ancient-time-signatures.ly b/Documentation/snippets/ancient-time-signatures.ly
index 4c778fb066..06274e800f 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "ancient-notation"
@@ -25,6 +25,7 @@ Time signatures may also be engraved in an old style.
   doctitle = "Ancient time signatures"
 } % begin verbatim
 
+
 {
   \override Staff.TimeSignature #'style = #'neomensural
   s1
diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index 3386a79c7e..0a6b932e92 100644
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -61,6 +61,7 @@ more possibilities.
   doctitle = "Anglican psalm template"
 } % begin verbatim
 
+
 SopranoMusic = \relative g' {
   g1 | c2 b | a1 | \bar "||"
   a1 | d2 c | c b | c1 | \bar "||"
diff --git a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
index c24b94053e..6ec6d4d496 100644
--- a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
+++ b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, editorial-annotations"
+  lsrtags = "editorial-annotations, pitches"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   doctitlees = "Aplicar estilos de cabeza según la nota de la escala"
@@ -119,6 +119,7 @@ correspondence between harmonic functions and note head styles.
   doctitle = "Applying note head styles depending on the step of the scale"
 } % begin verbatim
 
+
 fragment = {
   \key c \major
   c2 d
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index cfdc21c145..82e1db1c89 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.15.25"
+\version "2.15.32"
 
 \header {
   lsrtags = "world-music"
@@ -58,6 +58,7 @@ of what could be the start of a hijaz improvisation:
   doctitle = "Arabic improvisation"
 } % begin verbatim
 
+
 \include "arabic.ly"
 
 \relative sol' {
diff --git a/Documentation/snippets/asymmetric-slurs.ly b/Documentation/snippets/asymmetric-slurs.ly
index d5206e4ff5..758ce46a03 100644
--- a/Documentation/snippets/asymmetric-slurs.ly
+++ b/Documentation/snippets/asymmetric-slurs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ better.
   doctitle = "Asymmetric slurs"
 } % begin verbatim
 
+
 slurNotes = { d,8( a' d f a f' d, a) }
 
 \relative c' {
diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
index d2d6159f27..9c90f3375f 100644
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "automatic-notation, connecting-notes, rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Se pueden subdividir las barras automáticamente.  Estableciendo la
@@ -17,18 +18,15 @@ posiciones de pulso (tal y como se especifica en @code{beatLength}).
 "
   doctitlees = "Subdivisiones de barra automáticas"
 
-  lsrtags = "rhythms"
-
   texidoc = "
 Beams can be subdivided automatically.  By setting the property
 @code{subdivideBeams}, beams are subdivided at beat positions (as
-specified in @code{baseMoment}).
+specified in @code{beatLength}).
 
 "
   doctitle = "Automatic beam subdivisions"
 } % begin verbatim
 
-
 \new Staff {
   \relative c'' {
     <<
diff --git a/Documentation/snippets/automatic-notation.snippet-list b/Documentation/snippets/automatic-notation.snippet-list
new file mode 100644
index 0000000000..dfed0d822f
--- /dev/null
+++ b/Documentation/snippets/automatic-notation.snippet-list
@@ -0,0 +1,6 @@
+automatic-beam-subdivisions.ly
+forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+preventing-extra-naturals-from-being-automatically-added.ly
+preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
diff --git a/Documentation/snippets/automatically-change-durations.ly b/Documentation/snippets/automatically-change-durations.ly
index 72f05c0337..a378f9721f 100644
--- a/Documentation/snippets/automatically-change-durations.ly
+++ b/Documentation/snippets/automatically-change-durations.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -18,6 +18,7 @@ of two, and the number of dots to be added as a positive integer.
   doctitle = "Automatically change durations"
 } % begin verbatim
 
+
 \paper { indent = 0 }
 
 music = \relative c'' { a1 b2 c4 d8 r }
diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index f7f2cd37ed..3a25a7a30c 100644
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, chords, tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
@@ -35,6 +35,7 @@ overridden.
   doctitle = "Avoiding collisions with chord fingerings"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(up)
   \set stringNumberOrientations = #'(up)
diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index b746d6fe3e..8f2651a6bb 100644
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Las reglas de final de barra especificadas en el contexto
@@ -39,11 +40,11 @@ moduler au niveau @code{Staff} ou @code{Voice}@tie{}:
 "
   doctitlefr = "Définition de règles de ligature pour la partition"
 
-  lsrtags = "rhythms"
   texidoc = "
-Beat structure rules specified in the @code{Score} context apply to all
+Beam-ending rules specified in the @code{Score} context apply to all
 staves, but can be modified at both @code{Staff} and @code{Voice}
 levels:
+
 "
   doctitle = "Beam endings in Score context"
 } % begin verbatim
diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
index 93ebd3e74c..5df79024ba 100644
--- a/Documentation/snippets/beam-grouping-in-7-8-time.ly
+++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 No está especificada ninguna agrupación predeterminada automática
@@ -41,17 +42,16 @@ il faudra donc définir les terminaisons de 2/8 et 5/8 :
 "
   doctitlefr = "Règle de ligature dans une mesure à 7/8"
 
-  lsrtags = "rhythms"
   texidoc = "
-There is no default beat structure specified for 7/8 time,
-so if automatic beams are required the structure must be specified.  For
-example, to group all beams 2-3-2 in 7/8 time, specify the
-beat structure to be (2 3 2):
+There are no default automatic beam groupings specified for 7/8 time,
+so if automatic beams are required the grouping must be specified using
+<code>beatStructure</code>.  For example, to  group all beams 2-3-2 in
+7/8 time, specify beam endings at 2/8 and 5/8:
+
 "
   doctitle = "Beam grouping in 7/8 time"
 } % begin verbatim
 
-
 \relative c'' {
   \time 7/8
   % rhythm 2-3-2
diff --git a/Documentation/snippets/beams-across-line-breaks.ly b/Documentation/snippets/beams-across-line-breaks.ly
index 485931f37c..af39899179 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -45,6 +45,7 @@ behavior can be changed as shown:
   doctitle = "Beams across line breaks"
 } % begin verbatim
 
+
 \relative c'' {
   \override Beam #'breakable = ##t
   c8 c[ c] c[ c] c[ c] c[ \break
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 4e5934ed5e..2f6ae1e8d8 100644
--- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, text"
+  lsrtags = "editorial-annotations, text, really-cool"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -29,6 +29,7 @@ white box will not overlap any other grob.
   doctitle = "Blanking staff lines using the \\whiteout command"
 } % begin verbatim
 
+
 \layout { ragged-right = ##f }
 \relative c' {
   \override TextScript #'extra-offset = #'(2 . 4)
diff --git a/Documentation/snippets/book-parts.ly b/Documentation/snippets/book-parts.ly
index ed6865ca35..12cfaafe7f 100644
--- a/Documentation/snippets/book-parts.ly
+++ b/Documentation/snippets/book-parts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "paper-and-layout"
@@ -19,6 +19,7 @@ with the book last page.
   doctitle = "Book parts"
 } % begin verbatim
 
+
 #(set-default-paper-size "a6")
 
 \book {
diff --git a/Documentation/snippets/breathing-signs.ly b/Documentation/snippets/breathing-signs.ly
index 85c5d222fd..1896b08689 100644
--- a/Documentation/snippets/breathing-signs.ly
+++ b/Documentation/snippets/breathing-signs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "symbols-and-glyphs, expressive-marks"
 
   texidoc = "
 Breathing signs are available in different tastes: commas (default),
@@ -17,6 +17,7 @@ ticks, vees and @qq{railroad tracks} (caesura).
   doctitle = "Breathing signs"
 } % begin verbatim
 
+
 \new Staff \relative c'' {
   \key es \major
   \time 3/4
diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
index fe438c3260..7717cc5d9f 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "contemporary-notation, symbols-and-glyphs, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -53,6 +53,7 @@ draw the rectangle over the hairpin.
   doctitle = "Broken Crescendo Hairpin"
 } % begin verbatim
 
+
 \relative c' {
   <<
     {
diff --git a/Documentation/snippets/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
index 517acb3c46..c618020445 100644
--- a/Documentation/snippets/caesura-railtracks-with-fermata.ly
+++ b/Documentation/snippets/caesura-railtracks-with-fermata.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "symbols-and-glyphs, tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -28,6 +28,7 @@ pleasing combination of railtracks and fermata.
   doctitle = "Caesura (\"railtracks\") with fermata"
 } % begin verbatim
 
+
 \relative c'' {
   c2.
   % construct the symbol
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 7436726a2f..5df3056640 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "expressive-marks, text"
+  lsrtags = "text, really-cool, expressive-marks, scheme-language"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -29,6 +29,7 @@ normally printed, using some Scheme code.
   doctitle = "Center text below hairpin dynamics"
 } % begin verbatim
 
+
 hairpinWithCenteredText =
 #(define-music-function (parser location text) (markup?)
 #{
diff --git a/Documentation/snippets/changing--flageolet-mark-size.ly b/Documentation/snippets/changing--flageolet-mark-size.ly
index 0e9544a133..01a7607ae0 100644
--- a/Documentation/snippets/changing--flageolet-mark-size.ly
+++ b/Documentation/snippets/changing--flageolet-mark-size.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, unfretted-strings"
+  lsrtags = "specific-notation, symbols-and-glyphs, unfretted-strings, expressive-marks, scheme-language"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -43,6 +43,7 @@ function.
   doctitle = "Changing \\flageolet mark size"
 } % begin verbatim
 
+
 smallFlageolet =
 #(let ((m (make-articulation "flageolet")))
    (set! (ly:music-property m 'tweaks)
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 75ea534780..3d35a43e5b 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "specific-notation, editorial-annotations, simultaneous-notes, tweaks-and-overrides, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -39,6 +39,7 @@ note head).
   doctitle = "Changing a single note's size in a chord"
 } % begin verbatim
 
+
 \relative c' {
   <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup { A tiny e }_\markup { A big c }
 }
diff --git a/Documentation/snippets/changing-beam-knee-gap.ly b/Documentation/snippets/changing-beam-knee-gap.ly
index 7222c1009f..c3f151ee0e 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -64,6 +64,7 @@ spaces.
   doctitle = "Changing beam knee gap"
 } % begin verbatim
 
+
 {
   f8 f''8 f8 f''8
   \override Beam #'auto-knee-gap = #6
diff --git a/Documentation/snippets/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly
index 167b892a78..971508e1a3 100644
--- a/Documentation/snippets/changing-chord-separator.ly
+++ b/Documentation/snippets/changing-chord-separator.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords"
@@ -42,6 +42,7 @@ markup.
   doctitle = "Changing chord separator"
 } % begin verbatim
 
+
 \chords {
   c:7sus4
   \set chordNameSeparator
diff --git a/Documentation/snippets/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
index ddce19f882..9b9f9ad48f 100644
--- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly
+++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Cambiar la forma de los silencios multicompás"
@@ -54,6 +54,7 @@ default number of ten may be changed by overriding the
   doctitle = "Changing form of multi-measure rests"
 } % begin verbatim
 
+
 \relative c'' {
   \compressFullBarRests
   R1*2 | R1*5 | R1*9
diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly
index be9ca1dead..0c4e53b704 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings"
@@ -39,6 +39,7 @@ or fret in the different orientations will be aligned.
   doctitle = "Changing fret orientations"
 } % begin verbatim
 
+
 \include "predefined-guitar-fretboards.ly"
 
 <<
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 74147ae8c6..04f4e9bc36 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
@@ -7,7 +7,7 @@
 \version "2.15.32"
 
 \header {
-  lsrtags = "contexts-and-engravers, midi"
+  lsrtags = "real-music, contexts-and-engravers, midi"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -61,6 +61,7 @@ two MIDI channels are created, each with a different
   doctitle = "Changing MIDI output to one channel per voice"
 } % begin verbatim
 
+
 \score {
   \new Staff <<
     \new Voice \relative c''' {
diff --git a/Documentation/snippets/changing-partcombine-texts.ly b/Documentation/snippets/changing-partcombine-texts.ly
index 44fecd97b3..791c335c40 100644
--- a/Documentation/snippets/changing-partcombine-texts.ly
+++ b/Documentation/snippets/changing-partcombine-texts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "simultaneous-notes"
@@ -45,6 +45,7 @@ the solo and unison sections may be changed:
   doctitle = "Changing partcombine texts"
 } % begin verbatim
 
+
 \new Staff <<
   \set Staff.soloText = #"girl"
   \set Staff.soloIIText = #"boy"
diff --git a/Documentation/snippets/changing-properties-for-individual-grobs.ly b/Documentation/snippets/changing-properties-for-individual-grobs.ly
index ead69c2634..f13e5b00cd 100644
--- a/Documentation/snippets/changing-properties-for-individual-grobs.ly
+++ b/Documentation/snippets/changing-properties-for-individual-grobs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides"
+  lsrtags = "really-cool, tweaks-and-overrides, scheme-language"
 
   texidoc = "
 The @code{\\applyOutput} command allows the tuning of any layout
@@ -18,6 +18,7 @@ arguments.
   doctitle = "Changing properties for individual grobs"
 } % begin verbatim
 
+
 #(define (mc-squared grob grob-origin context)
   (let ((sp (ly:grob-property grob 'staff-position)))
     (if (grob::has-interface grob 'note-head-interface)
diff --git a/Documentation/snippets/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
index ca922e73fd..d3574bfd05 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music"
+  lsrtags = "vocal-music, really-simple"
 
   texidoc = "
 Fonts can be changed independently for each stanza, including the font
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 736ca18f58..4e318327d7 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -64,6 +64,7 @@ is @code{'dashed-line}, and other possible values include @code{'line},
   doctitle = "Changing text and spanner styles for text dynamics"
 } % begin verbatim
 
+
 \relative c'' {
   \set crescendoText = \markup { \italic { cresc. poco } }
   \set crescendoSpanner = #'text
diff --git a/Documentation/snippets/changing-the-ambitus-gap.ly b/Documentation/snippets/changing-the-ambitus-gap.ly
index 660adb671d..c8a1be77dc 100644
--- a/Documentation/snippets/changing-the-ambitus-gap.ly
+++ b/Documentation/snippets/changing-the-ambitus-gap.ly
@@ -1,12 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
 \header {
+  lsrtags = "pitches"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -32,15 +34,13 @@ préférences en matière d'esthétique.
   doctitlefr = "Réglage de l'affichage d'un ambitus"
 
 
-  lsrtags = "pitches"
-  texidoc = "It is possible to change the default gap setting for
-ambitus."
+  texidoc = "
+It is possible to change the default gap setting for ambitus.
 
+"
   doctitle = "Changing the ambitus gap"
 } % begin verbatim
 
-
-
 \layout {
   \context {
     \Voice
diff --git a/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
index 6a8c50eede..8321f795ee 100644
--- a/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+++ b/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations"
+  lsrtags = "editorial-annotations, really-simple, connecting-notes, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -24,6 +24,7 @@ The appearance of slurs may be changed from solid to dotted or dashed.
   doctitle = "Changing the appearance of a slur from solid to dotted or dashed"
 } % begin verbatim
 
+
 \relative c' {
   c4( d e c)
   \slurDotted
diff --git a/Documentation/snippets/changing-the-breath-mark-symbol.ly b/Documentation/snippets/changing-the-breath-mark-symbol.ly
index 7ce141534c..6bcac17772 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -47,6 +47,7 @@ text.
   doctitle = "Changing the breath mark symbol"
 } % begin verbatim
 
+
 \relative c'' {
   c2
   \override BreathingSign #'text = \markup { \musicglyph #"scripts.rvarcomma" }
diff --git a/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly b/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
index a5b068977c..374813565a 100644
--- a/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
+++ b/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords"
+  lsrtags = "chords, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -31,6 +31,7 @@ The english naming of chords (default) can be changed to german
   doctitle = "Changing the chord names to German or semi-German notation"
 } % begin verbatim
 
+
 music = \chordmode {
   c1/c | cis/cis
   b1/b | bis/bis | bes/bes
diff --git a/Documentation/snippets/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
index bbd0565c97..e025d0e426 100644
--- a/Documentation/snippets/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/changing-the-default-text-font-family.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text, tweaks-and-overrides"
@@ -17,6 +17,7 @@ The default font families for text can be overridden with
   doctitle = "Changing the default text font family"
 } % begin verbatim
 
+
 \paper {
   % change for other default global staff size.
   myStaffSize = #20
diff --git a/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly b/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly
index 3d71b5253b..a515d8aff5 100644
--- a/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly
+++ b/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches"
@@ -19,6 +19,7 @@ and line of the stave equal to one semitone.
   doctitle = "Changing the interval of lines on the stave"
 } % begin verbatim
 
+
 scale = \relative c' {
   a4 ais b c
   cis4 d dis e
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 8c69e09a16..05717c4415 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
@@ -1,12 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
 \header {
+  lsrtags = "rhythms, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -26,13 +28,14 @@ affectés à une note en particulier.
   doctitlefr = "Spécification du nombre de points d'augmentation d'une note"
 
 
-  lsrtags = "rhythms,expressive-marks"
-  texidoc = "This code demonstrates how to change the number of
-augmentation dots on a single note."
+  texidoc = "
+This code demonstrates how to change the number of augmentation dots on
+a single note.
+
+"
   doctitle = "Changing the number of augmentation dots per note"
 } % begin verbatim
 
-
 \relative c' {
   c4.. a16 r2 |
   \override Dots #'dot-count = #4
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 ce4d1cec62..eaf825037a 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation"
+  lsrtags = "specific-notation, staff-notation"
 
   texidoc = "
 The number of lines in a staff may changed by overriding the
@@ -20,6 +20,7 @@ The number of lines in a staff may changed by overriding the
   doctitle = "Changing the number of lines in a staff"
 } % begin verbatim
 
+
 upper = \relative c'' {
   c4 d e f
 }
diff --git a/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
index aa1ec6b034..5e1ca472a3 100644
--- a/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
+++ b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords"
@@ -48,6 +48,7 @@ depending on the @code{figuredBassAlterationDirection} and
   doctitle = "Changing the positions of figured bass alterations"
 } % begin verbatim
 
+
 \figures {
   <6\+> <5+> <6 4-> r
   \set figuredBassAlterationDirection = #RIGHT
diff --git a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
index 582dd03538..9fc2ae5e8d 100644
--- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
+++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "winds"
+
 %%%    Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -38,15 +39,13 @@ La taille et l'épaisseur des diagrammes de doigté pour bois est modifiable
   doctitlefr = "Modification de la taille d'un diagramme pour bois"
 
 
-  lsrtags="winds"
-  texidoc="
+  texidoc = "
 The size and thickness of woodwind diagrams can be changed.
-"
 
+"
   doctitle = "Changing the size of woodwind diagrams"
 } % begin verbatim
 
-
 \relative c'' {
   \textLengthOn
   c1^\markup
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index 4ec923b18b..a8f47679d8 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
+  lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
 
   texidoc = "
 Though the simplest way to resize staves is to use
@@ -19,6 +19,7 @@ changed by scaling the properties @code{'staff-space} and
   doctitle = "Changing the staff size"
 } % begin verbatim
 
+
 <<
   \new Staff {
     \relative c'' {
diff --git a/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
index af24daca37..7e83cf7bfe 100644
--- a/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
+++ b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides, midi"
+  lsrtags = "tweaks-and-overrides, midi, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -46,6 +46,7 @@ metronome mark invisible.
   doctitle = "Changing the tempo without a metronome mark"
 } % begin verbatim
 
+
 \score {
   \new Staff \relative c' {
     \tempo 4 = 160
diff --git a/Documentation/snippets/changing-the-text-for-sustain-markings.ly b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
index 248b2620c1..8173f8a72b 100644
--- a/Documentation/snippets/changing-the-text-for-sustain-markings.ly
+++ b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
@@ -32,6 +32,7 @@ exhaustive list.
   doctitle = "Changing the text for sustain markings"
 } % begin verbatim
 
+
 sustainNotes = { c4\sustainOn d e\sustainOff\sustainOn f\sustainOff }
 
 \relative c' {
diff --git a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
deleted file mode 100644
index 791e2cc420..0000000000
--- a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
+++ /dev/null
@@ -1,68 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  texidoces = "
-La instrucción @code{\\time} establece las propiedades
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping} y
-@code{measureLength} en el contexto @code{Timing}, que normalmente
-tiene el alias @code{Score}.  La modificación del valor de
-@code{timeSignatureFraction} hace que se imprima la nueva indicación
-de compás sin que cambie ninguna de las demás propiedades:
-
-"
-  doctitlees = "Cambio de compás sin afectar al barrado"
-
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-Der @code{\\time}-Befehl verändert die Eigenschaften
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-und @code{measureLength} im @code{Timing}-Kontext, welcher normalerweise
-gleichbedeutend mit @code{Score} ist.  Wenn der Wert von
-@code{timeSignatureFraction} verändert wird, wird die neue
-Taktart ausgegeben, ohne die anderen Eigenschaften zu beeinflussen:
-
-"
-  doctitlede = "Die Taktart verändern ohne die Bebalkung zu beeinflussen"
-
-
-
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
-  texidocfr = "
-La commande @code{\\time} gère les propriétés
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-et @code{measureLength} dans le contexte @code{Timing}, normalement
-rattaché à @code{Score}.  Le fait de modifier la valeur de
-@code{timeSignatureFraction} aura pour effet de changer l'apparence du
-symbole affiché sans pour autant affecter les autres propriétés de la
-métrique@tie{}:
-
-"
-  doctitlefr = "Changement de métrique sans affecter les règles de ligature"
-
-  lsrtags = "rhythms"
-  texidoc = "
-The @code{\\time} command sets the properties
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-and @code{measureLength} in the @code{Timing} context, which is
-normally aliased to @code{Score}. Changing the value of
-@code{timeSignatureFraction} causes the new time signature symbol to be
-printed without changing any of the other properties:
-
-"
-  doctitle = "Changing the time signature without affecting the beaming"
-} % begin verbatim
-
-
-\markup {
-  This snippet is deprecated as of 2.13.5 and will be removed in 2.14
-}
diff --git a/Documentation/snippets/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly
index 52346efc97..3ed42663da 100644
--- a/Documentation/snippets/changing-the-tuplet-number.ly
+++ b/Documentation/snippets/changing-the-tuplet-number.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -55,6 +55,7 @@ be printed, or the tuplet number may be suppressed altogether.
   doctitle = "Changing the tuplet number"
 } % begin verbatim
 
+
 \relative c'' {
   \times 2/3 { c8 c c }
   \times 2/3 { c8 c c }
diff --git a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
index aeab1974c9..40d47db2bb 100644
--- a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+++ b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, contexts-and-engravers"
+  lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -37,6 +37,7 @@ as the second argument of @code{\\scaleDurations}.
   doctitle = "Changing time signatures inside a polymetric section using \\scaleDurations"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Score
diff --git a/Documentation/snippets/chord-glissando-in-tablature.ly b/Documentation/snippets/chord-glissando-in-tablature.ly
index 4bab2a97cf..74ea26935c 100644
--- a/Documentation/snippets/chord-glissando-in-tablature.ly
+++ b/Documentation/snippets/chord-glissando-in-tablature.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -41,16 +42,16 @@ d'arrivée.
   doctitlefr = "Glissando d'accords et tablature"
 
 
-  lsrtags = "fretted-strings"
   texidoc = "
-Slides for chords can be indicated in both Staff and TabStaff.
-String numbers are necessary for TabStaff because automatic
-string calculations are different for chords and for single notes.
+Slides for chords can be indicated in both @code{Staff} and
+@code{TabStaff}. String numbers are necessary for @code{TabStaff}
+because automatic string calculations are different for chords and for
+single notes.
+
 "
   doctitle = "Chord glissando in tablature"
 } % begin verbatim
 
-
 myMusic = \relative c' {
   <c\3 e\2 g\1>1 \glissando <f\3 a\2 c\1>
 }
diff --git a/Documentation/snippets/chord-name-exceptions.ly b/Documentation/snippets/chord-name-exceptions.ly
index 058b46d8fa..ffdf1612c3 100644
--- a/Documentation/snippets/chord-name-exceptions.ly
+++ b/Documentation/snippets/chord-name-exceptions.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords"
+  lsrtags = "specific-notation, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -43,6 +43,7 @@ special notations for specific chords.
   doctitle = "Chord name exceptions"
 } % begin verbatim
 
+
 % modify maj9 and 6(add9)
 % Exception music is chords with markups
 chExceptionMusic = {
diff --git a/Documentation/snippets/chord-name-major7.ly b/Documentation/snippets/chord-name-major7.ly
index 0e2416d638..42daf680ed 100644
--- a/Documentation/snippets/chord-name-major7.ly
+++ b/Documentation/snippets/chord-name-major7.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords"
+  lsrtags = "specific-notation, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -43,6 +43,7 @@ The layout of the major 7 can be tuned with @code{majorSevenSymbol}.
   doctitle = "chord name major7"
 } % begin verbatim
 
+
 \chords {
   c:7+
   \set majorSevenSymbol = \markup { j7 }
diff --git a/Documentation/snippets/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly
index f2e40d0621..de8662cc6f 100644
--- a/Documentation/snippets/chordchanges-for-fretboards.ly
+++ b/Documentation/snippets/chordchanges-for-fretboards.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Se puede hacer que los diagramas de posiciones se muestren sólo
@@ -36,12 +37,13 @@ d'un changement d'accord ou de saut de ligne.
   doctitlefr = "Changement d'accord et diagramme de fret"
 
 
-  lsrtags = "fretted-strings"
-  texidoc = "FretBoards can be set to display only when the chord changes
-or at the beginning of a new line."
-  doctitle = "chordChanges for FretBoards"
-} % begin verbatim
+  texidoc = "
+FretBoards can be set to display only when the chord changes or at the
+beginning of a new line.
 
+"
+  doctitle = "ChordChanges for FretBoards"
+} % begin verbatim
 
 \include "predefined-guitar-fretboards.ly"
 
@@ -49,7 +51,7 @@ myChords = \chordmode {
   c1 c1 \break
   \set chordChanges = ##t
   c1 c1 \break
-  c1 c1 \break
+  c1 c1
 }
 
 <<
diff --git a/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly b/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
index fbaf03dfa1..45b9b8a35d 100644
--- a/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
+++ b/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches"
@@ -16,6 +16,7 @@ Clefs can be transposed by arbitrary amounts, not just by octaves.
   doctitle = "Clefs can be transposed by arbitrary amounts"
 } % begin verbatim
 
+
 \relative c' {
   \clef treble
   c4 c c c
diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
index c615889387..7dd6f138a8 100644
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "paper-and-layout"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Este código muestra cómo recortar (extraer) fragmentos a partir de una
@@ -35,12 +36,10 @@ varios archivos EPS.
 "
   doctitlees = "Recorte de sistemas"
 
-  lsrtags = "paper-and-layout"
-
   texidoc = "
 This code shows how to clip (extract) snippets from a full score.
 
-This file needs to be run separately with @option{-dclip-systems}; the
+This file needs to be run separately with @code{-dclip-systems}; the
 snippets page may not adequately show the results.
 
 The result will be files named
diff --git a/Documentation/snippets/clusters.ly b/Documentation/snippets/clusters.ly
index a6c5880c8f..5a8d7786c6 100644
--- a/Documentation/snippets/clusters.ly
+++ b/Documentation/snippets/clusters.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, chords, keyboards"
+  lsrtags = "specific-notation, keyboards, simultaneous-notes, really-cool, contemporary-notation, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -25,6 +25,7 @@ played.
   doctitle = "Clusters"
 } % begin verbatim
 
+
 fragment = \relative c' {
   c4 f <e d'>4
   <g a>8 <e a> a4 c2 <d b>4
diff --git a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
index 70bdd668f3..ed7167439e 100644
--- a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
+++ b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, editorial-annotations"
+  lsrtags = "editorial-annotations, really-cool, pitches"
 
   texidoc = "
 It is possible to color note heads depending on their pitch and/or
diff --git a/Documentation/snippets/combining-dynamics-with-markup-texts.ly b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
index 8387cfea13..95902fea24 100644
--- a/Documentation/snippets/combining-dynamics-with-markup-texts.ly
+++ b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, text"
+  lsrtags = "text, really-simple, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ block.
   doctitle = "Combining dynamics with markup texts"
 } % begin verbatim
 
+
 piuF = \markup { \italic più \dynamic f }
 \layout { ragged-right = ##f }
 \relative c'' {
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 f1f33a8e60..13d6888620 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, text"
+  lsrtags = "syntax-and-expressions, text, simultaneous-notes"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -94,6 +94,7 @@ staff: standard polyphony, @code{\\partcombine} without texts, and
   doctitle = "Combining two parts on the same staff"
 } % begin verbatim
 
+
 musicUp = \relative c'' {
   \time 4/4
   a4 c4.( g8) a4 |
diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index 120972a6e2..d638d7192d 100644
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Indicaciones de compases compuestos"
  texidoces = "
@@ -47,20 +48,29 @@ et en adaptant les règles de ligature automatique en conséquence.
 "
   doctitlefr = "Métrique décomposée"
 
-  lsrtags = "rhythms"
   texidoc = "
-Odd 20th century time signatures (such as \"5/8\") can often be played
-as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or
-more inequal metrics. LilyPond can make such music quite easy to read
-and play, by explicitly printing the compound time signatures and
-adapting the automatic beaming behavior. (Graphic measure grouping
-indications can also be added; see the appropriate snippet in this
-database.)
+Odd 20th century time signatures (such as \\\"5/8\\\") can often be
+played as compound time signatures (e.g. \\\"3/8 + 2/8\\\"), which
+combine two or more inequal metrics. LilyPond can make such music quite
+easy to read and play, by explicitly printing the compound time
+signatures and adapting the automatic beaming behavior.
+
 "
   doctitle = "Compound time signatures"
 } % begin verbatim
 
+#(define ((compound-time one two num) grob)
+   (grob-interpret-markup grob
+                          (markup #:override '(baseline-skip . 0) #:number
+                                  (#:line ((#:column (one num))
+                                           #:vcenter "+"
+                                           (#:column (two num)))))))
 
-\markup {
-  This snippet is deprecated as of 2.15.9 and will be removed in 2.16
+\relative c' {
+  \override Staff.TimeSignature #'stencil = #(compound-time "2" "3" "8")
+  \time 5/8
+  \set Staff.beatStructure = #'(2 3)
+  c8 d e fis gis
+  c8 fis, gis e d
+  c8 d e4 gis8
 }
diff --git a/Documentation/snippets/connecting-notes.snippet-list b/Documentation/snippets/connecting-notes.snippet-list
new file mode 100644
index 0000000000..bd89eb7e3b
--- /dev/null
+++ b/Documentation/snippets/connecting-notes.snippet-list
@@ -0,0 +1,5 @@
+automatic-beam-subdivisions.ly
+changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+creating-slurs-across-voices.ly
+laissez-vibrer-ties.ly
+manually-controlling-beam-positions.ly
diff --git a/Documentation/snippets/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
index 3ac19377c7..dd7c2e6042 100644
--- a/Documentation/snippets/contemporary-glissando.ly
+++ b/Documentation/snippets/contemporary-glissando.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks"
+  lsrtags = "specific-notation, contemporary-notation, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -44,6 +44,7 @@ hidden note and cadenza timing.
   doctitle = "Contemporary glissando"
 } % begin verbatim
 
+
 \relative c'' {
   \time 3/4
   \override Glissando #'style = #'zigzag
diff --git a/Documentation/snippets/contemporary-notation.snippet-list b/Documentation/snippets/contemporary-notation.snippet-list
new file mode 100644
index 0000000000..098532b961
--- /dev/null
+++ b/Documentation/snippets/contemporary-notation.snippet-list
@@ -0,0 +1,13 @@
+broken-crescendo-hairpin.ly
+changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+clusters.ly
+contemporary-glissando.ly
+double-glissando.ly
+flat-flags-and-beam-nibs.ly
+flute-slap-notation.ly
+heavily-customized-polymetric-time-signatures.ly
+laissez-vibrer-ties.ly
+marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+non-traditional-key-signatures.ly
+printing-music-with-different-time-signatures.ly
+stemlets.ly
diff --git a/Documentation/snippets/contexts-and-engravers.snippet-list b/Documentation/snippets/contexts-and-engravers.snippet-list
index 2b4356606f..552afb50b1 100644
--- a/Documentation/snippets/contexts-and-engravers.snippet-list
+++ b/Documentation/snippets/contexts-and-engravers.snippet-list
@@ -6,7 +6,7 @@ changing-midi-output-to-one-channel-per-voice.ly
 changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
 chant-or-psalms-notation.ly
 creating-blank-staves.ly
-defining-an-engraver-in-scheme-ambitus-engraver.ly
+defining-an-engraver-in-scheme--ambitus-engraver.ly
 engravers-one-by-one.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
 nesting-staves.ly
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 c6e0bd1b78..00fa74fc0b 100644
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -30,23 +31,22 @@ ocultar habilitando la función de callback.
   extensión después de un salto de línea"
 
 
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "The visibility of spanners which end on the first note
-following a line break is controlled by the @code{after-line-breaking}
-callback @code{ly:spanner::kill-zero-spanned-time}.
+  texidoc = "
+The visibility of spanners which end on the first note following a line
+break is controlled by the @code{after-line-breaking} callback
+@code{ly:spanner::kill-zero-spanned-time}.
 
 For objects such as glissandos and hairpins, the default behaviour is
 to hide the spanner after a break; disabling the callback will allow
 the left-broken span to be shown.
 
-Conversely, spanners which are usually visible, such as text spans,
-can be hidden by enabling the callback.
-"
+Conversely, spanners which are usually visible, such as text spans, can
+be hidden by enabling the callback.
 
+"
   doctitle = "Controlling spanner visibility after a line break"
 } % begin verbatim
 
-
 \paper { ragged-right = ##t }
 
 \relative c'' {
@@ -64,4 +64,3 @@ can be hidden by enabling the callback.
   \break
   f,1\!\stopTextSpan
 }
-
diff --git a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
index 785763e250..6293cc6dec 100644
--- a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
+++ b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, chords, keyboards, fretted-strings"
+  lsrtags = "specific-notation, editorial-annotations, keyboards, fretted-strings, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -49,6 +49,7 @@ if it is a single note.
   doctitle = "Controlling the placement of chord fingerings"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(left)
   <c-1 e-3 a-5>4
diff --git a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
index b7f6413bf6..b674e76276 100644
--- a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
+++ b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -71,6 +71,7 @@ comes first.
   doctitle = "Controlling the vertical ordering of scripts"
 } % begin verbatim
 
+
 \relative c''' {
   \once \override TextScript #'script-priority = #-100
   a2^\prall^\markup { \sharp }
diff --git a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
index 9d0e618697..0cda586e2f 100644
--- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
+++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
@@ -50,6 +50,7 @@ bracket), @code{#f} (never print a bracket) or @code{#'if-no-beam}
   doctitle = "Controlling tuplet bracket visibility"
 } % begin verbatim
 
+
 music = \relative c'' {
   \times 2/3 { c16[ d e } f8]
   \times 2/3 { c8 d e }
diff --git a/Documentation/snippets/correction-wanted.snippet-list b/Documentation/snippets/correction-wanted.snippet-list
new file mode 100644
index 0000000000..b551d6eaca
--- /dev/null
+++ b/Documentation/snippets/correction-wanted.snippet-list
@@ -0,0 +1,2 @@
+adjusting-lyrics-vertical-spacing.ly
+horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
diff --git a/Documentation/snippets/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly
index a715ead012..ba7659acdf 100644
--- a/Documentation/snippets/creating-a-delayed-turn.ly
+++ b/Documentation/snippets/creating-a-delayed-turn.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 texidoces = "
@@ -62,6 +62,7 @@ horizontally.
   doctitle = "Creating a delayed turn"
 } % begin verbatim
 
+
 \relative c'' {
   \once \override TextScript #'avoid-slur = #'inside
   \once \override TextScript #'outside-staff-priority = ##f
diff --git a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
index 150a7494b0..7b4205ae15 100644
--- a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
+++ b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -48,6 +48,7 @@ context:
   doctitle = "Creating arpeggios across notes in different voices"
 } % begin verbatim
 
+
 \new Staff \with {
   \consists "Span_arpeggio_engraver"
 }
diff --git a/Documentation/snippets/creating-blank-staves.ly b/Documentation/snippets/creating-blank-staves.ly
index 0ed458e098..03f190bd88 100644
--- a/Documentation/snippets/creating-blank-staves.ly
+++ b/Documentation/snippets/creating-blank-staves.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout"
+  lsrtags = "specific-notation, editorial-annotations, paper-and-layout, contexts-and-engravers, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -30,6 +30,7 @@ To create blank staves, generate empty measures then remove the
   doctitle = "Creating blank staves"
 } % begin verbatim
 
+
 #(set-global-staff-size 20)
 
 \score {
diff --git a/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
index 9e7b9d374d..6ece21b65c 100644
--- a/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
+++ b/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -47,6 +47,7 @@ the staves by setting the property @code{PianoStaff.connectArpeggios}.
   doctitle = "Creating cross-staff arpeggios in a piano staff"
 } % begin verbatim
 
+
 \new PianoStaff \relative c'' <<
   \set PianoStaff.connectArpeggios = ##t
   \new Staff {
diff --git a/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
index 257e742df7..277f0b1713 100644
--- a/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
+++ b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -49,6 +49,7 @@ Cross-staff arpeggios can be created in contexts other than
   doctitle = "Creating cross-staff arpeggios in other contexts"
 } % begin verbatim
 
+
 \score {
   \new ChoirStaff {
     \set Score.connectArpeggios = ##t
diff --git a/Documentation/snippets/creating-double-digit-fingerings.ly b/Documentation/snippets/creating-double-digit-fingerings.ly
index f86634bbba..3c2f18078d 100644
--- a/Documentation/snippets/creating-double-digit-fingerings.ly
+++ b/Documentation/snippets/creating-double-digit-fingerings.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, staff-notation, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks, scheme-language"
 
   texidoc = "
 By default you cannot make double-digit fingering notation (i.e.
@@ -19,6 +19,7 @@ This snippet shows two methods of creating fingerings larger than 9.
   doctitle = "Creating double-digit fingerings"
 } % begin verbatim
 
+
 ten =
 #(make-music 'FingeringEvent
              'digit 10)
diff --git a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
index 927eabde3a..06e28d90ff 100644
--- a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
+++ b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -45,6 +45,7 @@ change the tempo in MIDI output.
   doctitle = "Creating metronome marks in markup mode"
 } % begin verbatim
 
+
 \relative c' {
   \tempo \markup {
     \concat {
diff --git a/Documentation/snippets/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
index 494715ab74..e2f6dd89bc 100644
--- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly
+++ b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, text"
+  lsrtags = "workaround, text, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -45,6 +45,7 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}.
   doctitle = "Creating \"real\" parenthesized dynamics"
 } % begin verbatim
 
+
 parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic
            #:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text
            #:italic #:fontsize 2 ")")))
diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
index bd4794ca14..ebe3bddfef 100644
--- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
+++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, text, tweaks-and-overrides"
+  lsrtags = "text, tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
diff --git a/Documentation/snippets/creating-slurs-across-voices.ly b/Documentation/snippets/creating-slurs-across-voices.ly
index f885e0bcb3..2e893c8ca3 100644
--- a/Documentation/snippets/creating-slurs-across-voices.ly
+++ b/Documentation/snippets/creating-slurs-across-voices.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, keyboards, unfretted-strings"
+  lsrtags = "keyboards, real-music, unfretted-strings, connecting-notes, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -37,6 +37,7 @@ solo violin, BWV 1004.
   doctitle = "Creating slurs across voices"
 } % begin verbatim
 
+
 \relative c' {
   <<
     {
diff --git a/Documentation/snippets/creating-text-spanners.ly b/Documentation/snippets/creating-text-spanners.ly
index d16fc52716..fcfd06d1cb 100644
--- a/Documentation/snippets/creating-text-spanners.ly
+++ b/Documentation/snippets/creating-text-spanners.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, text, tweaks-and-overrides"
+  lsrtags = "text, tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -30,6 +30,7 @@ to modify its output.
   doctitle = "Creating text spanners"
 } % begin verbatim
 
+
 \paper { ragged-right = ##f }
 
 \relative c'' {
diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
index b01a0ad757..1e69c099b1 100644
--- a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords, keyboards, tweaks-and-overrides"
+  lsrtags = "keyboards, workaround, chords, tweaks-and-overrides"
 
   texidoc = "
 Sometimes it is better to use stems from the upper staff for creating
@@ -22,6 +22,7 @@ between staves using @code{\\override Staff.Beam #'collision-voice-only
   doctitle = "Cross-staff chords - beaming problems workaround"
 } % begin verbatim
 
+
 \new PianoStaff <<
   \new Staff = up
     \relative c' {
@@ -37,6 +38,7 @@ between staves using @code{\\override Staff.Beam #'collision-voice-only
           e e e }
         { s4
           \change Staff = "bottom"
+          \override NoteColumn #'ignore-collision = ##t
           c, c c
         }
       >>
diff --git a/Documentation/snippets/cross-staff-tremolos.ly b/Documentation/snippets/cross-staff-tremolos.ly
index 08c09534dd..52036a5d8a 100644
--- a/Documentation/snippets/cross-staff-tremolos.ly
+++ b/Documentation/snippets/cross-staff-tremolos.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "repeats, keyboards"
+  lsrtags = "repeats, keyboards, real-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
@@ -43,6 +43,7 @@ its @code{\\change Staff} command.
   doctitle = "Cross-staff tremolos"
 } % begin verbatim
 
+
 \new PianoStaff <<
   \new Staff = "up" \relative c'' {
     \key a \major
diff --git a/Documentation/snippets/custodes.ly b/Documentation/snippets/custodes.ly
index f76f74ab14..4f7bf88411 100644
--- a/Documentation/snippets/custodes.ly
+++ b/Documentation/snippets/custodes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, tweaks-and-overrides"
+  lsrtags = "specific-notation, ancient-notation, symbols-and-glyphs, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -23,6 +23,7 @@ Custodes may be engraved in various styles.
   doctitle = "Custodes"
 } % begin verbatim
 
+
 \layout { ragged-right = ##t }
 
 \new Staff \with { \consists "Custos_engraver" } \relative c' {
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index 9219df9c54..580d255484 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.15.25"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -59,6 +59,7 @@ can be omitted in property overrides.
   doctitle = "Customizing fretboard fret diagrams"
 } % begin verbatim
 
+
 \include "predefined-guitar-fretboards.ly"
 \storePredefinedDiagram #default-fret-table \chordmode { c' }
                         #guitar-tuning
diff --git a/Documentation/snippets/customizing-markup-fret-diagrams.ly b/Documentation/snippets/customizing-markup-fret-diagrams.ly
index edd954f650..2d4195f241 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -52,6 +52,7 @@ markup.
   doctitle = "Customizing markup fret diagrams"
 } % begin verbatim
 
+
 <<
   \chords { c1 | c | c | d }
 
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 0822c3a58c..15ee9c5a65 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -35,6 +35,7 @@ by the @code{Stem} property @code{neutral-direction}.
   doctitle = "Default direction of stems on the center line of the staff"
 } % begin verbatim
 
+
 \relative c'' {
   a4 b c b
   \override Stem #'neutral-direction = #up
diff --git a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly
similarity index 97%
rename from Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
rename to Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly
index 025b32766b..dfa5ee8e23 100644
--- a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
+++ b/Documentation/snippets/defining-an-engraver-in-scheme--ambitus-engraver.ly
@@ -8,19 +8,6 @@
 \version "2.15.31"
 
 \header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-
-  texidoces = "
-Este ejemplo demuestra cómo se puede definir el grabador de ámbito en
-el espacio del usuario, con un grabador de Scheme.
-
-Esto es básicamente una reescritura en Scheme del código de
-@file{lily/ambitus-engraver.cc}.
-
-"
-
-  doctitlees = "Definir un grabador en Scheme: grabador de ámbito"
-
 
   lsrtags = "contexts-and-engravers"
 
diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
index 77124566c8..1b9a454da5 100644
--- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
+++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 
@@ -65,8 +66,6 @@ contiennent des informations sur les cordes.  Ceci est amené à évoluer.
   doctitlefr = "Création de diagrammes de fret prédéfinis pour d'autres instruments"
 
 
-  lsrtags = "fretted-strings"
-
   texidoc = "
 Predefined fret diagrams can be added for new instruments in addition
 to the standards used for guitar.  This file shows how this is done by
diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index 63ae65d2be..23f6e43853 100644
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "midi"
+  lsrtags = "specific-notation, real-music, midi"
 
   texidoc = "
 Problem: How to know which @code{midiInstrument} would be best for your
@@ -19,6 +19,7 @@ composition? Solution: A LilyPond demo file.
   doctitle = "Demo MidiInstruments"
 } % begin verbatim
 
+
 \header {
   title = "Demo of all midi sounds"
   arranger = "Myself "
diff --git a/Documentation/snippets/demonstrating-all-headers.ly b/Documentation/snippets/demonstrating-all-headers.ly
index b20082f2b8..9519265981 100644
--- a/Documentation/snippets/demonstrating-all-headers.ly
+++ b/Documentation/snippets/demonstrating-all-headers.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
@@ -16,6 +16,7 @@ A demonstration of all headers.
   doctitle = "Demonstrating all headers"
 } % begin verbatim
 
+
 \header {
   copyright = "copyright"
   title = "title"
diff --git a/Documentation/snippets/devel.snippet-list b/Documentation/snippets/devel.snippet-list
new file mode 100644
index 0000000000..0bfd3b3b08
--- /dev/null
+++ b/Documentation/snippets/devel.snippet-list
@@ -0,0 +1,2 @@
+displaying-grob-ancestry.ly
+using-ly-grob-object-to-access-grobs-with--tweak.ly
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 c9552557c9..4333ea64a6 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,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
@@ -70,6 +70,7 @@ 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 <<
diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 0804d76cab..382cea1d1f 100644
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.15.32"
 
 \header {
+  lsrtags = "workaround, simultaneous-notes, chords"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -17,15 +18,14 @@ dos veces con distintas alteraciones.
 "
   doctitlees = "Impresión de acordes complejos"
 
-  lsrtags = "simultaneous-notes, chords"
   texidoc = "
 Here is a way to display a chord where the same note is played twice
 with different accidentals.
+
 "
   doctitle = "Displaying complex chords"
 } % begin verbatim
 
-
 fixA = {
   \once \override Stem #'length = #9
 }
diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index 3a20732484..f1b4117063 100644
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "devel, tweaks-and-overrides, scheme-language"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -78,35 +79,21 @@ NoteHead X,Y: NoteColumn
 
   doctitlees = "Imprimir el árbol genealógico de un grob"
 
-  lsrtags = "tweaks-and-overrides"
-
   texidoc = "
 When working with grob callbacks, it can be helpful to understand a
-grob's @qq{ancestry}.  Most grobs have @qq{parents} which influence the
-positioning of the grob.  X- and Y-parents influence the horizontal and
-vertical positions for the grob, respectively.  Additionally, each
+grob's @qq{ancestry}. Most grobs have @qq{parents} which influence the
+positioning of the grob. X- and Y-parents influence the horizontal and
+vertical positions for the grob, respectively. Additionally, each
 parent may have parents of its own.
 
 
 Unfortunately, there are several aspects of a grob's ancestry that can
 lead to confusion:
 
-
-@itemize
-
-@item
-The types of parents a grob has may depend on context.
-
-@item
-For some grobs, the X- and Y-parents are the same.
-
-@item
-A particular @qq{ancestor} may be related to a grob in multiple ways.
-
-@item
-The concept of @qq{generations} is misleading.
-
-@end itemize
+* The types of parents a grob has may depend on context. * For some
+grobs, the X- and Y-parents are the same. * A particular @qq{ancestor}
+may be related to a grob in multiple ways. * The concept of
+@qq{generations} is misleading.
 
 
 For example, the @code{System} grob can be both parent (on the Y-side)
@@ -120,18 +107,15 @@ ancestry.
 
 When called this way
 
-@example
+
 @{
-   \\once \\override NoteHead #'before-line-breaking = #display-ancestry
-   c4
-@}
-@end example
+ \\once \\override NoteHead #'before-line-breaking = #display-ancestry
+ c @}
 
 
 The following output is generated:
 
 
-@example
 ------------------------------------
 
 NoteHead X,Y: NoteColumn
@@ -144,14 +128,13 @@ NoteHead X,Y: NoteColumn
           X: NonMusicalPaperColumn
              X,Y: System
           Y: System
-@end example
+
 
 
 "
   doctitle = "Displaying grob ancestry"
 } % begin verbatim
 
-
 #(define (grob-name grob)
    (if (ly:grob? grob)
        (assoc-ref (ly:grob-property grob 'meta) 'name)
@@ -195,11 +178,10 @@ NoteHead X,Y: NoteColumn
     (format #f "~&")))
 
 #(define (display-ancestry grob)
-   (display
-    (string-append
-     (format #f "~3&~a~2%" (make-string 36 #\-))
-     (format-ancestry (get-ancestry grob) 0)
-     (format #f "~2&"))))
+   (format (current-error-port)
+      "~3&~a~2%~a~&"
+      (make-string 36 #\-)
+      (format-ancestry (get-ancestry grob) 0)))
 
 \relative c' {
   \once \override NoteHead #'before-line-breaking = #display-ancestry
diff --git a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
deleted file mode 100644
index e6d4d380d0..0000000000
--- a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ /dev/null
@@ -1,75 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  doctitlees = "Alteraciones de estilo dodecafónico para todas las notas incluidas las naturales"
-  texidoces = "
-En las obras de principios del s.XX, empezando por Schoenberg, Berg y
-Webern (la @qq{Segunda} escuela de Viena), cada nota de la escala de
-doce tonos se debe tratar con igualdad, sin ninguna jerarquía como los
-grados clásicos tonales.  Por tanto, estos compositores imprimen una
-alteración accidental para cada nota, incluso en las notas naturales,
-para enfatizar su nuevo enfoque de la teoría y el lenguaje musicales.
-
-Este fragmento de código muestra cómo conseguir dichas reglas de
-notación.
-
-"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
- In Werken des frühen 20. Jahrhundert, angefangen mit Schönberg, Berg
- und Webern (die zweite Wiener Schule), wird jeder Ton der
- Zwölftonleiter als gleichwertig erachtet, ohne hierarchische
- Ordnung.  Deshalb wird in dieser Musik für jede Note ein Versetzungszeichen
- ausgegeben, auch für unalterierte Tonhöhen, um das neue Verständnis
- der Musiktheorie und Musiksprache zu verdeutlichen.
-
- Dieser Schnipsel zeigt, wie derartige Notationsregeln zu erstellen sind.
- "
-  doctitlede = "Versetzungszeichen für jede Note im Stil der Zwölftonmusik"
-
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
-  texidocfr = "
-Au début du XXe siècle, Schoenberg, Berg et Webern -- la « Seconde »
-école de Vienne -- imaginèrent de donner une importance comparable aux
-douze notes de la gamme chromatique, et éviter ainsi toute tonalité.
-Pour ce faire, ces compositions font apparaître une altération à chaque
-note, y compris un bécarre, pour mettre en exergue cette nouvelle
-approche de la théorie et du langage musicaux.
-
-Voici comment obtenir une telle notation.
-
-"
-  doctitlefr = "Le dodécaphonisme : toute note est altérée"
-
-
-  lsrtags = "pitches"
-  texidoc = "
-In early 20th century works, starting with Schoenberg, Berg and Webern
-(the @qq{Second} Viennese school), every pitch in the twelve-tone scale
-has to be regarded as equal, without any hierarchy such as the
-classical (tonal) degrees. Therefore, these composers print one
-accidental for each note, even at natural pitches, to emphasize their
-new approach to music theory and language.
-
-This snippet shows how to achieve such notation rules.
-
-"
-  doctitle = "Dodecaphonic-style accidentals for each note including naturals"
-} % begin verbatim
-
-
-\markup {
-  This snippet is deprecated as of version 2.12 and
-  will be removed from the documentation in 2.14.
-}
-
diff --git a/Documentation/snippets/dotted-harmonics.ly b/Documentation/snippets/dotted-harmonics.ly
index bd942ce2bc..07bb3a9784 100644
--- a/Documentation/snippets/dotted-harmonics.ly
+++ b/Documentation/snippets/dotted-harmonics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "unfretted-strings, tweaks-and-overrides"
+  lsrtags = "real-music, tweaks-and-overrides, unfretted-strings"
 
   texidoc = "
 Artificial harmonics using @code{\\harmonic} do not show dots.  To
@@ -17,6 +17,7 @@ override this behavior, set the context property @code{harmonicDots}.
   doctitle = "Dotted harmonics"
 } % begin verbatim
 
+
 \relative c''' {
   \time 3/4
   \key f \major
diff --git a/Documentation/snippets/double-glissando.ly b/Documentation/snippets/double-glissando.ly
index dfae532646..b81177dc07 100644
--- a/Documentation/snippets/double-glissando.ly
+++ b/Documentation/snippets/double-glissando.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, simultaneous-notes"
+  lsrtags = "workaround, simultaneous-notes, contemporary-notation, expressive-marks"
 
   texidoc = "
 To connect chords with glissando lines, attach a second glissando to a
@@ -17,6 +17,7 @@ hidden voice.
   doctitle = "Double glissando"
 } % begin verbatim
 
+
 \relative c {
   \clef bass
   <<
diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index 539c16f2d1..e28c35c903 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, tweaks-and-overrides, scheme-language"
 
   texidoc = "
 The @code{print-function} can be overridden to draw a box around an
@@ -17,6 +17,7 @@ arbitrary grob.
   doctitle = "Drawing boxes around grobs"
 } % begin verbatim
 
+
 \relative c'' {
   \override TextScript #'stencil =
     #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
diff --git a/Documentation/snippets/drawing-circles-around-note-heads.ly b/Documentation/snippets/drawing-circles-around-note-heads.ly
index dc677772d2..5125f5a411 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.14.0"
+\version "2.14.2"
 
 \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 773804c656..e2a3f334b7 100644
--- a/Documentation/snippets/drawing-circles-around-various-objects.ly
+++ b/Documentation/snippets/drawing-circles-around-various-objects.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, tweaks-and-overrides, scheme-language"
 
   texidoc = "
 The @code{\\circle} markup command draws circles around various
diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
index 226f0389c1..4d313e95c3 100644
--- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -45,15 +46,16 @@ qu'à la note suivante.
   doctitlefr = "Personnalisation des extenseurs de nuance postfix"
 
 
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "Postfix functions for custom crescendo text spanners.  The spanners
-should start on the first note of the measure.  One has to use -\mycresc,
-otherwise the spanner start will rather be assigned to the next note.
+  texidoc = "
+Postfix functions for custom crescendo text spanners.  The spanners
+should start on the first note of the measure.  One has to use
+-\\mycresc, otherwise the spanner start will rather be assigned to the
+next note.
+
 "
   doctitle = "Dynamics custom text spanner postfix"
 } % begin verbatim
 
-
 % Two functions for (de)crescendo spanners where you can explicitly give the
 % spanner text.
 mycresc =
@@ -75,6 +77,3 @@ mydecresc =
   c4-\mydecresc "custom decresc" c4 c4 c4 |
   c4 c4\! c4 c4
 }
-
-
-
diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly
index 0cc8d24cf2..51a0c4420d 100644
--- a/Documentation/snippets/dynamics-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -50,14 +51,15 @@ textuelle avec extension.
   doctitlefr = "Extensions de nuance postfix"
 
 
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "Custom text spanners can be defined and used with hairpin
-  and text crescendos.  @code{\<} and @code{\>} produce hairpins by
-  default, @code{\\cresc} etc. produce text spanners by default."
+  texidoc = "
+Custom text spanners can be defined and used with hairpin and text
+crescendos.  @code{\\<} and @code{\\>} produce hairpins by default,
+@code{\\cresc} etc. produce text spanners by default.
+
+"
   doctitle = "Dynamics text spanner postfix"
 } % begin verbatim
 
-
 % Some sample text dynamic spanners, to be used as postfix operators
 crpoco =
 #(make-music 'CrescendoEvent
@@ -72,4 +74,3 @@ crpoco =
   g4 a4\! b4\< c4 |
   g4\dim a4 b4\decresc c4\!
 }
-
diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly
index bde46b8f21..b185644c7b 100644
--- a/Documentation/snippets/editorial-headword.ly
+++ b/Documentation/snippets/editorial-headword.ly
@@ -1,11 +1,25 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "headword"
+
+  texidoc = "
+NR 1.7 Editorial annotations
+
+Beethoven, Op. 31, No. 3 Piano sonata 18, Movt II, Scherzo Measures 9 -
+14
+
+"
+  doctitle = "Editorial headword"
+} % begin verbatim
+
+
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
@@ -19,8 +33,7 @@
   lsrtags = "headwords"
   texidoc = ""
   doctitle = "headword"
-} % begin verbatim
-
+}
 
 % NR 1.7 Editorial annotations
 
diff --git a/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
index 1d0fbd5da8..6ef6d0374f 100644
--- a/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
+++ b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, text"
+  lsrtags = "specific-notation, editorial-annotations, text, really-cool"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -25,6 +25,7 @@ block.
   doctitle = "Embedding native PostScript in a \\markup block"
 } % begin verbatim
 
+
 % PostScript is a registered trademark of Adobe Systems Inc.
 
 \relative c'' {
diff --git a/Documentation/snippets/engravers-one-by-one.ly b/Documentation/snippets/engravers-one-by-one.ly
index a139c4fffe..7a7b274e2a 100644
--- a/Documentation/snippets/engravers-one-by-one.ly
+++ b/Documentation/snippets/engravers-one-by-one.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, contexts-and-engravers"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Del problema central de la notación, esto es, crear un determinado
@@ -37,8 +38,6 @@ alteraciones, líneas de compás, etc. forman un contexto de pentagrama,
 "
   doctitlees = "Los grabadores uno por uno"
 
-  lsrtags = "contexts-and-engravers"
-
   texidoc = "
 The notation problem, creating a certain symbol, is handled by plugins.
  Each plugin is called an Engraver. In this example, engravers are
@@ -72,7 +71,6 @@ line, etc. form a @code{Staff} context.
 } % begin verbatim
 
 
-
 %% sample music
 topVoice = \relative c' {
   \key d \major
diff --git a/Documentation/snippets/engraving-ties-manually.ly b/Documentation/snippets/engraving-ties-manually.ly
index e015dc4006..6b427ec5d3 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -54,6 +54,7 @@ second number indicates the direction (1 = up, -1 = down).
   doctitle = "Engraving ties manually"
 } % begin verbatim
 
+
 \relative c' {
   <c e g>2~ <c e g>
   \override TieColumn #'tie-configuration =
diff --git a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
index bf6981d212..a4e1397e03 100644
--- a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
+++ b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, repeats"
+  lsrtags = "repeats, rhythms"
 
   texidoc = "
 If a tremolo's total duration is less than a quarter-note, or exactly a
@@ -25,6 +25,7 @@ the @code{'gap} property.
   doctitle = "Engraving tremolos with floating beams"
 } % begin verbatim
 
+
 \relative c'' {
   \repeat tremolo 8 { a32 f }
   \override Beam #'gap-count = #1
diff --git a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
index 0b8b646017..52360f3dfb 100644
--- a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
+++ b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "syntax-and-expressions, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Escribir varios grupos especiales usando una sola instrucción \\times"
@@ -77,6 +77,7 @@ information about @code{ly:make-moment}.
   doctitle = "Entering several tuplets using only one \\times command"
 } % begin verbatim
 
+
 \relative c' {
   \time 2/4
   \set tupletSpannerDuration = #(ly:make-moment 1 4)
diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly
index f9ed38c03d..eb6b31b11f 100644
--- a/Documentation/snippets/expressive-headword.ly
+++ b/Documentation/snippets/expressive-headword.ly
@@ -1,11 +1,21 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "headword"
+
+  texidoc = "
+Expressive headword
+
+"
+  doctitle = "Expressive headword"
+} % begin verbatim
+
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
@@ -15,14 +25,6 @@
 
 % NR 1.3 Expressive marks
 
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
-
-
 % L. v. Beethoven, Op. 49 no. 1
 % Piano sonata 19 - "Leichte Sonate"
 % measures 1 - 12
diff --git a/Documentation/snippets/expressive-marks.snippet-list b/Documentation/snippets/expressive-marks.snippet-list
index 425f8754a8..0b66df27e6 100644
--- a/Documentation/snippets/expressive-marks.snippet-list
+++ b/Documentation/snippets/expressive-marks.snippet-list
@@ -39,7 +39,6 @@ line-arrows.ly
 making-slurs-with-complex-dash-structure.ly
 modifying-default-values-for-articulation-shorthand-notation.ly
 moving-slur-positions-vertically.ly
-piano-template-with-centered-dynamics.ly
 positioning-arpeggios.ly
 positioning-text-markups-inside-slurs.ly
 printing-hairpins-using-al-niente-notation.ly
@@ -47,7 +46,7 @@ printing-metronome-and-rehearsal-marks-below-the-staff.ly
 setting-hairpin-behavior-at-bar-lines.ly
 setting-the-minimum-length-of-hairpins.ly
 showing-the-same-articulation-above-and-below-a-note-or-chord.ly
-snap-pizzicato-bartok-pizzicato.ly
+snap-pizzicato-or-bartok-pizzicato.ly
 using-arpeggiobracket-to-make-divisi-more-visible.ly
 using-double-slurs-for-legato-chords.ly
 using-the-whiteout-property.ly
diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
index e11476713f..a7daa7de1a 100644
--- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly
+++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, workaround, fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -18,9 +19,9 @@ expresión.
 
   doctitlees = "Simular un hammer o ligado ascendente en una tablatura"
 
-  lsrtags = "fretted-strings"
   texidoc = "
 A hammer in tablature can be faked with slurs.
+
 "
   doctitle = "Faking a hammer in tablatures"
 } % begin verbatim
diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index 40d2973706..45f6bab9b4 100644
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -1,11 +1,21 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "headword"
+
+  texidoc = "
+Figured bass headword
+
+"
+  doctitle = "Figured bass headword"
+} % begin verbatim
+
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f
@@ -15,14 +25,6 @@
 
 % NR 2.7.3 Figured bass
 
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
-
-
 % Arcangelo Corelli, 12 Sonate da Camera, Op. 2
 % Sonata II, Allemanda
 % measures 1 - 88
diff --git a/Documentation/snippets/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
index 4a01275ade..501e103589 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
@@ -16,6 +16,7 @@ The appearance of pedal brackets may be altered in different ways.
   doctitle = "Fine-tuning pedal brackets"
 } % begin verbatim
 
+
 \paper { ragged-right = ##f }
 \relative c'' {
   c2\sostenutoOn c
diff --git a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
index f213f7377c..25e708e5ae 100644
--- a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
+++ b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "winds"
+  lsrtags = "winds, symbols-and-glyphs"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
diff --git a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
index 938e860015..d7ba99e627 100644
--- a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
+++ b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings"
@@ -44,6 +44,7 @@ right-hand fingering.
   doctitle = "Fingerings string indications and right-hand fingerings"
 } % begin verbatim
 
+
 #(define RH rightHandFinger)
 
 \relative c {
diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index e1affe325a..3197f6c30f 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, version-specific, fretted-strings, stylesheet"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -48,38 +49,19 @@ copiar como @file{flamenco.ly} e incluirse en los documentos fuente.
 "
   doctitlees = "Notación del flamenco"
 
-  lsrtags = "fretted-strings"
-
   texidoc = "
 For flamenco guitar, special notation is used:
 
 
-@itemize
-
-@item
-a golpe symbol to indicate a slap on the guitar body with the nail of
-the ring finger
-
-@item
-an arrow to indicate (the direction of) strokes
-
-@item
+* a golpe symbol to indicate a slap on the guitar body with the nail of
+the ring finger * an arrow to indicate (the direction of) strokes *
 different letters for fingering (@qq{p}: thumb, @qq{i}: index finger,
-@qq{m}: middle finger, @qq{a}: ring finger and @qq{x}: little finger)
-
-@item
-3- and 4-finger rasgueados: stroke upwards with all fingers, ending
-with an up- and down using the index finger
-
-@item
-abanicos: strokes (in tuples) with thumb (down), little and index finger
-(both up) (there is also an abanico 2 where middle and ring finger are
-used instead of the little finger)
-
-@item
-alza pua: fast playing with the thumb
-
-@end itemize
+@qq{m}: middle finger, @qq{a}: ring finger and @qq{x}: little finger) *
+3- and 4-finger rasgueados; stroke upwards with all fingers, ending
+with an up- and down using the index finger * abanicos: strokes (in
+tuples) with thumb (down), little and index finger (both up). There's
+also an abanico 2 where middle and ring finger are used instead of the
+little finger. * alza pua: fast playing with the thumb
 
 
 Most figures use arrows in combination with fingering; with abanicos
diff --git a/Documentation/snippets/flat-flags-and-beam-nibs.ly b/Documentation/snippets/flat-flags-and-beam-nibs.ly
index 55202767e2..f6972aeadf 100644
--- a/Documentation/snippets/flat-flags-and-beam-nibs.ly
+++ b/Documentation/snippets/flat-flags-and-beam-nibs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "contemporary-notation, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index 2e0a858e4f..0c2f65f61e 100644
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "winds"
+  lsrtags = "winds, contemporary-notation"
 
   texidoc = "
 It is possible to indicate special articulation techniques such as a
@@ -18,6 +18,7 @@ glyph.
   doctitle = "Flute slap notation"
 } % begin verbatim
 
+
 slap =
 #(define-music-function (parser location music) (ly:music?)
 #{
diff --git a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
index 8952a2fc53..bc11fa25de 100644
--- a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
+++ b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches"
@@ -20,6 +20,7 @@ Staff.forceClef = ##t}.
   doctitle = "Forcing a clef symbol to be displayed"
 } % begin verbatim
 
+
 \relative c' {
   \clef treble
   c1
diff --git a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
index 813b98acc9..fe68e09b99 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -50,6 +50,7 @@ are staff spaces.
   doctitle = "Forcing horizontal shift of notes"
 } % begin verbatim
 
+
 \relative c' <<
   {
     <d g>2 <d g>
diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
index 13b58e4c90..69792fb1cf 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "vocal-music"
@@ -30,6 +30,7 @@ omitted.  The behaviour can be overridden with the
   doctitle = "Forcing hyphens to be shown"
 } % begin verbatim
 
+
 \relative c'' {
   c32 c c c
   c32 c c c
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 8489671c05..830a03c6b1 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation"
+  lsrtags = "workaround, staff-notation"
 
   texidoc = "
 By default, metronome marks do not influence horizontal spacing.  This
@@ -20,6 +20,7 @@ through a simple override, as shown in the second half of the example.
   doctitle = "Forcing measure width to adapt to MetronomeMark's width"
 } % begin verbatim
 
+
 example = {
   \tempo "Allegro"
   R1*6
diff --git a/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
index 8f4f7e2a87..9aa2f6a217 100644
--- a/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+++ b/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "preparing-parts, automatic-notation, really-simple, rhythms"
 
   texidoc = "
 This snippet demonstrates how to obtain automatic ordered rehearsal
@@ -17,6 +17,7 @@ marks, but from the letter or number desired.
   doctitle = "Forcing rehearsal marks to start from a given letter or number"
 } % begin verbatim
 
+
 \relative c'' {
   c1 \mark \default
   c1 \mark \default
diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
index 7e46edbd44..bbd2c35c0b 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, vocal-music"
+  lsrtags = "vocal-music, text"
 
 %% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
   texidoces = "
@@ -16,6 +16,7 @@ individuales dentro de la letra.
 
 "
   doctitlees = "Dar formato a sílabas de la letra"
+
 %%%    Translation of GIT committish: f86f00c1a8de0f034ba48506de2801c074bd5422
   texidocde = "
 Textbeschriftungsmodus kann eingesetzt werden, um individuelle Silben im Gesangstext
@@ -23,6 +24,7 @@ zu formatieren.
 
 "
   doctitlede = "Silben im Gesangstext formatieren"
+
 %%  Translation of GIT committish: d9d1da30361a0bcaea1ae058eb1bc8dd3a5b2e4c
   texidocfr = "
 Le mode markup permet d'individualiser la mise en forme de certaines syllabes.
diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index 029aa35e68..d158584552 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -17,6 +17,7 @@ diagrams.
   doctitle = "Fret diagrams explained and developed"
 } % begin verbatim
 
+
 <<
   \chords {
     a2 a
diff --git a/Documentation/snippets/fretboards-alternate-tables.ly b/Documentation/snippets/fretboards-alternate-tables.ly
index b9d9b5a0ff..0d99001722 100644
--- a/Documentation/snippets/fretboards-alternate-tables.ly
+++ b/Documentation/snippets/fretboards-alternate-tables.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -67,26 +68,23 @@ par la propriété @code{\\predefinedDiagramTable}.
   doctitlefr = "Diagrammes de fret alternatifs"
 
 
-  lsrtags = "fretted-strings"
-
   texidoc = "
 Alternate fretboard tables can be created.  These would be used in
 order to have alternate fretboards for a given chord.
 
-In order to use an alternate fretboard table, the table must first
-be created.  Fretboards are then added to the table.
+In order to use an alternate fretboard table, the table must first be
+created.  Fretboards are then added to the table.
 
-The created fretboard table can be blank, or it can be copied
-from an existing table.
+The created fretboard table can be blank, or it can be copied from an
+existing table.
 
-The table to be used in displaying predefined fretboards is selected
-by the property @code{\\predefinedDiagramTable}.
-"
+The table to be used in displaying predefined fretboards is selected by
+the property @code{\\predefinedDiagramTable}.
 
-  doctitle = "Alternate fretboard tables"
+"
+  doctitle = "Fretboards alternate tables"
 } % begin verbatim
 
-
 \include "predefined-guitar-fretboards.ly"
 
 % Make a blank new fretboard table
diff --git a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
index 8f1747ef42..2417958a8d 100644
--- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Armónicos sobre cuerdas pisadas (armónicos artificiales):
@@ -29,14 +30,13 @@ Harmoniques et tablature (harmoniques artificielles)
   doctitlefr = "Harmoniques et tablature"
 
 
-  lsrtags = "fretted-strings"
   texidoc = "
-Fretted-string harmonics:
+Demonstrates fretted-string harmonics in tablature
+
 "
   doctitle = "Fretted-string harmonics in tablature"
 } % begin verbatim
 
-
 pinchedHarmonics = {
    \textSpannerDown
    \override TextSpanner #'bound-details #'left #'text =
diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list
index c10384bba3..9854081839 100644
--- a/Documentation/snippets/fretted-strings.snippet-list
+++ b/Documentation/snippets/fretted-strings.snippet-list
@@ -21,7 +21,6 @@ how-to-change-fret-diagram-position.ly
 jazz-combo-template.ly
 laissez-vibrer-ties.ly
 letter-tablature-formatting.ly
-modern-tab-text-clef.ly
 open-string-harmonics-in-tablature.ly
 placement-of-right-hand-fingerings.ly
 polyphony-in-tablature.ly
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index a21dce7612..ced2e33327 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "pitches"
+  lsrtags = "really-cool, pitches, scheme-language"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -31,6 +31,7 @@ get different random note patterns, just change this number.
   doctitle = "Generating random notes"
 } % begin verbatim
 
+
 \score {
   {
     $(let ((random-state (seed->random-state (current-time))))
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
new file mode 100644
index 0000000000..a8e3f0cb73
--- /dev/null
+++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
@@ -0,0 +1,119 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "really-cool, automatic-notation, scheme-language"
+
+  texidoc = "
+A lilypond score internally is just a Scheme expression, generated by
+the lilypond parser. Using scheme, one can also automatically generate
+a score without an input file. If you have the music expression in
+scheme, a score can be generated by simply calling (scorify-music music
+parser) on your music. This will generate a score object, for which you
+can then set a custom layout block with (let* ((layout
+(ly:output-def-clone $defaultlayout)))
+   ; modify the layout here, then assign it:
+   (ly:score-add-output-def! score layout)
+  )
+
+
+Finally, all you have to do it to pass this score to lilypond for
+typesetting. This snippet defines functions @code{(add-score parser
+score)}, @code{(add-text parser text)} and @code{(add-music parser
+music)} to pass a complete score, some markup or some music to lilypond
+for typesetting.
+
+This snippet also works for typesetting scores inside a @code{\\book
+@{...@}} block, as well as top-level scores. To achieve this, each
+score schedulled for typesetting is appended to the list of toplevel
+scores and the toplevel-book-handler (which is a scheme function called
+to process a book once a @code{\\book@{..@}} block is closed) is
+modified to inser all collected scores so far to the book.
+
+"
+  doctitle = "Generating whole scores (also book parts) in scheme without using the parser"
+} % begin verbatim
+
+#(define-public (add-score parser score)
+   (ly:parser-define! parser 'toplevel-scores
+                      (cons score (ly:parser-lookup parser 'toplevel-scores))))
+
+#(define-public (add-text parser text)
+  (add-score parser (list text)))
+
+#(define-public (add-music parser music)
+  (collect-music-aux (lambda (score)
+		       (add-score parser score))
+                     parser
+		     music))
+
+#(define-public (toplevel-book-handler parser book)
+   (map (lambda (score)
+          (ly:book-add-score! book score))
+        (reverse! (ly:parser-lookup parser 'toplevel-scores)))
+   (ly:parser-define! parser 'toplevel-scores (list))
+   (print-book-with-defaults parser book))
+
+#(define-public (book-score-handler book score)
+   (add-score parser score))
+
+#(define-public (book-text-handler book text)
+   (add-text parser text))
+
+#(define-public (book-music-handler parser book music)
+   (add-music parser music))
+
+%%%
+
+
+%% Just some example score to show how to use these functions:
+#(define add-one-note-score #f)
+#(let ((pitch 0))
+  (set! add-one-note-score
+        (lambda (parser)
+          (let* ((music (make-music 'EventChord
+                          'elements (list (make-music 'NoteEvent
+                                            'duration (ly:make-duration 2 0 1 1)
+                                            'pitch (ly:make-pitch 0 pitch 0)))))
+                 (score (scorify-music music parser))
+                 (layout (ly:output-def-clone $defaultlayout))
+                 (note-name (case pitch
+                              ((0) "do")
+                              ((1) "ré")
+                              ((2) "mi")
+                              ((3) "fa")
+                              ((4) "sol")
+                              ((5) "la")
+                              ((6) "si")
+                              (else "huh")))
+                 (title (markup #:large #:line ("Score with a" note-name))))
+            (ly:score-add-output-def! score layout)
+            (add-text parser title)
+            (add-score parser score))
+            (set! pitch (modulo (1+ pitch) 7)))))
+
+oneNoteScore =
+#(define-music-function (parser location) ()
+   (add-one-note-score parser)
+   (make-music 'Music 'void #t))
+
+%%%
+
+\book {
+  \oneNoteScore
+}
+
+
+\book {
+  \oneNoteScore
+  \oneNoteScore
+}
+
+% Top-level scores are also handled correctly
+\oneNoteScore
+\oneNoteScore
diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
index e08ac24af2..0eb43f4de1 100644
--- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
+++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "winds"
+
 %%%    Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -40,16 +41,14 @@ située à côté d'un trou plutôt que sa représentation graphique.
   doctitlefr = "Ajout de texte à un diagramme de doigté"
 
 
-  lsrtags="winds"
-  texidoc="
-In may cases, the keys other than the central column can be
-displayed by key name as well as by graphical means.
-"
+  texidoc = "
+In many cases, the keys other than the central column can be displayed
+by key name as well as by graphical means.
 
+"
   doctitle = "Graphical and text woodwind diagrams"
 } % begin verbatim
 
-
 \relative c'' {
   \textLengthOn
   c1^\markup
diff --git a/Documentation/snippets/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly
index 7e1f514090..bfb73cb01f 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -43,6 +43,7 @@ properties.
   doctitle = "Grid lines: changing their appearance"
 } % begin verbatim
 
+
 \score {
   \new ChoirStaff <<
     \new Staff {
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 1adb6f73ff..64caf5673b 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -29,6 +29,7 @@ this snippet.
   doctitle = "Grid lines: emphasizing rhythms and notes synchronization"
 } % begin verbatim
 
+
 \score {
   \new ChoirStaff {
     \relative c'' <<
diff --git a/Documentation/snippets/grouping-beats.ly b/Documentation/snippets/grouping-beats.ly
deleted file mode 100644
index 9e529e9db3..0000000000
--- a/Documentation/snippets/grouping-beats.ly
+++ /dev/null
@@ -1,50 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  texidoces = "
-Los patrones de barrado se pueden alterar con la propiedad
-@code{beatGrouping}:
-
-"
-  doctitlees = "Agrupar los pulsos"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-texidocde = "
-Balkengruppen können mit der @code{beatGrouping}-Eigenschaft geändert
-werden:
-
-"
-  doctitlede = "Notengruppen"
-
-
-
-%% Translation of GIT committish: 708e0d9c660856b19929736ca18a6f9d68539c60
-  texidocfr = "
-La manière de gérer les ligatures est influencée par la propriété
-@code{beatGrouping} :
-
-"
-  doctitlefr = "Regroupement selon la pulsation"
-
-  lsrtags = "rhythms"
-  texidoc = "
-Beaming patterns may be altered with the @code{beatGrouping} property:
-
-"
-  doctitle = "Grouping beats"
-} % begin verbatim
-
-
-\markup {
-  This snippet is deprecated as of version 2.13.5 and will be removed
-  in version 2.14.
-}
diff --git a/Documentation/snippets/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly
index 0137c35a2f..f1aad5362e 100644
--- a/Documentation/snippets/guitar-strum-rhythms.ly
+++ b/Documentation/snippets/guitar-strum-rhythms.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, fretted-strings"
+  lsrtags = "fretted-strings, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -45,6 +45,7 @@ melody notes, chord names and fret diagrams.
   doctitle = "Guitar strum rhythms"
 } % begin verbatim
 
+
 \include "predefined-guitar-fretboards.ly"
 <<
   \new ChordNames {
diff --git a/Documentation/snippets/hairpins-with-different-line-styles.ly b/Documentation/snippets/hairpins-with-different-line-styles.ly
index 7471b9384f..d6e061ef1a 100644
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ dotted-line, line, trill or zigzag.
   doctitle = "Hairpins with different line styles"
 } % begin verbatim
 
+
 \relative c' {
   c2\< c\!
   \override Hairpin #'style = #'dashed-line
diff --git a/Documentation/snippets/headword.snippet-list b/Documentation/snippets/headword.snippet-list
new file mode 100644
index 0000000000..1d04d2e03a
--- /dev/null
+++ b/Documentation/snippets/headword.snippet-list
@@ -0,0 +1,16 @@
+ancient-headword.ly
+chords-headword.ly
+editorial-headword.ly
+expressive-headword.ly
+figured-bass-headword.ly
+keyboard-headword.ly
+pitches-headword.ly
+repeats-headword.ly
+rhythms-headword.ly
+screech-and-boink.ly
+simultaneous-headword.ly
+staff-headword.ly
+text-headword.ly
+unfretted-headword.ly
+vocal-headword.ly
+wind-headword.ly
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index d1af5200e9..46c5b14815 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "rhythms, percussion"
+  lsrtags = "real-music, percussion, contemporary-notation, rhythms"
 
   texidoc = "
 Though the polymetric time signature shown was not the most essential
@@ -18,6 +18,7 @@ is the template of a real Balkan song!).
   doctitle = "Heavily customized polymetric time signatures"
 } % begin verbatim
 
+
 #(define plus (markup #:vcenter "+"))
 #(define ((custom-time-signature one two three four five six
                                  seven eight nine ten eleven num) grob)
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 23cdc4ccd0..81bcb5ff9c 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
@@ -1,12 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
 \header {
+  lsrtags = "pitches"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -37,12 +39,13 @@ saut de ligne.
   doctitlefr = "Non répétition de l'altération après saut de ligne sur liaison de prolongation"
 
 
-  lsrtags = "pitches"
-  texidoc = "This shows how to hide accidentals on tied notes at the beginning of a
-new system."
-  doctitle = "Hiding accidentals on tied notes at the beginning of a new system"
-} % begin verbatim
+  texidoc = "
+This shows how to hide accidentals on tied notes at the start of a new
+system.
 
+"
+  doctitle = "Hiding accidentals on tied notes at the start of a new system"
+} % begin verbatim
 
 \relative c'' {
   \override Accidental #'hide-tied-accidental-after-break = ##t
@@ -50,4 +53,3 @@ new system."
   \break
   cis
 }
-
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 a65526aa8f..f7dc49eec3 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.15.25"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -47,6 +47,7 @@ following way:
   doctitle = "Hiding the extender line for text dynamics"
 } % begin verbatim
 
+
 \relative c'' {
   \override DynamicTextSpanner #'style = #'none
   \crescTextCresc
diff --git a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
index 621c19de00..1794c15d60 100644
--- a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
+++ b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "correction-wanted, version-specific, tweaks-and-overrides, expressive-marks"
 
   texidoc = "
 Some dynamic expressions involve additional text, like @qq{sempre pp}.
@@ -52,6 +52,7 @@ not at the center of pp.
   doctitle = "Horizontally aligning custom dynamics (e.g. \"sempre pp\" \"piu f\" \"subito p\")"
 } % begin verbatim
 
+
 \header { title = "Horizontally aligning custom dynamics" }
 
 \paper { ragged-right = ##f }
diff --git a/Documentation/snippets/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
index b9d079b0a9..91c10bd9cc 100644
--- a/Documentation/snippets/how-to-change-fret-diagram-position.ly
+++ b/Documentation/snippets/how-to-change-fret-diagram-position.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "fretted-strings, tweaks-and-overrides"
+  lsrtags = "specific-notation, fretted-strings, tweaks-and-overrides"
 
   texidoc = "
 If you want to move the position of a fret diagram, for example, to
@@ -29,6 +29,7 @@ itself.
   doctitle = "How to change fret diagram position"
 } % begin verbatim
 
+
 harmonies = \chordmode
 {
   a8:13
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 2bf2b2a013..584d22c556 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, staff-notation, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks"
 
   texidoc = "
 This method prints two 'rehearsal marks', one on top of the other. It
@@ -36,6 +36,7 @@ box of the mark from its original value.
   doctitle = "How to print two rehearsal marks above and below the same barline (method 1)"
 } % begin verbatim
 
+
 \relative c'{
     c d e f |
     \once \override Score.RehearsalMark #'extra-offset = #'(0 . -8.5)
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 cfd14e83b8..0e7fb3a8cb 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, staff-notation, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks"
 
   texidoc = "
 This method prints two 'rehearsal marks' - one above the stave and one
@@ -23,6 +23,7 @@ independently of the other.
   doctitle = "How to print two rehearsal marks above and below the same barline (method 2)"
 } % begin verbatim
 
+
 \score {
   \relative c'
   <<
diff --git a/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly b/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
index c7bedbf4e2..20f56b1694 100644
--- a/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
+++ b/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, vocal-music"
+  lsrtags = "specific-notation, vocal-music, text, symbols-and-glyphs"
 
   texidoc = "
 This can be achieved by separating those syllables by tildes.
@@ -16,6 +16,7 @@ This can be achieved by separating those syllables by tildes.
   doctitle = "How to put ties between syllables in lyrics"
 } % begin verbatim
 
+
 \lyrics {
   wa~o~a
 }
diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly
index b8af195da3..22af0c489a 100644
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ strofe come testo separato sotto la musica.
 
 "
   doctitleit = "Modello per inno"
+
 %%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
@@ -58,6 +59,7 @@ verses as stand-alone text under the music.
   doctitle = "Hymn template"
 } % begin verbatim
 
+
 Timeline = {
   \time 4/4
   \tempo 4=96
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 cf69a635cb..1819c37e03 100644
--- a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "keyboards"
+  lsrtags = "keyboards, real-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -50,6 +50,7 @@ context.
   doctitle = "Indicating cross-staff chords with arpeggio bracket"
 } % begin verbatim
 
+
 \new PianoStaff <<
   \set PianoStaff.connectArpeggios = ##t
   \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
diff --git a/Documentation/snippets/inserting-a-caesura.ly b/Documentation/snippets/inserting-a-caesura.ly
index 192764f4cb..6493f3e403 100644
--- a/Documentation/snippets/inserting-a-caesura.ly
+++ b/Documentation/snippets/inserting-a-caesura.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -46,6 +46,7 @@ available.
   doctitle = "Inserting a caesura"
 } % begin verbatim
 
+
 \relative c'' {
   \override BreathingSign #'text = \markup {
     \musicglyph #"scripts.caesura.straight"
diff --git a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
index 36c4085661..b8e14d6274 100644
--- a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
+++ b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation"
+  lsrtags = "real-music, staff-notation"
 
   texidoc = "
 The @code{\\markup} command is quite versatile.  In this snippet, it
@@ -17,6 +17,7 @@ contains a @code{\\score} block instead of texts or marks.
   doctitle = "Inserting score fragments above a staff as markups"
 } % begin verbatim
 
+
 tuning = \markup {
   \score {
     \new Staff \with { \remove "Time_signature_engraver" }
diff --git a/Documentation/snippets/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly
index 2a8b8bc2cb..fc0fe89483 100644
--- a/Documentation/snippets/isolated-percent-repeats.ly
+++ b/Documentation/snippets/isolated-percent-repeats.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats"
@@ -42,6 +42,7 @@ Isolated percents can also be printed.
   doctitle = "Isolated percent repeats"
 } % begin verbatim
 
+
 makePercent =
 #(define-music-function (parser location note) (ly:music?)
    "Make a percent repeat the same length as NOTE."
diff --git a/Documentation/snippets/keep-change-clefs-full-sized.ly b/Documentation/snippets/keep-change-clefs-full-sized.ly
index 7c89686f45..0bbbff0184 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
@@ -28,6 +28,7 @@ initial clef.  This can be overridden with @code{full-size-change}.
   doctitle = "Keep change clefs full sized"
 } % begin verbatim
 
+
 \relative c' {
   \clef "treble"
   c1
diff --git a/Documentation/snippets/keyboard-headword.ly b/Documentation/snippets/keyboard-headword.ly
index 2e5fde7ee3..707840557f 100644
--- a/Documentation/snippets/keyboard-headword.ly
+++ b/Documentation/snippets/keyboard-headword.ly
@@ -1,31 +1,24 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
-% NR 2.2 Keyboard instruments
+\header {
+  lsrtags = "headword"
 
+  texidoc = "
+Keyboard headword
 
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
+"
+  doctitle = "Keyboard headword"
 } % begin verbatim
 
-
 % M. Ravel, Sonatine (1905)
 % First movement
+\include "english.ly"
 
 \layout {
   \context {
diff --git a/Documentation/snippets/keyboards.snippet-list b/Documentation/snippets/keyboards.snippet-list
index b8eb5cf574..f47f9c0d6a 100644
--- a/Documentation/snippets/keyboards.snippet-list
+++ b/Documentation/snippets/keyboards.snippet-list
@@ -10,7 +10,6 @@ indicating-cross-staff-chords-with-arpeggio-bracket.ly
 jazz-combo-template.ly
 laissez-vibrer-ties.ly
 piano-template-simple.ly
-piano-template-with-centered-dynamics.ly
 piano-template-with-centered-lyrics.ly
 piano-template-with-melody-and-lyrics.ly
 vocal-ensemble-template-with-automatic-piano-reduction.ly
diff --git a/Documentation/snippets/laissez-vibrer-ties.ly b/Documentation/snippets/laissez-vibrer-ties.ly
index d2f12381ad..d0df760856 100644
--- a/Documentation/snippets/laissez-vibrer-ties.ly
+++ b/Documentation/snippets/laissez-vibrer-ties.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, keyboards, fretted-strings"
+  lsrtags = "specific-notation, keyboards, fretted-strings, contemporary-notation, connecting-notes, expressive-marks"
 
   texidoc = "
 Laissez vibrer ties have a fixed size. Their formatting can be tuned
@@ -17,6 +17,7 @@ using @code{'tie-configuration}.
   doctitle = "Laissez vibrer ties"
 } % begin verbatim
 
+
 \relative c' {
   <c e g>4\laissezVibrer r <c f g>\laissezVibrer r
   <c d f g>4\laissezVibrer r <c d f g>4.\laissezVibrer r8
diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
index 12dee0fbd1..bd4fa1643e 100644
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings, staff-notation"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 La tablatura se puede formatear utilizando letras en lugar de números.
@@ -16,8 +17,6 @@ La tablatura se puede formatear utilizando letras en lugar de números.
 
   doctitlees = "Formateado de tablaturas con letras"
 
-  lsrtags = "staff-notation, fretted-strings"
-
   texidoc = "
 Tablature can be formatted using letters instead of numbers.
 
diff --git a/Documentation/snippets/line-arrows.ly b/Documentation/snippets/line-arrows.ly
index 8178486df7..4a7f7cf33f 100644
--- a/Documentation/snippets/line-arrows.ly
+++ b/Documentation/snippets/line-arrows.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -25,6 +25,7 @@ Glissando).
   doctitle = "Line arrows"
 } % begin verbatim
 
+
 \relative c'' {
   \override TextSpanner #'bound-padding = #1.0
   \override TextSpanner #'style = #'line
diff --git a/Documentation/snippets/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
index 9e2575277d..be77457c39 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, vocal-music"
+  lsrtags = "vocal-music, text, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -55,6 +55,7 @@ well.
   doctitle = "Lyrics alignment"
 } % begin verbatim
 
+
 \layout { ragged-right = ##f }
 \relative c'' {
   c1
diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
deleted file mode 100644
index c8691340ef..0000000000
--- a/Documentation/snippets/lyrics-old-spacing-settings.ly
+++ /dev/null
@@ -1,141 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: ea0b270e14781707ab52683acddf9302bbe337f3
-  texidoces = "
-El motor de espaciado vertical cambió en la versión 2.14.  Esto puede
-hacer que se altere el espaciado de la letra de las canciones.  Es
-posible fijar propiedades para los contextos @code{Lyric} y
-@code{Staff} de forma que el motor de espaciado se comporte como lo
-hacía en la versión 2.12.
-
-"
-
-  doctitlees = "Conseguir el espaciado de la letra de la versión 2.12
-  en versiones más recientes"
-
-%% Translation of GIT committish: 27b1197f3bae8512c14d946752cd3e40e7c76016
-  doctitlede = "Textverteilung wie in Version 2.12 für neuere Versionen"
-
-  texidocde = "
-Die vertikale Maschine für die Platzverteilung wurde für die Version 2.14
-verändert.  Das kann dazu führen, dass Gesangstext unterschiedlich
-verteilt wird.  Es ist möglich, die Eigenschaften der @code{Lyric}-
-und @code{Staff}-Kontexte so einzustellen, dass die Platzverteilung
-wie in der Version 2.12 arbeitet.
-"
-
-
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
-  texidocfr = "
-La version 2.14 a donné naissance à un nouveau moteur pour l'espacement
-vertical des paroles.  Celles-ci peuvent donc se retrouver positionnées
-différemment.  Le moteur adoptera les usages de la version 2.12 une fois
-que vous aurez réglé certaines propriétés des contextes @code{Lyric} et
-@code{Staff}.
-
-"
-  doctitlefr = "Espacement des paroles selon les pratiques de la version 2.12"
-
-
-  lsrtags = "vocal-music"
-
-  doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
-
-  texidoc = "
-The vertical spacing engine changed for version 2.14.  This can
-cause lyrics to be spaced differently.  It is possible to set
-properties for @code{Lyric} and @code{Staff} contexts to get the
-spacing engine to behave as it did in version 2.12.
-"
-} % begin verbatim
-
-
-global = {
-  \key d \major
-  \time 3/4
-}
-
-sopMusic = \relative c' {
-  % VERSE ONE
-  fis4 fis fis | \break
-  fis4. e8 e4
-}
-
-altoMusic = \relative c' {
-  % VERSE ONE
-  d4 d d |
-  d4. b8 b4 |
-}
-
-tenorMusic = \relative c' {
-  a4 a a |
-  b4. g8 g4 |
-}
-
-bassMusic = \relative c {
-  d4 d d |
-  g,4. g8 g4 |
-}
-
-words = \lyricmode {
-  Great is Thy faith- ful- ness,
-}
-
-\score {
-  \new ChoirStaff <<
-    \new Lyrics = sopranos
-    \new Staff = women <<
-      \new Voice = "sopranos" {
-        \voiceOne
-        \global \sopMusic
-      }
-      \new Voice = "altos" {
-        \voiceTwo
-        \global \altoMusic
-      }
-    >>
-    \new Lyrics = "altos"
-    \new Lyrics = "tenors"
-    \new Staff = men <<
-      \clef bass
-      \new Voice = "tenors" {
-        \voiceOne
-        \global \tenorMusic
-      }
-      \new Voice = "basses" {
-        \voiceTwo  \global \bassMusic
-      }
-    >>
-    \new Lyrics = basses
-    \context Lyrics = sopranos \lyricsto sopranos \words
-    \context Lyrics = altos \lyricsto altos \words
-    \context Lyrics = tenors \lyricsto tenors \words
-    \context Lyrics = basses \lyricsto basses \words
-  >>
-  \layout {
-    \context {
-      \Lyrics
-      \override VerticalAxisGroup #'staff-affinity = ##f
-      \override VerticalAxisGroup #'staff-staff-spacing =
-        #'((basic-distance . 0)
-	   (minimum-distance . 2)
-	   (padding . 2))
-    }
-    \context {
-      \Staff
-      \override VerticalAxisGroup #'staff-staff-spacing =
-        #'((basic-distance . 0)
-	   (minimum-distance . 2)
-	   (padding . 2))
-    }
-  }
-}
-
diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly
index 49446aa89f..c814553221 100644
--- a/Documentation/snippets/makam-example.ly
+++ b/Documentation/snippets/makam-example.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "version-specific, pitches, world-music"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 El «Makam» es un tipo de melodía de Turquía que
@@ -44,10 +45,9 @@ manuel d'initiation pour le localiser).
 "
   doctitlefr = "Exemple de musique « Makam »"
 
-  lsrtags = "pitches, world-music"
   texidoc = "
 Makam is a type of melody from Turkey using 1/9th-tone microtonal
-alterations.  Consult the initialization file @samp{ly/makam.ly} for
+alterations. Consult the initialization file @samp{ly/makam.ly} for
 details of pitch names and alterations.
 
 "
diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index 225821c384..d2f33cfa75 100644
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 
@@ -79,28 +80,24 @@ trait @code{segment-style} de longueur @code{segment-taille}.
   doctitlefr = "Dessin d'une liaison d'articulation au trait discontinu"
 
 
-  lsrtags = "rhythms, expressive-marks"
   texidoc = "
-Slurs can be made with complex dash patterns by defining
-the @code{dash-definition} property.  @code{dash-definition}
-is a list of @code{dash-elements}.  A @code{dash-element} is a
-list of parameters defining the dash behavior for a segment of
-the slur.
-
-The slur is defined in terms of the bezier parameter t
-which ranges from 0
-at the left end of the slur to 1 at the right end of the slur.
+Slurs can be made with complex dash patterns by defining the
+@code{dash-definition} property.  @code{dash-definition} is a list of
+@code{dash-elements}.  A @code{dash-element} is a list of parameters
+defining the dash behavior for a segment of the slur.
+
+The slur is defined in terms of the bezier parameter t which ranges
+from 0 at the left end of the slur to 1 at the right end of the slur.
 @code{dash-element} is a list @code{(start-t stop-t dash-fraction
 dash-period)}.  The region of the slur from @code{start-t} to
-@code{stop-t} will have a fraction @code{dash-fraction}
-of each @code{dash-period} black.  @code{dash-period} is
-defined in terms of staff spaces.  @code{dash-fraction} is
-set to 1 for a solid slur.
+@code{stop-t} will have a fraction @code{dash-fraction} of each
+@code{dash-period} black.  @code{dash-period} is defined in terms of
+staff spaces.  @code{dash-fraction} is set to 1 for a solid slur.
+
 "
   doctitle = "Making slurs with complex dash structure"
 } % begin verbatim
 
-
 \relative c' {
   \once \override
     Slur #'dash-definition = #'((0 0.3 0.1 0.75)
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 8dff16db55..93e99313fd 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, editorial-annotations"
+  lsrtags = "editorial-annotations, workaround, really-cool, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -56,6 +56,7 @@ emphasized, using the @code{line-positions} property of the
   doctitle = "Making some staff lines thicker than the others"
 } % begin verbatim
 
+
 {
   \override Staff.StaffSymbol #'line-positions = #'(-4 -2 -0.2 0 0.2 2 4)
   d'4 e' f' g'
diff --git a/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
index 169f17bc2b..0ff599aa90 100644
--- a/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
+++ b/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords"
@@ -20,6 +20,7 @@ extender attributed to that number right before the number.
   doctitle = "Manually break figured bass extenders for only some numbers"
 } % begin verbatim
 
+
 bassfigures = \figuremode {
   \set useBassFigureExtenders = ##t
   <6 4>4 <6 4\!> <6 4\!> <6 4\!> |  <6\! 4\!>  <6 4> <6 4\!> <6 4>
diff --git a/Documentation/snippets/manually-controlling-beam-positions.ly b/Documentation/snippets/manually-controlling-beam-positions.ly
index 6e7df11c02..dd27995e11 100644
--- a/Documentation/snippets/manually-controlling-beam-positions.ly
+++ b/Documentation/snippets/manually-controlling-beam-positions.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, connecting-notes, rhythms"
 
   texidoc = "
 Beam positions may be controlled manually, by overriding the
@@ -20,6 +20,7 @@ Beam positions may be controlled manually, by overriding the
   doctitle = "Manually controlling beam positions"
 } % begin verbatim
 
+
 \relative c' {
   \time 2/4
   % from upper staff-line (position 2) to center (position 0)
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 de954566dc..6e6c6e9134 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "editorial-annotations, vocal-music"
+  lsrtags = "vocal-music, editorial-annotations, workaround, contemporary-notation"
 
   texidoc = "
 This example shows how to put crosses on stems.  Mark the beginning of
@@ -18,6 +18,7 @@ a spoken section with the @code{\\speakOn} keyword, and end it with the
   doctitle = "Marking notes of spoken parts with a cross on the stem"
 } % begin verbatim
 
+
 speakOn = {
   \override Stem #'stencil =
     #(lambda (grob)
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 67ea23606c..ad09798f3d 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.15.25"
+\version "2.15.32"
 
 \header {
   lsrtags = "text"
@@ -17,6 +17,7 @@ Text that can spread over pages is entered with the
   doctitle = "Markup lines"
 } % begin verbatim
 
+
 #(set-default-paper-size "a6")
 
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
diff --git a/Documentation/snippets/measure-counter.ly b/Documentation/snippets/measure-counter.ly
index 5895ecae26..166e66f086 100644
--- a/Documentation/snippets/measure-counter.ly
+++ b/Documentation/snippets/measure-counter.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "repeats, staff-notation, editorial-annotations"
+  lsrtags = "repeats, editorial-annotations, workaround, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
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 973d1e5b7e..7552b20a37 100644
--- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides"
+  lsrtags = "ancient-notation, contexts-and-engravers, staff-notation, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -53,6 +53,7 @@ the @code{transparent} property.
   doctitle = "Mensurstriche layout (bar lines between the staves)"
 } % begin verbatim
 
+
 global = {
   \override Staff.BarLine #'transparent = ##t
   s1 s
diff --git a/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly b/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
index 7e5f7f4fdb..1d05f61572 100644
--- a/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
+++ b/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "version-specific, really-simple, rhythms"
 
   texidoc = "
 When using multi-measure rests in a polyphonic staff, the rests will be
@@ -18,6 +18,7 @@ can be printed on the same staff line, using the following setting.
   doctitle = "Merging multi-measure rests in a polyphonic part"
 } % begin verbatim
 
+
 normalPos = \revert MultiMeasureRest #'staff-position
 
 {
diff --git a/Documentation/snippets/modern-tab-text-clef.ly b/Documentation/snippets/modern-tab-text-clef.ly
deleted file mode 100644
index 485c737d40..0000000000
--- a/Documentation/snippets/modern-tab-text-clef.ly
+++ /dev/null
@@ -1,32 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  texidoces = "
-Utilice un texto de marcado para sustituir el glifo de clave (TAB) con
-una fuente tipográfica moderna.
-
-"
-  doctitlees = "Clave de texto TAB moderna para tablatura"
-
-  lsrtags = "staff-notation, fretted-strings"
-
-  texidoc = "
-Use a markup text to replace the (TAB) clef glyph with a modern font.
-
-"
-  doctitle = "Modern TAB text clef"
-} % begin verbatim
-
-
-\markup {
-  This snippet is deprecated as of version 2.13.4 and will be removed
-  in version 2.14.
-}
diff --git a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
index 61cb685ca4..4f36488ecf 100644
--- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -69,6 +69,7 @@ the default + symbol, assign the value @code{trill} to the variable
   doctitle = "Modifying default values for articulation shorthand notation"
 } % begin verbatim
 
+
 \relative c'' { c1-+ }
 
 dashPlus = "trill"
diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly
index 261f909cde..db3ebb1e73 100644
--- a/Documentation/snippets/modifying-tuplet-bracket-length.ly
+++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "really-simple, rhythms"
 
   texidoc = "
 Tuplet brackets can be made to run to prefatory matter or the next
@@ -23,6 +23,7 @@ modify what material they cover.
   doctitle = "Modifying tuplet bracket length"
 } % begin verbatim
 
+
 \new RhythmicStaff {
   % Set tuplets to be extendable...
   \set tupletFullLength = ##t
diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
index 140c007a3f..d9964ef846 100644
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
+  lsrtags = "simultaneous-notes, tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -31,6 +31,7 @@ the right.  This behaviour can be over-ridden by using the
   doctitle = "Moving dotted notes in polyphony"
 } % begin verbatim
 
+
 \new Staff \relative c' <<
   { f2. f4
     \override Staff.NoteCollision #'prefer-dotted-right = ##f
diff --git a/Documentation/snippets/moving-slur-positions-vertically.ly b/Documentation/snippets/moving-slur-positions-vertically.ly
index ab67c4430b..1b0a05c63c 100644
--- a/Documentation/snippets/moving-slur-positions-vertically.ly
+++ b/Documentation/snippets/moving-slur-positions-vertically.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -43,6 +43,7 @@ slurs further down.
   doctitle = "Moving slur positions vertically"
 } % begin verbatim
 
+
 \relative c' {
   \stemDown
   e4( a)
diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
index 4354b66ecd..489895c8b3 100644
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, text"
+  lsrtags = "text, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 texidoces = "
@@ -80,6 +80,7 @@ be centered.
   doctitle = "Multi-measure rest markup"
 } % begin verbatim
 
+
 \relative c' {
   \compressFullBarRests
   \textLengthOn
diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
index f1169e155c..caeb97ec31 100644
--- a/Documentation/snippets/nesting-staves.ly
+++ b/Documentation/snippets/nesting-staves.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides"
+  lsrtags = "preparing-parts, contexts-and-engravers, staff-notation, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -77,6 +77,7 @@ staves. The possibilities are @code{SystemStartBar},
   doctitle = "Nesting staves"
 } % begin verbatim
 
+
 \new StaffGroup
 \relative c'' <<
   \set StaffGroup.systemStartDelimiterHierarchy
diff --git a/Documentation/snippets/new/adding-fingerings-to-tablatures.ly b/Documentation/snippets/new/adding-fingerings-to-tablatures.ly
deleted file mode 100644
index 830df4d795..0000000000
--- a/Documentation/snippets/new/adding-fingerings-to-tablatures.ly
+++ /dev/null
@@ -1,37 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-To add fingerings to tablatures, use a combination of @code{\\markup}
-and @code{\\finger}.
-"
-  doctitle = "Adding fingerings to tablatures"
-}
-
-one = \markup { \finger 1 }
-two = \markup { \finger 2 }
-threeTwo = \markup {
-  \override #'(baseline-skip . 2)
-  \column {
-    \finger 3
-    \finger 2
-  }
-}
-threeFour = \markup {
-  \override #'(baseline-skip . 2)
-  \column {
-    \finger 3
-    \finger 4
-  }
-}
-
-\score {
-  \new TabStaff {
-    \tabFullNotation
-    \stemUp
-    e8\4^\one b\2 <g\3 e'\1>^>[ b\2 e\4]
-    <a\3 fis'\1>^>^\threeTwo[ b\2 e\4]
-  }
-}
-
diff --git a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
deleted file mode 100644
index 7a707d5a29..0000000000
--- a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "text, vocal-music, spacing"
-  texidoc = "
-This snippet shows how to bring the lyrics line closer to the staff.
-
-"
-  doctitle = "Adjusting lyrics vertical spacing"
-}
-
-% Default layout:
-<<
-  \new Staff \new Voice = melody \relative c' {
-    c4 d e f
-    g4 f e d
-    c1
-  }
-  \new Lyrics \lyricsto melody { aa aa aa aa aa aa aa aa aa }
-
-  % Reducing the minimum space below the staff and above the lyrics:
-  \new Staff {
-    \new Voice = melody \relative c' {
-      c4 d e f
-      g4 f e d
-      c1
-    }
-  }
-  \new Lyrics \with {
-    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((basic-distance . 1))
-  }
-  \lyricsto melody { aa aa aa aa aa aa aa aa aa }
->>
diff --git a/Documentation/snippets/new/alternative-breve-note.ly b/Documentation/snippets/new/alternative-breve-note.ly
deleted file mode 100644
index 0534ef1b47..0000000000
--- a/Documentation/snippets/new/alternative-breve-note.ly
+++ /dev/null
@@ -1,13 +0,0 @@
-\version "2.14.0"
-\header {
-  lsrtags = "rhythms,expressive-marks"
-  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."
-  doctitle = "Alternative breve notehead with double vertical lines"
-}
-
-\relative c'' {
-  \time 4/2
-  \override Staff.NoteHead #'style = #'altdefault
-  c\breve | b\breve
-}
diff --git a/Documentation/snippets/new/ancient-headword.ly b/Documentation/snippets/new/ancient-headword.ly
deleted file mode 100644
index aff4337468..0000000000
--- a/Documentation/snippets/new/ancient-headword.ly
+++ /dev/null
@@ -1,134 +0,0 @@
-\version "2.14.0"
-
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-\include "gregorian.ly"
-
-\score {
-  <<
-    \new VaticanaVoice = "cantus" {
-      \clef "vaticana-do3"
-      % Verse 1 — Salve, Regína
-      a\melisma \[ a \flexa g \pes a\melismaEnd \] d
-      \divisioMinima
-      \[ a\melisma \flexa g\melismaEnd \]
-      \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \]
-      \[ e\melisma \flexa d\melismaEnd \]
-      \divisioMaior
-      c d \[d\melisma \flexa c\melismaEnd \] d
-      \[ e\melisma \pes f\melismaEnd\] g
-      \[d\melisma \pes e \flexa c\melismaEnd \] d
-      \finalis
-      % Verse 2 — Vita, dulcédo
-      % a\melisma \[ a \flexa g \pes a\melismaEnd \] d
-      % \divisioMinima
-      % \[ a\melisma \flexa g\melismaEnd \]
-      % \[ f\melisma \flexa e f \pes g \flexa f\melismaEnd \]
-      % \[ e\melisma \flexa d\melismaEnd \]
-      % \divisioMaior
-      % c d \[e\melisma \pes f\melismaEnd \] g
-      % \[d\melisma \pes e \flexa c\melismaEnd \] d
-      % \finalis
-      % Verse 3 — Ad te clamámus
-      \[ d\melisma \pes f\melismaEnd\] a g
-      \[ g\melisma \flexa f \pes a\melismaEnd\] e
-      \divisioMaior
-      g f \[ e\melisma \flexa d \pes g\melismaEnd \]
-      \divisioMinima
-      c d \[ e\melisma \flexa d \pes g\melismaEnd \]
-      \[ f\melisma \flexa e\melismaEnd \] d
-      \finalis
-      % Verse 4 — Ad te suspirámus
-      \[ d\melisma \pes f\melismaEnd \] a c' g
-      \[ g\melisma \flexa f \pes g\melismaEnd \] a
-      \divisioMaior
-      d \[ f\melisma \pes \deminutum g\melismaEnd \] g d
-      \[ \virga f\melisma \inclinatum e \inclinatum d\melismaEnd \]
-      c \divisioMaior
-      d \[ d\melisma \flexa c \pes f\melismaEnd \]
-      \[ g\melisma \pes a\melismaEnd \]
-      g \[ f\melisma \flexa e\melismaEnd \] g
-      \[ f\melisma \flexa \deminutum e\melismaEnd \]
-      \[ d\melisma \flexa c \pes d\melismaEnd \]
-      \finalis
-      % Verse 5 — Eia ergo, Advocáta nostra
-      f\melisma \[ f \pes g\melismaEnd \] f
-      \[ g\melisma \pes \deminutum a\melismaEnd \] a
-      \divisioMinima
-      c' g \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] d g a
-      \divisioMaior
-      d' d' \[ c'\melisma \flexa b c' \pes d'\melismaEnd \] a
-      \divisioMinima
-      d' c' a \[ g\melisma \flexa f \pes a\melismaEnd \] g
-      \[ d\melisma \pes e\melismaEnd \] f
-      \[ \virga e\melisma \inclinatum d \inclinatum c\melismaEnd \]
-      \divisioMaior
-      \[ c\melisma \pes d\melismaEnd \]
-      f \[ g\melisma \flexa \deminutum f\melismaEnd \]
-      \[ d\melisma \flexa c \pes d\melismaEnd \] d
-      \finalis
-      % Verse 6 — Et Jesum
-      d a, \[ c\melisma \pes d\melismaEnd \]
-      \divisioMinima
-      d \[ d\melisma \pes e\melismaEnd \] \[ e\melisma \flexa d d\melismaEnd \]
-      c g f \[ e\melisma \flexa \deminutum d\melismaEnd \] g
-      \[ f\melisma \flexa e\melismaEnd \]
-      \[ d\melisma \flexa c \pes d\melismaEnd \]
-      \[ d\melisma \pes a \] \virga bes\melismaEnd a
-      \divisioMinima
-      \[ \virga a\melisma \inclinatum g \inclinatum f\melismaEnd \] g d f
-      \[ f\melisma \flexa e\melismaEnd \] \[ d\melisma \flexa c\melismaEnd \]
-      \divisioMinima
-      \[ e\melisma \pes f \flexa e\melismaEnd \] d d
-      \finalis
-      % Verse 7 ad finem — O clemens: O pia: O dulcis Virgo María
-      a\melisma \[a \flexa g a \quilisma b \pes c'\melismaEnd \]
-      \[ \virga b\melisma \inclinatum a \inclinatum g\melismaEnd \] a
-      \finalis
-      \[ g\melisma \pes a \quilisma b \pes c' \] \[ c' \flexa b\melismaEnd \]
-      \[ a\melisma \flexa g\melismaEnd \] \[ g\melisma \pes a\melismaEnd \]
-      \finalis
-      \[ a\melisma \flexa d \virga f \inclinatum e \inclinatum d \inclinatum c d \]
-      \divisioMinima
-      \[ d \pes e f \pes g\melismaEnd \]
-      \[ g\melisma \flexa \deminutum f\melismaEnd \]
-      \[ g\melisma \pes a\melismaEnd \]
-      d c d \[ d\melisma \pes g \flexa f f\melismaEnd \]
-      \[ e\melisma \flexa d\melismaEnd \]
-      \finalis
-    }
-    \new Lyrics \lyricsto "cantus" {
-      Sal- ve, Re- gí- na, ma- ter mi- se- ri- cór- di- ae:
-      % Vi- ta, dul- cé- do, et spes no- stra, sal- ve.
-      Ad te cla- má- mus, éx- su- les, fi- li- i He- vae.
-      Ad te su- spi- rá- mus, ge- mén- tes et flen- tes in hac la- cri- má- rum
-      val- le.
-      E- ia er- go, Ad- vo- cá- ta no- stra, il- los tu- os mi- se- ri- cór- des
-      ó- cu- los ad nos con- vér- te.
-      Et Je- sum, be- ne- díc- tum fruc- tum ven- tris tu- i, no- bis post hoc
-      ex- sí- li- um os- tén- de.
-      O cle- mens:
-      O pi- a:
-      O dul- cis Vir- go Ma- rí- a.
-    }
-  >>
-}
-
-\layout {
-  \context {
-    \Staff
-    \consists "Custos_engraver"
-  }
-}
diff --git a/Documentation/snippets/new/automatic-beam-subdivisions.ly b/Documentation/snippets/new/automatic-beam-subdivisions.ly
deleted file mode 100644
index 64bc6ee34c..0000000000
--- a/Documentation/snippets/new/automatic-beam-subdivisions.ly
+++ /dev/null
@@ -1,39 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-
-  texidoc = "
-Beams can be subdivided automatically.  By setting the property
-@code{subdivideBeams}, beams are subdivided at beat positions (as
-specified in @code{baseMoment}).
-
-"
-  doctitle = "Automatic beam subdivisions"
-}
-
-\new Staff {
-  \relative c'' {
-    <<
-      {
-        \voiceOne
-        \set subdivideBeams = ##t
-        b32[ a g f c' b a g
-        b32^"subdivide beams" a g f c' b a g]
-      }
-      \new Voice {
-        \voiceTwo
-        b32_"default"[ a g f c' b a g
-        b32 a g f c' b a g]
-      }
-    >>
-    \oneVoice
-    \set baseMoment = #(ly:make-moment 1 8)
-    \set beatStructure = #'(2 2 2 2)
-    b32^"baseMoment 1 8"[ a g f c' b a g]
-    \set baseMoment = #(ly:make-moment 1 16)
-    \set beatStructure = #'(4 4 4 4)
-    b32^"baseMoment 1 16"[ a g f c' b a g]
-  }
-}
-
diff --git a/Documentation/snippets/new/beam-endings-in-score-context.ly b/Documentation/snippets/new/beam-endings-in-score-context.ly
deleted file mode 100644
index b622ac1a1d..0000000000
--- a/Documentation/snippets/new/beam-endings-in-score-context.ly
+++ /dev/null
@@ -1,43 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-Beat structure rules specified in the @code{Score} context apply to all
-staves, but can be modified at both @code{Staff} and @code{Voice}
-levels:
-"
-  doctitle = "Beam endings in Score context"
-}
-
-\relative c'' {
-  \time 5/4
-  % Set default beaming for all staves
-  \set Score.baseMoment = #(ly:make-moment 1 8)
-  \set Score.beatStructure = #'(3 4 3)
-  <<
-    \new Staff {
-      c8 c c c c c c c c c
-    }
-    \new Staff {
-      % Modify beaming for just this staff
-      \set Staff.beatStructure = #'(6 4)
-      c8 c c c c c c c c c
-    }
-    \new Staff {
-      % Inherit beaming from Score context
-      <<
-        {
-          \voiceOne
-          c8 c c c c c c c c c
-        }
-        % Modify beaming for this voice only
-        \new Voice {
-          \voiceTwo
-          \set Voice.beatStructure = #'(6 4)
-          a8 a a a a a a a a a
-        }
-      >>
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/beam-grouping-in-7-8-time.ly b/Documentation/snippets/new/beam-grouping-in-7-8-time.ly
deleted file mode 100644
index c33112b676..0000000000
--- a/Documentation/snippets/new/beam-grouping-in-7-8-time.ly
+++ /dev/null
@@ -1,20 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-There is no default beat structure specified for 7/8 time,
-so if automatic beams are required the structure must be specified.  For
-example, to group all beams 2-3-2 in 7/8 time, specify the
-beat structure to be (2 3 2):
-"
-  doctitle = "Beam grouping in 7/8 time"
-}
-
-\relative c'' {
-  \time 7/8
-  % rhythm 2-3-2
-  a8 a a a a a a
-  \set Score.beatStructure = #'(2 3 2)
-  a8 a a a a a a
-}
diff --git a/Documentation/snippets/new/changing-the-ambitus-gap.ly b/Documentation/snippets/new/changing-the-ambitus-gap.ly
deleted file mode 100644
index 982a447aa0..0000000000
--- a/Documentation/snippets/new/changing-the-ambitus-gap.ly
+++ /dev/null
@@ -1,40 +0,0 @@
-\version "2.14.0"
-\header {
-  lsrtags = "pitches"
-  texidoc = "It is possible to change the default gap setting for
-ambitus."
-
-  doctitle = "Changing the ambitus gap"
-}
-
-
-\layout {
-  \context {
-    \Voice
-    \consists "Ambitus_engraver"
-  }
-}
-
-\new Staff {
-  \time 2/4
-  % Default setting
-  c'4 g''
-}
-
-\new Staff {
-  \time 2/4
-  \override AmbitusLine #'gap = #0
-  c'4 g''
-}
-
-\new Staff {
-  \time 2/4
-  \override AmbitusLine #'gap = #1
-  c'4 g''
-}
-
-\new Staff {
-  \time 2/4
-  \override AmbitusLine #'gap = #1.5
-  c'4 g''
-}
diff --git a/Documentation/snippets/new/changing-the-number-of-augmentation-dots-per-note.ly b/Documentation/snippets/new/changing-the-number-of-augmentation-dots-per-note.ly
deleted file mode 100644
index 8d7a6c16f5..0000000000
--- a/Documentation/snippets/new/changing-the-number-of-augmentation-dots-per-note.ly
+++ /dev/null
@@ -1,17 +0,0 @@
-\version "2.14.0"
-\header {
-  lsrtags = "rhythms,expressive-marks"
-  texidoc = "This code demonstrates how to change the number of
-augmentation dots on a single note."
-  doctitle = "Changing the number of augmentation dots per note"
-}
-
-\relative c' {
-  c4.. a16 r2 |
-  \override Dots #'dot-count = #4
-  c4.. a16 r2 |
-  \override Dots #'dot-count = #0
-  c4.. a16 r2 |
-  \revert Dots #'dot-count
-  c4.. a16 r2 |
-}
diff --git a/Documentation/snippets/new/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/new/changing-the-size-of-woodwind-diagrams.ly
deleted file mode 100644
index 9cccb9177a..0000000000
--- a/Documentation/snippets/new/changing-the-size-of-woodwind-diagrams.ly
+++ /dev/null
@@ -1,31 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags="winds"
-  texidoc="
-The size and thickness of woodwind diagrams can be changed.
-"
-
-  doctitle = "Changing the size of woodwind diagrams"
-}
-
-\relative c'' {
-  \textLengthOn
-  c1^\markup
-    \woodwind-diagram
-      #'piccolo
-      #'()
-
-  c^\markup
-    \override #'(size . 1.5) {
-      \woodwind-diagram
-        #'piccolo
-        #'()
-    }
-  c^\markup
-    \override #'(thickness . 0.15) {
-      \woodwind-diagram
-        #'piccolo
-        #'()
-    }
-}
diff --git a/Documentation/snippets/new/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/new/changing-the-time-signature-without-affecting-the-beaming.ly
deleted file mode 100644
index d2bc6c98e8..0000000000
--- a/Documentation/snippets/new/changing-the-time-signature-without-affecting-the-beaming.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-The @code{\\time} command sets the properties
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-and @code{measureLength} in the @code{Timing} context, which is
-normally aliased to @code{Score}. Changing the value of
-@code{timeSignatureFraction} causes the new time signature symbol to be
-printed without changing any of the other properties:
-
-"
-  doctitle = "Changing the time signature without affecting the beaming"
-}
-
-\markup {
-  This snippet is deprecated as of 2.13.5 and will be removed in 2.14
-}
diff --git a/Documentation/snippets/new/chord-glissando-in-tablature.ly b/Documentation/snippets/new/chord-glissando-in-tablature.ly
deleted file mode 100644
index 0434389970..0000000000
--- a/Documentation/snippets/new/chord-glissando-in-tablature.ly
+++ /dev/null
@@ -1,27 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-Slides for chords can be indicated in both Staff and TabStaff.
-String numbers are necessary for TabStaff because automatic
-string calculations are different for chords and for single notes.
-"
-  doctitle = "Chord glissando in tablature"
-}
-
-myMusic = \relative c' {
-  <c\3 e\2 g\1>1 \glissando <f\3 a\2 c\1>
-}
-
-\score {
-  <<
-    \new Staff {
-      \clef "treble_8"
-      \myMusic
-    }
-    \new TabStaff {
-      \myMusic
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/chordchanges-for-fretboards.ly b/Documentation/snippets/new/chordchanges-for-fretboards.ly
deleted file mode 100644
index e8e8236d41..0000000000
--- a/Documentation/snippets/new/chordchanges-for-fretboards.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "FretBoards can be set to display only when the chord changes
-or at the beginning of a new line."
-  doctitle = "chordChanges for FretBoards"
-}
-
-\include "predefined-guitar-fretboards.ly"
-
-myChords = \chordmode {
-  c1 c1 \break
-  \set chordChanges = ##t
-  c1 c1 \break
-  c1 c1 \break
-}
-
-<<
-  \new ChordNames { \myChords }
-  \new FretBoards { \myChords }
-  \new Staff { \myChords }
->>
diff --git a/Documentation/snippets/new/clip-systems.ly b/Documentation/snippets/new/clip-systems.ly
deleted file mode 100644
index 3f412325dd..0000000000
--- a/Documentation/snippets/new/clip-systems.ly
+++ /dev/null
@@ -1,88 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "paper-and-layout"
-
-  texidoc = "
-This code shows how to clip (extract) snippets from a full score.
-
-This file needs to be run separately with @option{-dclip-systems}; the
-snippets page may not adequately show the results.
-
-The result will be files named
-@samp{base-from-start-to-end[-count].eps}.
-
-
-If system starts and ends are included, they include extents of the
-System grob, e.g., instrument names.
-
-
-Grace notes at the end point of the region are not included.
-
-
-Regions can span multiple systems.  In this case, multiple EPS files
-are generated.
-
-"
-  doctitle = "Clip systems"
-}
-
-#(ly:set-option 'clip-systems)
-#(define output-suffix "1")
-
-origScore = \score {
-  \relative c' {
-    \set Staff.instrumentName = #"bla"
-    c1
-    d1
-    \grace c16 e1
-    \key d \major
-    f1 \break
-    \clef bass
-    g,1
-    fis1
-  }
-}
-
-\book {
-  \score {
-    \origScore
-    \layout {
-      % Each clip-region is a (START . END) pair
-      % where both are rhythmic-locations.
-
-      % (make-rhythmic-locations BAR-NUMBER NUM DEN)
-      % means NUM/DEN whole-notes into bar numbered BAR-NUMBER
-
-      clip-regions = #(list
-      (cons
-       (make-rhythmic-location 2 0 1)
-       (make-rhythmic-location 4 0 1))
-
-      (cons
-       (make-rhythmic-location 0 0 1)
-       (make-rhythmic-location 4 0 1))
-
-      (cons
-       (make-rhythmic-location 0 0 1)
-       (make-rhythmic-location 6 0 1))
-      )
-    }
-  }
-}
-
-#(ly:set-option 'clip-systems #f)
-#(define output-suffix #f)
-
-\book {
-  \score { \origScore }
-  \markup { \bold \fontsize #6 clips }
-  \score {
-    \lyrics {
-      \markup { from-2.0.1-to-4.0.1-clip.eps }
-      \markup {
-        \epsfile #X #30.0 #(format #f "~a-1-from-2.0.1-to-4.0.1-clip.eps"
-                            (ly:parser-output-name parser)) }
-    }
-  }
-}
diff --git a/Documentation/snippets/new/compound-time-signatures.ly b/Documentation/snippets/new/compound-time-signatures.ly
deleted file mode 100644
index de0d73f6d5..0000000000
--- a/Documentation/snippets/new/compound-time-signatures.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-Odd 20th century time signatures (such as \"5/8\") can often be played
-as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or
-more inequal metrics. LilyPond can make such music quite easy to read
-and play, by explicitly printing the compound time signatures and
-adapting the automatic beaming behavior. (Graphic measure grouping
-indications can also be added; see the appropriate snippet in this
-database.)
-"
-  doctitle = "Compound time signatures"
-}
-
-\markup {
-  This snippet is deprecated as of 2.15.9 and will be removed in 2.16
-}
diff --git a/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly
deleted file mode 100644
index 8c9c8ce80a..0000000000
--- a/Documentation/snippets/new/controlling-spanner-visibility-after-a-line-break.ly
+++ /dev/null
@@ -1,37 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "The visibility of spanners which end on the first note
-following a line break is controlled by the @code{after-line-breaking}
-callback @code{ly:spanner::kill-zero-spanned-time}.
-
-For objects such as glissandos and hairpins, the default behaviour is
-to hide the spanner after a break; disabling the callback will allow
-the left-broken span to be shown.
-
-Conversely, spanners which are usually visible, such as text spans,
-can be hidden by enabling the callback.
-"
-
-  doctitle = "Controlling spanner visibility after a line break"
-}
-
-\paper { ragged-right = ##t }
-
-\relative c'' {
-  \override Hairpin #'to-barline = ##f
-  \override Glissando #'breakable = ##t
-  % show hairpin
-  \override Hairpin #'after-line-breaking = ##t
-  % hide text span
-  \override TextSpanner #'after-line-breaking =
-    #ly:spanner::kill-zero-spanned-time
-  e2\<\startTextSpan
-  % show glissando
-  \override Glissando #'after-line-breaking = ##t
-  f2\glissando
-  \break
-  f,1\!\stopTextSpan
-}
-
diff --git a/Documentation/snippets/new/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly
similarity index 100%
rename from Documentation/snippets/new/defining-an-engraver-in-scheme-ambitus-engraver.ly
rename to Documentation/snippets/new/defining-an-engraver-in-scheme--ambitus-engraver.ly
diff --git a/Documentation/snippets/new/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/new/defining-predefined-fretboards-for-other-instruments.ly
deleted file mode 100644
index ecf20eb40b..0000000000
--- a/Documentation/snippets/new/defining-predefined-fretboards-for-other-instruments.ly
+++ /dev/null
@@ -1,110 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-
-  texidoc = "
-Predefined fret diagrams can be added for new instruments in addition
-to the standards used for guitar.  This file shows how this is done by
-defining a new string-tuning and a few predefined fretboards for the
-Venezuelan cuatro.
-
-This file also shows how fingerings can be included in the chords used
-as reference points for the chord lookup, and displayed in  the fret
-diagram and the @code{TabStaff}, but not the music.
-
-
-These fretboards are not transposable because they contain string
-information.  This is planned to be corrected in the future.
-
-"
-  doctitle = "Defining predefined fretboards for other instruments"
-}
-
-% add FretBoards for the Cuatro
-%   Note: This section could be put into a separate file
-%      predefined-cuatro-fretboards.ly
-%      and \included into each of your compositions
-
-cuatroTuning = #`(,(ly:make-pitch 0 6 0)
-                  ,(ly:make-pitch 1 3 SHARP)
-		  ,(ly:make-pitch 1 1 0)
-		  ,(ly:make-pitch 0 5 0))
-
-dSix = { <a\4 b\1 d\3 fis\2> }
-dMajor = { <a\4 d\1 d\3 fis \2> }
-aMajSeven = { <a\4 cis\1 e\3 g\2> }
-dMajSeven = { <a\4 c\1 d\3 fis\2> }
-gMajor = { <b\4 b\1 d\3 g\2> }
-
-\storePredefinedDiagram #default-fret-table \dSix
-                        #cuatroTuning
-                        #"o;o;o;o;"
-\storePredefinedDiagram #default-fret-table \dMajor
-                        #cuatroTuning
-                        #"o;o;o;3-3;"
-\storePredefinedDiagram #default-fret-table \aMajSeven
-                        #cuatroTuning
-                        #"o;2-2;1-1;2-3;"
-\storePredefinedDiagram #default-fret-table \dMajSeven
-                        #cuatroTuning
-                        #"o;o;o;1-1;"
-\storePredefinedDiagram #default-fret-table \gMajor
-                        #cuatroTuning
-                        #"2-2;o;1-1;o;"
-
-% end of potential include file /predefined-cuatro-fretboards.ly
-
-
-#(set-global-staff-size 16)
-
-primerosNames = \chordmode {
-  d:6 d a:maj7 d:maj7
-  g
-}
-primeros = {
-  \dSix \dMajor \aMajSeven \dMajSeven
-  \gMajor
-}
-
-\score {
-  <<
-    \new ChordNames {
-      \set chordChanges = ##t
-      \primerosNames
-    }
-
-    \new Staff {
-      \new Voice \with {
-        \remove "New_fingering_engraver"
-      }
-      \relative c'' {
-        \primeros
-      }
-    }
-
-    \new FretBoards {
-      \set stringTunings = #cuatroTuning
-%      \override FretBoard
-%        #'(fret-diagram-details string-count) = #'4
-      \override FretBoard
-        #'(fret-diagram-details finger-code) = #'in-dot
-      \primeros
-    }
-
-    \new TabStaff \relative c'' {
-      \set TabStaff.stringTunings = #cuatroTuning
-      \primeros
-    }
-
-  >>
-
-  \layout {
-    \context {
-      \Score
-      \override SpacingSpanner
-        #'base-shortest-duration = #(ly:make-moment 1 16)
-    }
-  }
-  \midi { }
-}
diff --git a/Documentation/snippets/new/displaying-complex-chords.ly b/Documentation/snippets/new/displaying-complex-chords.ly
deleted file mode 100644
index f3efe63b7c..0000000000
--- a/Documentation/snippets/new/displaying-complex-chords.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "simultaneous-notes, chords"
-  texidoc = "
-Here is a way to display a chord where the same note is played twice
-with different accidentals.
-"
-  doctitle = "Displaying complex chords"
-}
-
-fixA = {
-  \once \override Stem #'length = #9
-}
-fixB = {
-  \once \override NoteHead #'X-offset = #1.7
-  \once \override Stem #'rotation = #'(45 0 0)
-  \once \override Stem #'extra-offset = #'(-0.2 . -0.2)
-  \once \override Flag #'style = #'no-flag
-  \once \override Accidental #'extra-offset = #'(4 . 0)
-}
-
-\relative c' {
-  << { \fixA <b d!>8 } \\ { \voiceThree \fixB dis } >> s
-}
diff --git a/Documentation/snippets/new/displaying-grob-ancestry.ly b/Documentation/snippets/new/displaying-grob-ancestry.ly
deleted file mode 100644
index 3cee26c5da..0000000000
--- a/Documentation/snippets/new/displaying-grob-ancestry.ly
+++ /dev/null
@@ -1,132 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "tweaks-and-overrides"
-
-  texidoc = "
-When working with grob callbacks, it can be helpful to understand a
-grob's @qq{ancestry}.  Most grobs have @qq{parents} which influence the
-positioning of the grob.  X- and Y-parents influence the horizontal and
-vertical positions for the grob, respectively.  Additionally, each
-parent may have parents of its own.
-
-
-Unfortunately, there are several aspects of a grob's ancestry that can
-lead to confusion:
-
-
-@itemize
-
-@item
-The types of parents a grob has may depend on context.
-
-@item
-For some grobs, the X- and Y-parents are the same.
-
-@item
-A particular @qq{ancestor} may be related to a grob in multiple ways.
-
-@item
-The concept of @qq{generations} is misleading.
-
-@end itemize
-
-
-For example, the @code{System} grob can be both parent (on the Y-side)
-and grandparent (twice on the X-side) to a @code{VerticalAlignment}
-grob.
-
-
-This macro prints (to the console) a textual representation of a grob's
-ancestry.
-
-
-When called this way
-
-@example
-@{
-   \\once \\override NoteHead #'before-line-breaking = #display-ancestry
-   c4
-@}
-@end example
-
-
-The following output is generated:
-
-
-@example
-------------------------------------
-
-NoteHead X,Y: NoteColumn
-    X: PaperColumn
-       X,Y: System
-    Y: VerticalAxisGroup
-       X: NonMusicalPaperColumn
-          X,Y: System
-       Y: VerticalAlignment
-          X: NonMusicalPaperColumn
-             X,Y: System
-          Y: System
-@end example
-
-
-"
-  doctitle = "Displaying grob ancestry"
-}
-
-#(define (grob-name grob)
-   (if (ly:grob? grob)
-       (assoc-ref (ly:grob-property grob 'meta) 'name)
-       #f))
-
-#(define (get-ancestry grob)
-   (if (not (null? (ly:grob-parent grob X)))
-       (list (grob-name grob)
-             (get-ancestry (ly:grob-parent grob X))
-             (get-ancestry (ly:grob-parent grob Y)))
-       (grob-name grob)))
-
-#(define (format-ancestry lst padding)
-   (string-append
-    (symbol->string (car lst))
-    "\n"
-    (let ((X-ancestry
-           (if (list? (cadr lst))
-               (format-ancestry (cadr lst) (+ padding 3))
-               (symbol->string (cadr lst))))
-          (Y-ancestry
-           (if (list? (caddr lst))
-               (format-ancestry (caddr lst) (+ padding 3))
-               (symbol->string (caddr lst)))))
-      (if (equal? X-ancestry Y-ancestry)
-          (string-append
-           (format #f "~&")
-           (make-string padding #\space)
-           "X,Y: "
-           (if (list? (cadr lst))
-               (format-ancestry (cadr lst) (+ padding 5))
-               (symbol->string (cadr lst))))
-          (string-append
-           (format #f "~&")
-           (make-string padding #\space)
-           "X: " X-ancestry
-           "\n"
-           (make-string padding #\space)
-           "Y: " Y-ancestry
-           (format #f "~&"))))
-    (format #f "~&")))
-
-#(define (display-ancestry grob)
-   (display
-    (string-append
-     (format #f "~3&~a~2%" (make-string 36 #\-))
-     (format-ancestry (get-ancestry grob) 0)
-     (format #f "~2&"))))
-
-\relative c' {
-  \once \override NoteHead #'before-line-breaking = #display-ancestry
-  f4
-  \once \override Accidental #'before-line-breaking = #display-ancestry
-  \once \override Arpeggio #'before-line-breaking = #display-ancestry
-  <f as c>4\arpeggio
-}
diff --git a/Documentation/snippets/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
deleted file mode 100644
index cb3e2ffa39..0000000000
--- a/Documentation/snippets/new/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "pitches"
-  texidoc = "
-In early 20th century works, starting with Schoenberg, Berg and Webern
-(the @qq{Second} Viennese school), every pitch in the twelve-tone scale
-has to be regarded as equal, without any hierarchy such as the
-classical (tonal) degrees. Therefore, these composers print one
-accidental for each note, even at natural pitches, to emphasize their
-new approach to music theory and language.
-
-This snippet shows how to achieve such notation rules.
-
-"
-  doctitle = "Dodecaphonic-style accidentals for each note including naturals"
-}
-
-\markup {
-  This snippet is deprecated as of version 2.12 and
-  will be removed from the documentation in 2.14.
-}
-
diff --git a/Documentation/snippets/new/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/new/dynamics-custom-text-spanner-postfix.ly
deleted file mode 100644
index 57f22712fb..0000000000
--- a/Documentation/snippets/new/dynamics-custom-text-spanner-postfix.ly
+++ /dev/null
@@ -1,35 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "Postfix functions for custom crescendo text spanners.  The spanners
-should start on the first note of the measure.  One has to use -\mycresc,
-otherwise the spanner start will rather be assigned to the next note.
-"
-  doctitle = "Dynamics custom text spanner postfix"
-}
-
-% Two functions for (de)crescendo spanners where you can explicitly give the
-% spanner text.
-mycresc =
-#(define-music-function (parser location mymarkup) (markup?)
-   (make-music 'CrescendoEvent
-               'span-direction START
-               'span-type 'text
-               'span-text mymarkup))
-mydecresc =
-#(define-music-function (parser location mymarkup) (markup?)
-   (make-music 'DecrescendoEvent
-               'span-direction START
-               'span-type 'text
-               'span-text mymarkup))
-
-\relative c' {
-  c4-\mycresc "custom cresc" c4 c4 c4 |
-  c4 c4 c4 c4 |
-  c4-\mydecresc "custom decresc" c4 c4 c4 |
-  c4 c4\! c4 c4
-}
-
-
-
diff --git a/Documentation/snippets/new/dynamics-text-spanner-postfix.ly b/Documentation/snippets/new/dynamics-text-spanner-postfix.ly
deleted file mode 100644
index 5f1187ec18..0000000000
--- a/Documentation/snippets/new/dynamics-text-spanner-postfix.ly
+++ /dev/null
@@ -1,25 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-  texidoc = "Custom text spanners can be defined and used with hairpin
-  and text crescendos.  @code{\<} and @code{\>} produce hairpins by
-  default, @code{\cresc} etc. produce text spanners by default."
-  doctitle = "Dynamics text spanner postfix"
-}
-
-% Some sample text dynamic spanners, to be used as postfix operators
-crpoco =
-#(make-music 'CrescendoEvent
-             'span-direction START
-             'span-type 'text
-             'span-text "cresc. poco a poco")
-
-\relative c' {
-  c4\cresc d4 e4 f4 |
-  g4 a4\! b4\crpoco c4 |
-  c4 d4 e4 f4 |
-  g4 a4\! b4\< c4 |
-  g4\dim a4 b4\decresc c4\!
-}
-
diff --git a/Documentation/snippets/new/editorial-headword.ly b/Documentation/snippets/new/editorial-headword.ly
deleted file mode 100644
index 89f7c0b736..0000000000
--- a/Documentation/snippets/new/editorial-headword.ly
+++ /dev/null
@@ -1,99 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% NR 1.7 Editorial annotations
-
-% Beethoven, Op. 31, No. 3
-% Piano sonata 18, Movt II, Scherzo
-% Measures 9 - 14
-
-\new PianoStaff <<
-
-  % RH Staff
-  \new Staff {
-    \clef treble
-    \key af \major
-    \time 2/4
-    \set Staff.fingeringOrientations = #'(up)
-    \set Score.currentBarNumber = #9
-    \partial 8
-    <af''-4 c''>8 \staccato
-    |
-    \set doubleSlurs = ##t
-    <bf''-5 df''-2>4 (
-    <af''-4 c''>8 \staccato )
-    \noBeam
-    c''8-5 \staccato \pp
-    |
-    \set doubleSlurs = ##f
-    bf'8.. (
-    af'32
-    g'8 ) \staccato
-    f'8 \staccato
-    |
-    e'4-2
-    r8
-    \once \override Script #'script-priority = #-100
-    \afterGrace
-    f'8 ( \trill ^ \markup { \finger "3-2" }
-    { e'16 [ f'16 ] }
-    |
-    g'8..-3
-    f'32
-    e'8-1 ) \staccato
-    d'8-2 \staccato
-    |
-    c'4
-    r4
-  }
-
-  % LH Staff
-  \new Staff {
-    \key af \major
-    \clef treble
-    \override Fingering #'direction = #down
-    \set Staff.fingeringOrientations = #'(down)
-    \partial 8
-    <af' af>8 \staccato
-    \set doubleSlurs = ##t
-    <g'-2 ef'-3>4 (
-    <af' af>8 ) \staccato
-    \noBeam
-    \clef bass
-    c'8-1 \staccato
-    |
-    \set doubleSlurs = ##f
-    bf8.. (
-    af32
-    g8-1 ) \staccato
-    f8 \staccato
-    |
-    e4
-    r8
-    \afterGrace
-    f8 ( \trill _ \markup { \finger "2-1" }
-    { e16 [ f16 ] }
-    |
-    g8..-1
-    f32
-    e8 ) \staccato
-    d8 \staccato
-    |
-    c4
-    r4
-  }
-
->>
diff --git a/Documentation/snippets/new/engravers-one-by-one.ly b/Documentation/snippets/new/engravers-one-by-one.ly
deleted file mode 100644
index 29ae7a8480..0000000000
--- a/Documentation/snippets/new/engravers-one-by-one.ly
+++ /dev/null
@@ -1,273 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "contexts-and-engravers"
-
-  texidoc = "
-The notation problem, creating a certain symbol, is handled by plugins.
- Each plugin is called an Engraver. In this example, engravers are
-switched on one by one, in the following order:
-
-- note heads,
-
-
-- staff symbol,
-
-
-- clef,
-
-
-- stem,
-
-
-- beams, slurs, accents,
-
-
-- accidentals, bar lines, time signature and key signature.
-
-
-
-Engravers are grouped. For example, note heads, slurs, beams etc. form
-a @code{Voice} context. Engravers for key signature, accidentals, bar
-line, etc. form a @code{Staff} context.
-
-"
-  doctitle = "Engravers one-by-one"
-}
-
-
-%% sample music
-topVoice = \relative c' {
-  \key d \major
-  es8([ g] a[ fis])
-  b4
-  b16[-. b-. b-. cis-.]
-  d4->
-}
-
-botVoice = \relative c' {
-  \key d \major
-  c8[( f] b[ a)]
-  es4
-  es16[-. es-. es-. fis-.]
-  b4->
-}
-
-hoom = \relative c {
-  \key d \major
-  \clef bass
-  g8-. r
-  r4
-  fis8-.
-  r8
-  r4
-  b'4->
-}
-
-pah = \relative c' {
-  r8 b-.
-  r4
-  r8 g8-.
-  r16 g-. r8
-  \clef treble
-  fis'4->
-}
-
-%
-% setup for Request->Element conversion. Guru-only
-%
-
-MyStaff = \context {
-  \type "Engraver_group"
-  \name Staff
-
-  \description "Handles clefs, bar lines, keys, accidentals.  It can contain
-@code{Voice} contexts."
-
-  \consists "Output_property_engraver"
-
-  \consists "Font_size_engraver"
-
-  \consists "Volta_engraver"
-  \consists "Separating_line_group_engraver"
-  \consists "Dot_column_engraver"
-
-  \consists "Ottava_spanner_engraver"
-  \consists "Rest_collision_engraver"
-  \consists "Piano_pedal_engraver"
-  \consists "Piano_pedal_align_engraver"
-  \consists "Instrument_name_engraver"
-  \consists "Grob_pq_engraver"
-  \consists "Forbid_line_break_engraver"
-  \consists "Axis_group_engraver"
-
-  \consists "Pitch_squash_engraver"
-
-  localKeySignature = #'()
-
-  % explicitly set instrumentName, so we don't get
-  % weird effects when doing instrument names for
-  % piano staves
-
-  instrumentName = #'()
-  shortInstrumentName = #'()
-
-  \accepts "Voice"
-}
-
-
-MyVoice = \context {
-  \type "Engraver_group"
-  \name Voice
-
-  \description "
-    Corresponds to a voice on a staff.  This context handles the
-    conversion of dynamic signs, stems, beams, super- and subscripts,
-    slurs, ties, and rests.
-
-    You have to instantiate this explicitly if you want to have
-    multiple voices on the same staff."
-
-  localKeySignature = #'()
-  \consists "Font_size_engraver"
-
-  % must come before all
-  \consists "Output_property_engraver"
-  \consists "Arpeggio_engraver"
-  \consists "Multi_measure_rest_engraver"
-  \consists "Text_spanner_engraver"
-  \consists "Grob_pq_engraver"
-  \consists "Note_head_line_engraver"
-  \consists "Glissando_engraver"
-  \consists "Ligature_bracket_engraver"
-  \consists "Breathing_sign_engraver"
-  % \consists "Rest_engraver"
-  \consists "Grace_beam_engraver"
-  \consists "New_fingering_engraver"
-  \consists "Chord_tremolo_engraver"
-  \consists "Percent_repeat_engraver"
-  \consists "Slash_repeat_engraver"
-
-  %{
-    Must come before text_engraver, but after note_column engraver.
-  %}
-  \consists "Text_engraver"
-  \consists "Dynamic_engraver"
-  \consists "Fingering_engraver"
-
-  \consists "Script_column_engraver"
-  \consists "Rhythmic_column_engraver"
-  \consists "Cluster_spanner_engraver"
-  \consists "Tie_engraver"
-  \consists "Tie_engraver"
-  \consists "Tuplet_engraver"
-  \consists "Note_heads_engraver"
-  \consists "Rest_engraver"
-}
-
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Staff_symbol_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Clef_engraver"
-  \remove "Pitch_squash_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice = \context {
-  \MyVoice
-  \consists "Stem_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice = \context {
-  \MyVoice
-  \consists "Beam_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice = \context {
-  \MyVoice
-  \consists "Phrasing_slur_engraver"
-  \consists "Slur_engraver"
-  \consists "Script_engraver"
-}
-
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Bar_engraver"
-  \consists "Time_signature_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Accidental_engraver"
-  \consists "Key_engraver"
-}
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
diff --git a/Documentation/snippets/new/expressive-headword.ly b/Documentation/snippets/new/expressive-headword.ly
deleted file mode 100644
index 8c1f821ba3..0000000000
--- a/Documentation/snippets/new/expressive-headword.ly
+++ /dev/null
@@ -1,270 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 1.3 Expressive marks
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% L. v. Beethoven, Op. 49 no. 1
-% Piano sonata 19 - "Leichte Sonate"
-% measures 1 - 12
-
-%\layout {
-%   \context {
-%      \Score
-%      \override SpacingSpanner #'base-shortest-duration =
-%         #(ly:make-moment 1 20)
-%   }
-%}
-
-\new PianoStaff <<
-
-   % RH Staff
-   \new Staff {
-      \clef treble
-      \key g \major
-      \time 6/8
-      \partial 2
-      \once \override TextScript #'staff-padding = #2
-      d'8 \staccato
-      ^ \markup { \column {
-         RONDO
-         \italic Allegro } }
-      d'8 \staccato
-      g'8 \staccato
-      a'8 \staccato
-
-      |
-
-      b'8 [ (
-      g'8 ] )
-      e'8 \staccato
-      e' \staccato
-      a'8 \staccato
-      b'8 \staccato
-
-      |
-
-      c''8 [ (
-      a'8 ] )
-      e''8 \staccato
-      d''8 \staccato
-      c''8 \staccato
-      b'8 \staccato
-
-      |
-
-      a'8 \staccato
-      g'8 \staccato
-      a'8 \staccato
-      \acciaccatura { g'16 [ a'16 ] }
-      bf'8
-      a'8 \staccato
-      g'8 \staccato
-
-      |
-
-      fs'8 [ (
-      d'8 ] )
-      d'8 \staccato
-      d'8 \staccato
-      g'8 \staccato
-      a'8 \staccato
-
-      |
-
-      b'8 [ (
-      g'8 ] )
-      e'8 \staccato
-      e'8 \staccato
-      a'8 \staccato
-      b'8 \staccato
-
-      |
-
-      c''8 [ (
-      a'8 ] )
-      e''8 \staccato
-      d''8 \staccato
-      c''8 \staccato
-      b'8 \staccato
-
-      |
-
-      a'8 \staccato
-      g'8 \staccato
-      a'8 \staccato
-      <<
-         {
-            \voiceOne
-            d'8
-            g'8
-            fs'8
-            \oneVoice
-         }
-         \new Voice {
-            \voiceTwo
-            d'4
-            c'8
-            \oneVoice
-         }
-      >>
-
-      |
-
-      <b g'>4 \tenuto
-      d'8 \staccato
-      g'8 \staccato
-      b'8 \staccato
-      d''8 \staccato
-
-      |
-
-      d''8 (
-      <c'' a'>8 \staccato )
-      <c'' a'>8 \staccato
-      d''8 (
-      <b' g'>8 \staccato )
-      <b' g'>8 \staccato
-
-      |
-
-      d''8 (
-      <c'' a'>8 \staccato )
-      <c'' a'>8 \staccato
-      d''8 (
-      <b' g'>8 \staccato )
-      <b' g'>8 \staccato
-
-      |
-
-      d''8 \staccato
-      <c'' a'>8 \staccato
-      <b' g'>8 \staccato
-      d'' \staccato
-      <c'' a'>8 \staccato
-      <b' g'>8 \staccato
-
-      |
-
-      <d'' c'' a'>4 \fermata
-      r8 r4 r8
-   }
-
-   % LH Staff
-   \new Staff {
-      \clef bass
-      \key g \major
-      \time 6/8
-      \partial 2
-      r8
-      r8
-      <d' b>8 \staccato
-      <c' a>8 \staccato
-
-      |
-
-      <b g>4
-      r8
-      r8
-      <e' c'>8 \staccato
-      <d' b>8 \staccato
-
-      |
-
-      <c' a>4
-      r8
-      r8
-      <a fs>8 \staccato
-      <b g>8 \staccato
-
-      |
-
-      <c' a>8 \staccato
-      <b d'>8 \staccato
-      <e' c'>8 \staccato
-      <e' cs'>4. (
-
-      |
-
-      d'4 )
-      r8
-      r8
-      <d' b!>8 \staccato
-      <c'! a>8 \staccato
-
-      |
-
-      <b g>4
-      r8
-      r8
-      <e' c'>8 \staccato
-      <d' b>8 \staccato
-
-      |
-
-      <c' a>4
-      r8
-      r8
-      <a fs>8 \staccato
-      <b g>8 \staccato
-
-      |
-
-      <c' a>8 \staccato
-      <d' b>8 \staccato
-      <e' c'>8 \staccato
-      <b d>4
-      <a d>8 \staccato
-
-      |
-
-      <g g,>4 \tenuto
-      r8
-      r4
-      r8
-
-      |
-
-      r8
-      <d' fs>8 \staccato
-      <d' fs>8 \staccato
-      r8
-      <d' g>8 \staccato
-      <d' g>8 \staccato
-
-      |
-
-      r8
-      <d' fs>8 \staccato
-      <d' fs>8 \staccato
-      r8
-      <d' g>8 \staccato
-      <d' g>8 \staccato
-
-      |
-
-      r8
-      <d' fs>8 \staccato
-      <d' g>8 \staccato
-      r8
-      <d' fs>8 \staccato
-      <d' g>8 \staccato
-
-      |
-
-      <d' fs>4 \fermata
-      r8 r4 r8
-   }
-
->>
diff --git a/Documentation/snippets/new/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/new/faking-a-hammer-in-tablatures.ly
deleted file mode 100644
index 55f17456ce..0000000000
--- a/Documentation/snippets/new/faking-a-hammer-in-tablatures.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-A hammer in tablature can be faked with slurs.
-"
-  doctitle = "Faking a hammer in tablatures"
-}
-
-\score {
-  \new TabStaff {
-    \relative c'' {
-      \tabFullNotation
-      c4( d) d( d)
-      d2( c)
-    }
-  }
-}
diff --git a/Documentation/snippets/new/figured-bass-headword.ly b/Documentation/snippets/new/figured-bass-headword.ly
deleted file mode 100644
index 2aae62d655..0000000000
--- a/Documentation/snippets/new/figured-bass-headword.ly
+++ /dev/null
@@ -1,112 +0,0 @@
-\version "2.14.0"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##f
-  line-width = 16\cm
-  indent = 1.5\cm
-}
-
-% NR 2.7.3 Figured bass
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% Arcangelo Corelli, 12 Sonate da Camera, Op. 2
-% Sonata II, Allemanda
-% measures 1 - 88
-% Coded by Neil Puttock; modified by Carl Sorensen
-
-extendOn = \bassFigureExtendersOn
-extendOff = \bassFigureExtendersOff
-
-\score {
-
-  \new StaffGroup <<
-
-    \new GrandStaff <<
-
-      \new Staff = "violinoI" {
-        \set Staff.instrumentName = \markup {
-          \line { Violino I. }
-        }
-        \time 4/4
-        \mark \markup { \italic Adagio. }
-        \partial 8
-        r16 a'16 |
-        a'8. [ d''16 d''8.  e''16 ] cis''8 a'4 a''16 bes''16 |
-        cis''8 d''16 ( e'' ) e''8.  d''16 d''4 r8 d''16 e''16 |
-        f''8 f''4 g''16 ( f''16 ) e''8 e''4 f''16 ( e''16 ) |
-        d''8.  d''16 g''16 ( f''16 ) e''16 ( d''16 ) cis''8
-            cis''4 cis''16 cis''16 |
-        d''8 d''8 c''8.  c''16 c''8 ( b'4 ) b'16 b'16 |
-        c''8 c''8 bes'8.  bes'16 bes'8 ( a'4 ) a''16 a''16 |
-        a''8 g''8 g''8.  g''16 g''8 ( f''8 ) r8 f''8 |
-      }
-
-      \new Staff = "violinoII" {
-        \set Staff.instrumentName = \markup {
-          \line { Violino II. }
-        }
-        \time 4/4
-        \partial 8
-        r16 f'16 |
-        f'8.  g'16 g'4 a'4 r8 d''16 d''16 |
-        e''8 a'8 cis''8.  d''16 d''4 r8 f''16 g''16 |
-        a''8 a''8 d''8.  d''16 g'8 g'8 c''8.  c''16 |
-        f'8.  f''16 bes''16 ( a''16 ) g''16 ( f''16 ) e''8 e''4 e''16 e''16 |
-        a'8 fis''8 g''8 a''8 d''8 d''4 d''16 d''16 |
-        g'8 e''8 f''8 g''8 c''8 c''4 cis''16 cis''16 |
-        d''8 d''8 e''8.  e''16 e''8 a'8 r8 d''8 |
-      }
-
-    >>
-
-    \new Staff = "violone" {
-      \set Staff.instrumentName = \markup {
-        \center-column {
-          Violone,
-          \line { e Cembalo. }
-        }
-      }
-      \time 4/4
-      \clef bass
-      \partial 8
-      r16 d16 |
-      d4 bes,4 a,4 f4 |
-      g8 f16 g16 a8 a,8 d4 d'4 ~ |
-      d'8 c'8 b4 c'8 c'16 bes16 a4 |
-      bes8 bes16 a16 g4 a8 a,4 a16 g16 |
-      fis8 d8 e8 fis8 g8 g,4 g16 f16 |
-      e8 c8 d8 e8 f8 f,4 a,8 |
-      b,4 cis4 d4 r8 d'8 |
-    }
-
-    \new FiguredBass \figuremode {
-      \set figuredBassAlterationDirection = #RIGHT
-      \set figuredBassPlusDirection = #RIGHT
-      \override BassFigureAlignment #'stacking-dir = #DOWN
-      s8 |
-      s4 <6>4 <_+>4 <6>4 |
-      <6 4\+ 2>8 <6>8 <_+> s8 s2 |
-      <5>8 <6 4>8 <6 5>4 s4 <5>8 <6>8 |
-      s4 <6 5 _-> <_+>2 |
-      <6>8 <_+>8 <6>8 <6 5>8 <5 4>8 \extendOn <5 _!>8 \extendOff s4 |
-      <6>4 <6->8 <6 5->8 <5 4->8 \extendOn <5 3>4 \extendOff <5 _+>8 |
-      <7>8 <6>8 <5>4 <9 4>8 <8 3>8 s4 |
-    }
-
-  >>
-
-  \layout {
-    \context {
-      \Score
-      \override RehearsalMark #'break-align-symbols = #'(time-signature)
-      \override RehearsalMark #'self-alignment-X = #LEFT
-      \override TimeSignature #'break-align-anchor-alignment = #LEFT
-    }
-  }
-}
diff --git a/Documentation/snippets/new/flamenco-notation.ly b/Documentation/snippets/new/flamenco-notation.ly
deleted file mode 100644
index 884e4b8a2d..0000000000
--- a/Documentation/snippets/new/flamenco-notation.ly
+++ /dev/null
@@ -1,250 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-
-  texidoc = "
-For flamenco guitar, special notation is used:
-
-
-@itemize
-
-@item
-a golpe symbol to indicate a slap on the guitar body with the nail of
-the ring finger
-
-@item
-an arrow to indicate (the direction of) strokes
-
-@item
-different letters for fingering (@qq{p}: thumb, @qq{i}: index finger,
-@qq{m}: middle finger, @qq{a}: ring finger and @qq{x}: little finger)
-
-@item
-3- and 4-finger rasgueados: stroke upwards with all fingers, ending
-with an up- and down using the index finger
-
-@item
-abanicos: strokes (in tuples) with thumb (down), little and index finger
-(both up) (there is also an abanico 2 where middle and ring finger are
-used instead of the little finger)
-
-@item
-alza pua: fast playing with the thumb
-
-@end itemize
-
-
-Most figures use arrows in combination with fingering; with abanicos
-and rasgueados, noteheads are printed only for the first chord.
-
-This snippet contains some header-like code that can be copied as
-@samp{flamenco.ly} and included in source files.
-
-"
-  doctitle = "Flamenco notation"
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%  Cut here ----- Start 'flamenco.ly'
-
-% Text indicators
-abanico = \markup { \italic Abanico }
-rasgueaso = \markup { \italic Ras. }
-alzapua = \markup { \italic Alzapua }
-
-% Finger stroke symbols
-strokeUp = \markup { \postscript #"
-  0.1     setlinewidth
-  0.5 0   moveto
-  0.5 2   lineto
-  0.2 1.4 lineto
-  0.5 2   moveto
-  0.8 1.4 lineto
-  stroke
-"}
-
-strokeDown = \markup { \postscript #"
-  0.1     setlinewidth
-  0.5 2   moveto
-  0.5 0   lineto
-  0.2 0.6 lineto
-  0.5 0   moveto
-  0.8 0.6 lineto
-  stroke
-"}
-
-% Golpe symbol
-golpe = \markup { \postscript #"
-  0.2 setlinewidth
-  0 0 moveto
-  1 0 lineto
-  1 1 lineto
-  stroke
-  "\postscript #"
-  0.1       setlinewidth
-  -0.6 -0.1  moveto
-  -0.6  1.0 lineto
-  0.5  1.0 lineto
-  stroke
-"}
-
-strokeUpGolpe = \markup { \column { \golpe \line { \strokeUp } } }
-iUpGolpe = \markup { \column { \golpe \line { \small i } \line { \strokeUp } } }
-
-% Strokes for all fingers
-pUp   = \markup { \column { \small p \line { \strokeUp } } }
-pDown = \markup { \column { \small p \line { \strokeDown } } }
-iUp   = \markup { \column { \small i \line { \strokeUp } } }
-iDown = \markup { \column { \small i \line { \strokeDown } } }
-mUp   = \markup { \column { \small m \line { \strokeUp } } }
-mDown = \markup { \column { \small m \line { \strokeDown } } }
-aUp   = \markup { \column { \small a \line { \strokeUp } } }
-aDown = \markup { \column { \small a \line { \strokeDown } } }
-xUp   = \markup { \column { \small x \line { \strokeUp } } }
-xDown = \markup { \column { \small x \line { \strokeDown } } }
-
-
-% Just handy :)
-tupletOff = {
-  \once \override TupletNumber #'stencil = ##f
-  \once \override TupletBracket #'stencil = ##f
-}
-
-tupletsOff = {
-  \override TupletNumber #'stencil = ##f
-  \override TupletBracket #'bracket-visibility = #'if-no-beam
-}
-
-tupletsOn = {
-  \override TupletBracket #'bracket-visibility = #'default
-  \revert TupletNumber #'stencil
-}
-
-headsOff = {
-  \override TabNoteHead #'transparent = ##t
-  \override NoteHead #'transparent = ##t
-  \override NoteHead #'no-ledgers = ##t
-}
-
-headsOn = {
-  \override TabNoteHead #'transparent = ##f
-  \override NoteHead #'transparent = ##f
-  \override NoteHead #'no-ledgers = ##f
-}
-
-%%%%%%%  Cut here ----- End 'flamenco.ly'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-part = \relative c' {
-  <a, e' a cis e>8^\iUp
-  <a e' a cis e>8^\iDown
-  r4
-  r2^\golpe
-
-  <a e' a cis e>8^\iUp
-  <a e' a cis e>8^\iDown
-  <a e' a cis e>8^\iUpGolpe
-  <a e' a cis e>8^\iDown
-  r2
-
-  <a e' a cis e>16^\aUp
-  \headsOff
-  <a e' a cis e>^\mUp
-  <a e' a cis e>^\iUp
-  <a e' a cis e>^\iDown~
-  \headsOn
-  <a e' a cis e>2
-  r4
-
-  \tupletOff
-  \times 4/5 {
-    <a e' a cis e>16^\xUp
-    \headsOff
-    <a e' a cis e>^\aUp
-    <a e' a cis e>^\mUp
-    <a e' a cis e>^\iUp
-    <a e' a cis e>^\iDown~
-    \headsOn
-  }
-  <a e' a cis e>2
-  r4
-
-  \tupletsOff
-  \times 2/3 {
-    <a e' a cis e>8^\pDown
-    \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
-    \headsOn
-  }
-
-  \times 2/3 {
-    <a e' a cis e>8^\pDown
-    \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
-    \headsOn
-  }
-
-  \times 2/3 {
-    <a e' a cis e>8^\pDown
-    \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
-    \headsOn
-  }
-  \times 2/3 {
-    <a e' a cis e>8^\pDown
-    \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
-    \headsOn
-  }
-
-  \tupletsOff
-  \override Beam #'positions = #'(2 . 2)
-  \times 2/3 {
-    a8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
-  }
-  \times 2/3 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
-  }
-  \times 2/3 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
-  }
-  \times 2/3 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
-  }
-  \tupletsOn
-
-  \once \override TextScript #'extra-offset = #'(0 . -1)
-  <g, b f'>1_\golpe^\mUp
-  \bar "|."
-}
-
-\score {
-  \new StaffGroup <<
-    \context Staff = "part" <<
-      \clef G
-      \transpose c c'
-      {
-        \part
-      }
-    >>
-    \context TabStaff {
-      \part
-    }
-  >>
-  \layout {
-    ragged-right = ##t
-  }
-}
diff --git a/Documentation/snippets/new/fretboards-alternate-tables.ly b/Documentation/snippets/new/fretboards-alternate-tables.ly
deleted file mode 100644
index 382a0f8a92..0000000000
--- a/Documentation/snippets/new/fretboards-alternate-tables.ly
+++ /dev/null
@@ -1,75 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-
-  texidoc = "
-Alternate fretboard tables can be created.  These would be used in
-order to have alternate fretboards for a given chord.
-
-In order to use an alternate fretboard table, the table must first
-be created.  Fretboards are then added to the table.
-
-The created fretboard table can be blank, or it can be copied
-from an existing table.
-
-The table to be used in displaying predefined fretboards is selected
-by the property @code{\predefinedDiagramTable}.
-"
-
-  doctitle = "Alternate fretboard tables"
-}
-
-\include "predefined-guitar-fretboards.ly"
-
-% Make a blank new fretboard table
-#(define custom-fretboard-table-one (make-fretboard-table))
-
-% Make a new fretboard table as a copy of default-fret-table
-#(define custom-fretboard-table-two (make-fretboard-table default-fret-table))
-
-% Add a chord to custom-fretboard-table-one
-\storePredefinedDiagram #custom-fretboard-table-one
-                        \chordmode{c}
-                        #guitar-tuning
-                        "3-(;3;5;5;5;3-);"
-
-% Add a chord to custom-fretboard-table-two
-\storePredefinedDiagram #custom-fretboard-table-two
-                        \chordmode{c}
-                        #guitar-tuning
-                        "x;3;5;5;5;o;"
-
-<<
-  \chords {
-    c1 | d1 |
-    c1 | d1 |
-    c1 | d1 |
-  }
-  \new FretBoards {
-    \chordmode {
-      \set predefinedDiagramTable = #default-fret-table
-      c1 | d1 |
-      \set predefinedDiagramTable = #custom-fretboard-table-one
-      c1 | d1 |
-      \set predefinedDiagramTable = #custom-fretboard-table-two
-      c1 | d1 |
-    }
-  }
-  \new Staff {
-    \clef "treble_8"
-    <<
-      \chordmode {
-        c1 | d1 |
-        c1 | d1 |
-        c1 | d1 |
-      }
-      {
-        s1_\markup "Default table" | s1 |
-        s1_\markup \column {"New table" "from empty"} | s1 |
-        s1_\markup \column {"New table" "from default"} | s1 |
-      }
-    >>
-  }
->>
-
diff --git a/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly
deleted file mode 100644
index ed942c9b31..0000000000
--- a/Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly
+++ /dev/null
@@ -1,74 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-Fretted-string harmonics:
-"
-  doctitle = "Fretted-string harmonics in tablature"
-}
-
-pinchedHarmonics = {
-   \textSpannerDown
-   \override TextSpanner #'bound-details #'left #'text =
-      \markup {\halign #-0.5 \teeny "PH" }
-      \override TextSpanner #'style =
-         #'dashed-line
-   \override TextSpanner #'dash-period = #0.6
-   \override TextSpanner #'bound-details #'right #'attach-dir = #1
-   \override TextSpanner #'bound-details #'right #'text =
-      \markup { \draw-line #'(0 . 1) }
-   \override TextSpanner #'bound-details #'right #'padding = #-0.5
-}
-
-harmonics = {
-  %artificial harmonics (AH)
-  \textLengthOn
-  <\parenthesize b b'\harmonic>4_\markup{ \teeny "AH 16" }
-  <\parenthesize g g'\harmonic>4_\markup{ \teeny "AH 17" }
-  <\parenthesize d' d''\harmonic>2_\markup{ \teeny "AH 19" }
-  %pinched harmonics (PH)
-  \pinchedHarmonics
-  <a'\harmonic>2\startTextSpan
-  <d''\harmonic>4
-  <e'\harmonic>4\stopTextSpan
-  %tapped harmonics (TH)
-  <\parenthesize g\4 g'\harmonic>4_\markup{ \teeny "TH 17" }
-  <\parenthesize a\4 a'\harmonic>4_\markup{ \teeny "TH 19" }
-  <\parenthesize c'\3 c''\harmonic>2_\markup{ \teeny "TH 17" }
-  %touch harmonics (TCH)
-  a4( <e''\harmonic>2. )_\markup{ \teeny "TCH" }
-}
-
-frettedStrings = {
-  %artificial harmonics (AH)
-  \harmonicByFret #4 g4\3
-  \harmonicByFret #5 d4\4
-  \harmonicByFret #7 g2\3
-  %pinched harmonics (PH)
-  \harmonicByFret #7 d2\4
-  \harmonicByFret #5 d4\4
-  \harmonicByFret #7 a4\5
-  %tapped harmonics (TH)
-  \harmonicByFret #5 d4\4
-  \harmonicByFret #7 d4\4
-  \harmonicByFret #5 g2\3
-  %touch harmonics (TCH)
-  a4 \harmonicByFret #9 g2.\3
-}
-
-\score {
-  <<
-    \new Staff {
-      \new Voice {
-        \clef "treble_8"
-        \harmonics
-      }
-    }
-    \new TabStaff {
-      \new TabVoice {
-        \frettedStrings
-      }
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/new/graphical-and-text-woodwind-diagrams.ly
deleted file mode 100644
index 6b77f0adea..0000000000
--- a/Documentation/snippets/new/graphical-and-text-woodwind-diagrams.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags="winds"
-  texidoc="
-In may cases, the keys other than the central column can be
-displayed by key name as well as by graphical means.
-"
-
-  doctitle = "Graphical and text woodwind diagrams"
-}
-
-\relative c'' {
-  \textLengthOn
-  c1^\markup
-    \woodwind-diagram
-      #'piccolo
-      #'((cc . (one three))
-         (lh . (gis))
-         (rh . (ees)))
-
-  c^\markup
-    \override #'(graphical . #f) {
-      \woodwind-diagram
-        #'piccolo
-        #'((cc . (one three))
-           (lh . (gis))
-           (rh . (ees)))
-    }
-}
diff --git a/Documentation/snippets/new/grouping-beats.ly b/Documentation/snippets/new/grouping-beats.ly
deleted file mode 100644
index 5f9f71fc95..0000000000
--- a/Documentation/snippets/new/grouping-beats.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-Beaming patterns may be altered with the @code{beatGrouping} property:
-
-"
-  doctitle = "Grouping beats"
-}
-
-\markup {
-  This snippet is deprecated as of version 2.13.5 and will be removed
-  in version 2.14.
-}
diff --git a/Documentation/snippets/new/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly b/Documentation/snippets/new/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
deleted file mode 100644
index 8499cdf470..0000000000
--- a/Documentation/snippets/new/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-\version "2.14.0"
-\header {
-  lsrtags = "pitches"
-  texidoc = "This shows how to hide accidentals on tied notes at the beginning of a
-new system."
-  doctitle = "Hiding accidentals on tied notes at the beginning of a new system"
-}
-
-\relative c'' {
-  \override Accidental #'hide-tied-accidental-after-break = ##t
-  cis1~ cis~
-  \break
-  cis
-}
-
diff --git a/Documentation/snippets/new/keyboard-headword.ly b/Documentation/snippets/new/keyboard-headword.ly
deleted file mode 100644
index 95be4b7709..0000000000
--- a/Documentation/snippets/new/keyboard-headword.ly
+++ /dev/null
@@ -1,248 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 2.2 Keyboard instruments
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% M. Ravel, Sonatine (1905)
-% First movement
-
-\layout {
-  \context {
-    \Score
-    \remove "Bar_number_engraver"
-  }
-}
-
-fermataLong = \markup {
-  \override #'(direction . 1)
-  \override #'(baseline-skip . 2) {
-    \dir-column {
-      \musicglyph #"scripts.ufermata"
-      \text \italic \center-align long
-    }
-  }
-}
-
-\new PianoStaff <<
-  \set PianoStaff.connectArpeggios = ##t
-  \new Staff {
-    \time 2/4
-    \key fs \major
-    <<
-      \new Voice {
-        \voiceOne
-        fs''8 ( ^\markup {
-          \override #'(baseline-skip . 2.4) \column {
-            \line \bold { Un peu retenu }
-            \line \italic { très expressif }
-          }
-        }
-        es''16
-        cs''16
-        as'4 )
-        |
-        fs''8 (
-        es''16
-        cs''16
-        as'4 )
-        |
-        fs''8 (
-        es''16
-        cs''16
-        as'8
-        cs''8 )
-        |
-      }
-      \new Voice {
-        \voiceTwo
-        gs'8\rest \ppp
-        fs'4 (
-        es'8 )
-        |
-        gs'8\rest
-        fs'4 (
-        es'8 )
-        |
-        gs'8\rest
-        fs'4 (
-        es'8 )
-        |
-      }
-    >>
-    \clef bass
-    <ds b! es'>4 ( ^ \markup \bold { Rall. }
-    \override Script #'stencil = #(lambda (grob)
-      (grob-interpret-markup grob fermataLong))
-    <ds' as'>8 ) \fermata
-    \noBeam
-    \clef treble
-    \slurUp
-    \once \override Hairpin #'to-barline = ##f
-    <as fs'>8 ( \pp \>
-    |
-    <gs b cs'>4. \! ) ^\markup \bold { a Tempo }
-    \slurUp
-    <as fs'>8 ^\( \>
-    |
-    <gs b cs'>4. \! \)
-    <<
-      \new Voice {
-        \voiceOne
-        <as fs'>8 (
-        |
-        cs'8 ^\markup \bold { Rallentando }
-        b16
-        cs'16
-        d'8
-        e'16
-        fs'16
-        |
-        <as! cs' gs'>4. )
-        s8
-        |
-        r8
-        <cs'' as'' cs'''>4 \arpeggio
-        e''16 ( ^\markup \bold { Lent }
-        fs''16
-        |
-        \voiceTwo
-        <as'! cs'' gs''>2 )
-        |
-      }
-      \new Voice {
-        \voiceTwo
-        s8
-        |
-        <gs b>4 \<
-        <fs bs>4 \>
-        |
-        s4. \!
-        \slurUp
-        \once \override Script #'direction = #UP
-        <a bs e'>8 ( \accent
-        |
-        <as! cs' gs'>4. )
-        \once \override Hairpin #'to-barline = ##f
-        <a' bs'>8 \ppp \>
-        |
-        s8 \!
-        \stemDown
-        \once \override Script #'direction = #UP
-        \ottava #1
-        \voiceOne
-        \once \override PianoStaff.Arpeggio #'padding = #0.8
-        <cs''' as''' cs''''>4. \arpeggio \fermata
-        \ottava #0
-        \bar "|."
-      }
-    >>
-  }
-  \new Staff <<
-    \set Staff.pedalSustainStyle = #'bracket
-    \key fs \major
-    \clef bass
-    \new Voice {
-      \voiceOne
-      ds'4 \tenuto
-      cs'4 \tenuto
-      |
-      ds'4 \tenuto
-      cs'4 \tenuto
-      |
-      ds'4 \tenuto
-      cs'4 \tenuto
-      |
-      s8
-      \clef treble
-      <b' cs''>8 [
-      \clef bass
-      <es b cs'>8 \fermata ]
-      s8
-      |
-      fs8\rest
-      \clef treble
-      <b' cs''>4 \tenuto
-      s8
-      |
-      fs8\rest
-      \clef treble
-      <b' cs''>4 \tenuto
-      s8
-      |
-      s2
-      |
-      ds8\rest
-      \clef treble
-      <as' cs''>4
-      \clef bass
-      s8
-      |
-      s8
-      \clef treble
-      <as'>4 \arpeggio
-      \clef bass
-      s8
-      |
-      s8
-      \clef treble
-      <as''>4. \arpeggio \fermata
-      |
-    }
-    \new Voice {
-      \voiceTwo
-      ds'8 [ (
-      < ds bs >8
-      cs'8
-      < ds as >8 ] )
-      |
-      ds'8 [ (
-      < ds bs >8
-      cs'8
-      < ds as >8 ] )
-      |
-      ds'8 [ (
-      < ds bs >8
-      cs'8
-      < ds as >8 ] )
-      |
-      \once \override Script #'outside-staff-priority = #100
-      \once \override TextScript #'outside-staff-priority = #500
-      <cs, gs,>4. \fermata _\markup \italic { ped. }
-      <fs, cs>8 (
-      |
-      <e, b,>4. ) \sustainOn
-      \clef bass
-      <fs, cs>8 \( \sustainOff
-      |
-      <e, b,>4. \) \sustainOn
-      \clef bass
-      <fs, cs>8 ( \sustainOff
-      |
-      <e, b,>4
-      <d, a,>4
-      |
-      <fs,, cs,>4. ) \sustainOn
-      <a, e>8 ( \sustainOff
-      |
-      <fs, cs>4. ) \sustainOn
-      \slurUp
-      <a e'>8 ( \sustainOff \sustainOn
-      |
-      <fs cs'>2 ) \sustainOff \sustainOn
-      |
-    }
-  >>
->>
diff --git a/Documentation/snippets/new/letter-tablature-formatting.ly b/Documentation/snippets/new/letter-tablature-formatting.ly
deleted file mode 100644
index f97d656cb2..0000000000
--- a/Documentation/snippets/new/letter-tablature-formatting.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "staff-notation, fretted-strings"
-
-  texidoc = "
-Tablature can be formatted using letters instead of numbers.
-
-"
-  doctitle = "Letter tablature formatting"
-}
-
-music = \relative c {
-  c4 d e f
-  g4 a b c
-  d4 e f g
-}
-
-<<
-  \new Staff {
-    \clef "G_8"
-    \music
-  }
-  \new TabStaff \with {
-    tablatureFormat = #fret-letter-tablature-format
-  }
-  {
-    \music
-  }
->>
diff --git a/Documentation/snippets/new/makam-example.ly b/Documentation/snippets/new/makam-example.ly
deleted file mode 100644
index 9191ffeb73..0000000000
--- a/Documentation/snippets/new/makam-example.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "pitches, world-music"
-  texidoc = "
-Makam is a type of melody from Turkey using 1/9th-tone microtonal
-alterations.  Consult the initialization file @samp{ly/makam.ly} for
-details of pitch names and alterations.
-
-"
-  doctitle = "Makam example"
-}
-
-% Initialize makam settings
-\include "makam.ly"
-
-\relative c' {
-  \set Staff.keySignature = #`((6 . ,(- KOMA)) (3 . ,BAKIYE))
-  c4 cc db fk
-  gbm4 gfc gfb efk
-  fk4 db cc c
-}
diff --git a/Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly
deleted file mode 100644
index 28f15c8738..0000000000
--- a/Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms, expressive-marks"
-  texidoc = "
-Slurs can be made with complex dash patterns by defining
-the @code{dash-definition} property.  @code{dash-definition}
-is a list of @code{dash-elements}.  A @code{dash-element} is a
-list of parameters defining the dash behavior for a segment of
-the slur.
-
-The slur is defined in terms of the bezier parameter t
-which ranges from 0
-at the left end of the slur to 1 at the right end of the slur.
-@code{dash-element} is a list @code{(start-t stop-t dash-fraction
-dash-period)}.  The region of the slur from @code{start-t} to
-@code{stop-t} will have a fraction @code{dash-fraction}
-of each @code{dash-period} black.  @code{dash-period} is
-defined in terms of staff spaces.  @code{dash-fraction} is
-set to 1 for a solid slur.
-"
-  doctitle = "Making slurs with complex dash structure"
-}
-
-\relative c' {
-  \once \override
-    Slur #'dash-definition = #'((0 0.3 0.1 0.75)
-                                (0.3 0.6 1 1)
-                                (0.65 1.0 0.4 0.75))
-  c4( d e f)
-  \once \override
-    Slur #'dash-definition = #'((0 0.25 1 1)
-                                (0.3 0.7 0.4 0.75)
-                                (0.75 1.0 1 1))
-  c4( d e f)
-}
diff --git a/Documentation/snippets/new/modern-tab-text-clef.ly b/Documentation/snippets/new/modern-tab-text-clef.ly
deleted file mode 100644
index 2af2335ca0..0000000000
--- a/Documentation/snippets/new/modern-tab-text-clef.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "staff-notation, fretted-strings"
-
-  texidoc = "
-Use a markup text to replace the (TAB) clef glyph with a modern font.
-
-"
-  doctitle = "Modern TAB text clef"
-}
-
-\markup {
-  This snippet is deprecated as of version 2.13.4 and will be removed
-  in version 2.14.
-}
diff --git a/Documentation/snippets/new/non-default-tuplet-numbers.ly b/Documentation/snippets/new/non-default-tuplet-numbers.ly
deleted file mode 100644
index 1ea456dab0..0000000000
--- a/Documentation/snippets/new/non-default-tuplet-numbers.ly
+++ /dev/null
@@ -1,41 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-
-  texidoc = "
-LilyPond also provides formatting functions to print tuplet numbers different
-than the actual fraction, as well as to append a note value to the tuplet
-number or tuplet fraction.
-"
-  doctitle = "Non-default tuplet numbers"
-}
-
-\relative c'' {
-  \once \override TupletNumber #'text =
-    #(tuplet-number::non-default-tuplet-denominator-text 7)
-  \times 2/3  { c4. c4. c4. c4. }
-  \once \override TupletNumber #'text =
-    #(tuplet-number::non-default-tuplet-fraction-text 12 7)
-  \times 2/3  { c4. c4. c4. c4. }
-  \once \override TupletNumber #'text =
-    #(tuplet-number::append-note-wrapper
-      (tuplet-number::non-default-tuplet-fraction-text 12 7) "8")
-  \times 2/3  { c4. c4. c4. c4. }
-
-  \once \override TupletNumber #'text =
-    #(tuplet-number::append-note-wrapper
-      tuplet-number::calc-denominator-text "4")
-  \times 2/3  { c8 c8 c8 c8 c8 c8 }
-  \once \override TupletNumber #'text =
-    #(tuplet-number::append-note-wrapper
-      tuplet-number::calc-fraction-text "4")
-  \times 2/3  { c8 c8 c8 c8 c8 c8 }
-
-  \once \override TupletNumber #'text =
-    #(tuplet-number::fraction-with-notes "4." "8")
-  \times 2/3  { c4. c4. c4. c4. }
-  \once \override TupletNumber #'text =
-    #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4")
-  \times 2/3  { c4. c4. c4. c4. }
-}
diff --git a/Documentation/snippets/new/non-traditional-key-signatures.ly b/Documentation/snippets/new/non-traditional-key-signatures.ly
deleted file mode 100644
index 8a3c145a98..0000000000
--- a/Documentation/snippets/new/non-traditional-key-signatures.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "pitches, staff-notation"
-  texidoc = "
-The commonly used @code{\\key} command sets the @code{keySignature}
-property, in the @code{Staff} context.
-
-To create non-standard key signatures, set this property directly.  The
-format of this command is a list:
-
-@code{\\set Staff.keySignature = #`(((octave . step) . alter) ((octave
-. step) . alter) ...)} where, for each element in the list,
-@code{octave} specifies the octave (0@tie{}being the octave from
-middle@tie{}C to the B above), @code{step} specifies the note within the
-octave (0@tie{}means@tie{}C and 6@tie{}means@tie{}B), and @code{alter} is
-@code{,SHARP ,FLAT ,DOUBLE-SHARP} etc.  (Note the leading comma.)
-
-Alternatively, for each item in the list, using the more concise format
-@code{(step . alter)} specifies that the same alteration should hold in all
-octaves.
-
-Here is an example of a possible key signature for generating a whole-tone
-scale:
-"
-  doctitle = "Non-traditional key signatures"
-}
-
-\relative c' {
-  \set Staff.keySignature = #`(((0 . 6) . ,FLAT)
-                               ((0 . 5) . ,FLAT)
-                               ((0 . 3) . ,SHARP))
-  c4 d e fis
-  aes4 bes c2
-}
-
diff --git a/Documentation/snippets/new/open-string-harmonics-in-tablature.ly b/Documentation/snippets/new/open-string-harmonics-in-tablature.ly
deleted file mode 100644
index 46a833c8ae..0000000000
--- a/Documentation/snippets/new/open-string-harmonics-in-tablature.ly
+++ /dev/null
@@ -1,64 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-Reference for open-string harmonics:
-"
-  doctitle = "Reference for open-string harmonics"
-}
-
-openStringHarmonics = {
-  %first harmonic
-  \harmonicByFret #12 e,2\6_\markup{"1st harm."}
-  \harmonicByRatio #1/2 e,\6
-  %second harmonic
-  \harmonicByFret #7 e,\6_\markup{"2nd harm. - - - -"}
-  \harmonicByRatio #1/3 e,\6
-  \harmonicByFret #19 e,\6
-  \harmonicByRatio #2/3 e,\6
-  %\harmonicByFret #19 < e,\6 a,\5 d\4 >
-  %\harmonicByRatio #2/3 < e,\6 a,\5 d\4 >
-  %third harmonic
-  \harmonicByFret #5 e,\6_\markup{"3rd harm. - - - -"}
-  \harmonicByRatio #1/4 e,\6
-  \harmonicByFret #24 e,\6
-  \harmonicByRatio #3/4 e,\6
-  \break
-  %fourth harmonic
-  \harmonicByFret #4 e,\6_\markup{"4th harm. - - - - - - - - - - - - -"}
-  \harmonicByRatio #1/5 e,\6
-  \harmonicByFret #9 e,\6
-  \harmonicByRatio #2/5 e,\6
-  \harmonicByFret #16 e,\6
-  \harmonicByRatio #3/5 e,\6
-  %fifth harmonic
-  \harmonicByFret #3 e,\6_\markup{"5th harm."}
-  \harmonicByRatio #1/6 e,\6
-  \break
-  %sixth harmonic
-  \harmonicByFret #2.7 e,\6_\markup{"6th harm."}
-  \harmonicByRatio #1/7 e,\6
-  %seventh harmonic
-  \harmonicByFret #2.3 e,\6_\markup{"7th harm."}
-  \harmonicByRatio #1/8 e,\6
-  %eighth harmonic
-  \harmonicByFret #2 e,\6_\markup{"8th harm."}
-  \harmonicByRatio #1/9 e,\6
-}
-
-\score {
-  <<
-    \new Staff {
-      \new Voice {
-        \clef "treble_8"
-        \openStringHarmonics
-      }
-    }
-    \new TabStaff {
-      \new TabVoice {
-        \openStringHarmonics
-      }
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/piano-template-with-centered-dynamics.ly b/Documentation/snippets/new/piano-template-with-centered-dynamics.ly
deleted file mode 100644
index 70403a76fc..0000000000
--- a/Documentation/snippets/new/piano-template-with-centered-dynamics.ly
+++ /dev/null
@@ -1,53 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, keyboards, template"
-  texidoc = "
-Many piano scores have the dynamics centered between the two staves.
-The @code{Dynamics} context, if placed between staves, will
-automatically position dynamics correctly.
-
-"
-  doctitle = "Piano template with centered dynamics"
-}
-
-global = {
-  \key c \major
-  \time 4/4
-}
-
-upper = \relative c'' {
-  \clef treble
-  a4 b c d
-}
-
-lower = \relative c {
-  \clef bass
-  a2 c
-}
-
-dynamics = {
-  s2\fff\> s4 s\!\pp
-}
-
-pedal = {
-  s2\sustainOn s\sustainOff
-}
-
-\score {
-  \new PianoStaff = "PianoStaff_pf" <<
-    \new Staff = "Staff_pfUpper" << \global \upper >>
-    \new Dynamics = "Dynamics_pf" \dynamics
-    \new Staff = "Staff_pfLower" << \global \lower >>
-    \new Dynamics = "pedal" \pedal
-  >>
-  \layout { }
-}
-
-\score {
-  \new PianoStaff = "PianoStaff_pf" <<
-    \new Staff = "Staff_pfUpper" << \global \upper \dynamics \pedal >>
-    \new Staff = "Staff_pfLower" << \global \lower \dynamics \pedal >>
-  >>
-  \midi { }
-}
diff --git a/Documentation/snippets/new/pitches-headword.ly b/Documentation/snippets/new/pitches-headword.ly
deleted file mode 100644
index 9bd3dd0171..0000000000
--- a/Documentation/snippets/new/pitches-headword.ly
+++ /dev/null
@@ -1,143 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-% NR 1.1 Pitches
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-
-% L. v. Beethoven
-% Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
-% chorale at measures 34 - 40+
-
-\new PianoStaff <<
-
-  % RH Staff
-  \new Staff <<
-
-    % RH Voice 1
-    \new Voice {
-      \set Score.currentBarNumber = #34
-      \voiceOne
-      gs''2 ( ^ \markup \italic { dolce e molto ligato }
-      fs''4
-      e''4
-      |
-      ds''2
-      cs''2 )
-      |
-      ds''2 (
-      e''4
-      fs''4
-      |
-      <gs'' e''>2
-      <fs'' ds''>2 )
-      |
-      \oneVoice
-      \clef bass
-      <gs' e' b>2 (
-      <fs' ds' a>4
-      <e' cs' gs>4
-      |
-      <ds' bs fs>2
-      <cs' a e>2 )
-      |
-      \voiceOne
-      b2 %(
-      cs'4
-      ds'4
-      |
-      \clef treble
-      <e' gs>4 %)
-      r4 r2
-    }
-
-    % RH Voice 2
-    \new Voice {
-      \voiceTwo
-      \override Staff.DynamicLineSpanner #'staff-padding = #2.5
-      <e'' b'>2 \p
-      <ds'' a'>4
-      <cs'' gs'>4
-      |
-      <bs' fs'>2
-      e'2
-      |
-      \once \override TextScript #'staff-padding = #2.5
-      <b'! a'>2 _ \markup \italic { cresc. }
-      b'4
-      <e'' cs''>4
-      |
-      b'2. ( \sf \>
-      a'4 )
-      \clef bass
-      | \break
-      s1 \p
-      |
-      s1
-      |
-      <gs e>4 (
-      <a fs>2. )
-      |
-      s4
-      r4 r2
-    }
-
-  >>
-
-  % LH Staff
-  \new Staff {
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #5
-    <gs' e'>2 ( \sustainOn
-    <fs' ds' b>4 \sustainOff
-    <e' cs'>4
-    |
-    <ds' bs gs>2
-    <cs' a>2 ) \sustainOn
-    |
-    \clef bass
-    \slurDown
-    <ds' b! a fs>2 ( \sustainOff
-    <e' b gs>4
-    <fs' cs' a>4 \sustainOn
-    |
-    \clef treble
-    \voiceOne
-    <<
-      {
-        <gs' e'>2
-        <fs' ds'>2 )
-      }
-      \new Voice {
-        \voiceTwo
-        b1 \sustainOff
-      }
-    >>
-    \oneVoice
-    |
-    %\break
-    \clef bass
-    <gs e>2 (
-    <fs ds b,>4
-    <e cs>4
-    |
-    <ds bs, gs,>2
-    <cs a,>2 ) \sustainOn
-    |
-    <b,! b,,!>1 ( \sustainOff
-    |
-    <e e,>4 )
-    r4 r2
-  }
-
->>
diff --git a/Documentation/snippets/new/repeats-headword.ly b/Documentation/snippets/new/repeats-headword.ly
deleted file mode 100644
index 0f80e73c43..0000000000
--- a/Documentation/snippets/new/repeats-headword.ly
+++ /dev/null
@@ -1,131 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 1.7 Repeats
-
-% Beethoven, Op. 57
-% Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet
-% Movt II, Andante con moto
-% Measures 9 - 16
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-
-\new PianoStaff <<
-
-   \new Staff = RH {
-      \clef bass
-      \key df \major
-      \time 2/4
-      \set Score.currentBarNumber = #9
-      \bar "|:"
-      <af ef c>4 (
-      <af gf c>8..
-      <af ef c>32
-      |
-      <af f df>8. )
-      <df' af f>16 (
-      <c' af gf>8
-      <df' af f>8 )
-      |
-      <af ef c>4 (
-      <af gf c>8..
-      <af ef c>32
-      |
-      <af f df>8. )
-      \slurDown
-      <f' af f>16 (
-      <<
-         {
-            \voiceTwo
-            gf8
-            f8 )
-         }
-         \new Voice {
-            \voiceOne
-            <f' af>16
-            ef'16
-            <df' af>8
-         }
-      >>
-      \oneVoice
-      |
-      <af ef c>4 (
-      <af gf c>8..
-      <af ef c>32
-      \clef treble
-      |
-      <af' df' af>8. )
-      <af' f' df'>16 (
-      <af' ef' c'>16
-      gf'16
-      <f' df' af>8 )
-      |
-      \slurUp
-      <ef' bf gf>4
-      \change Staff = LH
-      \voiceOne
-      <af ef c>4
-      |
-      <df' f df>4.
-      \change Staff = RH
-      \oneVoice
-      r8
-      \clef bass
-      \bar ":|"
-   }
-
-   \new Staff = LH {
-      \clef bass
-      \key df \major
-      \time 2/4
-      <af, gf,>4 (
-      <af, ef,>8..
-      <af, gf,>32
-      |
-      <af, f,>8. )
-      <af, df,>16 (
-      <af, ef,>8
-      <af, df,>8 )
-      |
-      <af, gf,>4 (
-      <af, ef,>8..
-      <af, gf,>32
-      |
-      <af, f,>8. )
-      <af, df,>16 (
-      <af, c,>8
-      <af, df,> )
-      |
-      <af, gf,>4 (
-      <af, ef,>8..
-      <af, gf,>32
-      |
-      <f f,>8. )
-      <df df,>16 (
-      <ef ef,>8
-      <f f,>8 )
-      |
-      \voiceTwo
-      gf,4  (
-      af,4 ~ )
-      |
-      af,16. [ (
-      gf,32
-      f,16.
-      ef,32 ]
-      df,8 )
-      \oneVoice
-      r8
-   }
-
->>
diff --git a/Documentation/snippets/new/reverting-default-beam-endings.ly b/Documentation/snippets/new/reverting-default-beam-endings.ly
deleted file mode 100644
index d771c60161..0000000000
--- a/Documentation/snippets/new/reverting-default-beam-endings.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-To typeset beams grouped @code{3-4-3-2} one need only change the
-beat structure:
-"
-  doctitle = "Reverting default beam endings"
-}
-
-\relative c'' {
-  \time 12/8
-
-  % Default beaming
-  a8 a a a a a a a a a a a
-
-  % Set new values for beam endings
-  \set Score.beatStructure = #'(3 4 3 2)
-  a8 a a a a a a a a a a a
-}
diff --git a/Documentation/snippets/new/rhythms-headword.ly b/Documentation/snippets/new/rhythms-headword.ly
deleted file mode 100644
index 74a410df06..0000000000
--- a/Documentation/snippets/new/rhythms-headword.ly
+++ /dev/null
@@ -1,216 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 1.2 Rhythms
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-
-% Beethoven, Op. 81a
-% Piano sonata 26 - Das Lebewohl
-% Movt II - Abwesenheit
-% Measures 31 - 34
-
-\layout {
-  \context {
-    \Score
-    \override SpacingSpanner #'base-shortest-duration =
-      #(ly:make-moment 1 40)
-      %\override SpacingSpanner #'strict-grace-spacing = ##t
-  }
-}
-
-\new PianoStaff <<
-
-   % RH Staff
-   \new Staff {
-      \clef treble
-      \key c \minor
-      \time 2/4
-      \set Score.currentBarNumber = #31
-
-      <c''' c''>8 ( -\markup {
-        \override #'(baseline-skip . 2) \italic \column {
-          \line { a tempo }
-          cantabile
-        }
-      }
-      <g'' g'>8 )
-      ~
-      <g'' g'>8 (
-      <a'' a'>16
-      <f'' f'>16 )
-
-      |
-
-      \afterGrace
-         <f'' f'>8 [ (
-         {
-            e''16 [
-            f''16
-            e''16
-            d''16 ]
-         }
-      <e''! e'>16
-      <f'' f'>16 ] )
-      \once \override TextScript #'padding = #3.8
-      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
-      <a'' a'>16 ) \staccato
-      <bf'' bf'>32  (
-      <b'' b'>32 )
-      <b'' b'>32 (
-      <c''' c''>32 )
-
-      |
-
-      \once \override DynamicLineSpanner #'padding = #2
-      b''32 ( \p \>
-      c'''32
-      d'''32
-      c'''32 ) \!
-      g''8 (
-      ~
-      g''32 [
-      a''64
-      g''64 ) ]
-
-      a''64 ( [
-      g''64 )
-      bf''64 (
-      a''64 ) ]
-
-      bf''64 ( [
-      a''64 )
-      c'''64 (
-      b''64 ) ]
-
-      c'''128 ( [
-      b''128
-      d'''128
-      c'''128
-      f'''64
-      f''64 ) ]
-
-      |
-
-      \afterGrace
-         <f'' f'>8 [ (
-         {
-            e''16 [
-            f''16
-            e''16
-            d''16 ]
-         }
-      <e''! e'>16
-      <f'' f'>16 ] )
-      <g'' g'>16 ( \staccato -\markup { \italic cresc. }
-      <af''! af'!>16 ) \staccato
-      <bf'' bf'>32  (
-      <b'' b'>32 )
-      <b'' b'>32 (
-      <c''' c''>32 )
-   }
-
-   % LH Staff
-   \new Staff {
-      \clef bass
-      \key c \minor
-      \time 2/4
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <a f>32
-      c'32
-      <a f>32
-      c'32
-
-      |
-
-      <bf g>32
-      c'32
-      <bf g>32
-      c'32
-
-      <bf g>32
-      c'32
-      <bf g>32
-      c'32
-
-      <bf g>32
-      c'32
-      <a f>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      |
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-
-      <a f>32
-      c'32
-      <a f>32
-      c'32
-
-      |
-
-      <bf! g>32
-      c'32
-      <bf g>32
-      c'32
-
-      <bf g>32
-      c'32
-      <bf g>32
-      c'32
-
-      <bf g>32
-      c'32
-      <af! f>32
-      c'32
-
-      <g e>32
-      c'32
-      <g e>32
-      c'32
-   }
-
->>
diff --git a/Documentation/snippets/new/screech-boink.ly b/Documentation/snippets/new/screech-boink.ly
deleted file mode 100644
index 699d7f740e..0000000000
--- a/Documentation/snippets/new/screech-boink.ly
+++ /dev/null
@@ -1,70 +0,0 @@
-\version "2.15.32"
-\header {
-  lsrtags = "headwords"
-  texidoc = "Random complex notation"
-  doctitle = "Screech and Boink"
-}
-
-\score {
-  \context PianoStaff <<
-    \new Staff = "up" {
-      \time 4/8
-      \key c \minor
-      <<
-        {
-          \revert Stem #'direction
-          \change Staff = down
-          \set subdivideBeams = ##t
-          g16.[
-          \change Staff = up
-          c'''32
-          \change Staff = down
-          g32
-          \change Staff = up
-          c'''32
-          \change Staff = down
-          g16]
-          \change Staff = up
-          \stemUp
-          \set followVoice = ##t
-          c'''32([ b''16 a''16 gis''16 g''32)]
-        }
-        \\
-        { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] }
-        \\
-        { s4 \autoBeamOff d''8.. f''32  }
-        \\
-        { s4 es''4 }
-      >>
-    }
-    \new Staff = "down" {
-      \clef bass
-      \key c \minor
-      \set subdivideBeams = ##f
-      \override Stem #'french-beaming = ##t
-      \override Beam #'beam-thickness = #0.3
-      \override Stem #'thickness = #4.0
-      g'16[ b16 fis16 g16]
-      <<
-        \makeClusters {
-          as16 <as b> <g b> <g cis>
-        }
-        \\
-        {
-          \override Staff.Arpeggio #'arpeggio-direction = #DOWN
-          <cis, e, gis, b, cis>4\arpeggio
-        }
-      >>
-    }
-  >>
-  \midi {
-    \tempo 8 = 60
-  }
-  \layout {
-    ragged-right = ##t
-    \context {
-      \Staff
-      \consists "Horizontal_bracket_engraver"
-    }
-  }
-}
diff --git a/Documentation/snippets/new/setting-the-double-repeat-default-for-volte.ly b/Documentation/snippets/new/setting-the-double-repeat-default-for-volte.ly
deleted file mode 100644
index 8a751513ae..0000000000
--- a/Documentation/snippets/new/setting-the-double-repeat-default-for-volte.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\version "2.14.0"
-\header {
-  lsrtags = "repeats"
-  texidoc = "There are three different styles of double repeats for
-volte, that can be set using @code{doubleRepeatType}."
-
-  doctitle = "Setting the double repeat default for volte"
-}
-
-
-\relative c'' {
-  \repeat volta 1 { c1 }
-  \set Score.doubleRepeatType = #":|:"
-  \repeat volta 1 { c1 }
-  \set Score.doubleRepeatType = #":|.|:"
-  \repeat volta 1 { c1 }
-  \set Score.doubleRepeatType = #":|.:"
-  \repeat volta 1 { c1 }
-}
diff --git a/Documentation/snippets/new/showing-the-same-articulation-above-and-below-a-note-or-chord.ly b/Documentation/snippets/new/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
deleted file mode 100644
index b1ae4e3864..0000000000
--- a/Documentation/snippets/new/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
-
-  texidoc = "
-By default, LilyPond does not allow the same articulation (e.g., an
-accent, a fermata, a flageolet, etc.) to be displayed above and below a
-note.  For example, @code{c4_\\fermata^\\fermata} will only show a fermata
-below, ignoring the fermata above.  However, one can stick
-scripts (just like fingerings) inside a chord, which means it is
-possible to have as many articulations as desired.  So, the solution is to
-write the note as a chord and add the articulations inside the @code{<@dots{}>}.
-"
-  doctitle = "Showing the same articulation above and below a note or chord"
-}
-
-% The same as \flageolet, just a little smaller
-smallFlageolet =
-#(let ((m (make-articulation "flageolet")))
-   (set! (ly:music-property m 'tweaks)
-         (acons 'font-size -2
-                (ly:music-property m 'tweaks)))
-   m)
-
-\relative c' {
-  s4^"Wrong:"
-  c4_\fermata^\fermata % The second fermata is ignored!
-  <e d'>4^\smallFlageolet_\smallFlageolet
-
-  s4^"Works if written inside a chord:"
-  <e_\smallFlageolet d'^\smallFlageolet>4
-  <e_\flageolet d'^\flageolet>4
-  <e_\smallFlageolet^\smallFlageolet>4
-  <e_\fermata^\fermata>4
-}
diff --git a/Documentation/snippets/new/simultaneous-headword.ly b/Documentation/snippets/new/simultaneous-headword.ly
deleted file mode 100644
index e42121447e..0000000000
--- a/Documentation/snippets/new/simultaneous-headword.ly
+++ /dev/null
@@ -1,314 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% NR 1.5 Simultaneous notes
-
-% L. v. Beethoven, Op. 111
-% Piano sonata 32
-% Movt II - Arietta - Adagio molto semplice e cantabile
-% measures 108 - 118
-
-\layout {
-  \context {
-    \Score
-    \override SpacingSpanner #'base-shortest-duration =
-    #(ly:make-moment 1 18)
-    \override NonMusicalPaperColumn #'line-break-system-details =
-    #'((alignment-distances . (12)))
-  }
-}
-
-trillFlat =
-\once \override TrillSpanner #'(bound-details left text) = \markup {
-  \concat {
-    \musicglyph #"scripts.trill"
-    \translate #'(-0.5 . 1.9)
-    \fontsize #-7
-    \with-dimensions #'(0 . 0) #'(0 . 0)
-    \flat
-  }
-}
-
-\new PianoStaff <<
-
-  % RH
-  \new Staff <<
-    \clef treble
-    \key c \major
-    \time 9/16
-    \set Score.currentBarNumber = #108
-
-    % RH voice 1
-    \new Voice {
-
-      \voiceOne
-      s4.
-      s8.
-
-      |
-
-      s4.
-      a''8 \p \> [ (
-      g''16 ] )
-
-      |
-
-      g''4.
-      af''8 [ (
-      g''16 ] )
-
-      |
-
-      g''8. [
-      g''8.
-      g''8. \pp ]
-
-      |
-
-      g''8. [
-      af''8.
-      af''8. ]
-
-      |
-
-      af''8. [
-      af''8.
-      af''8. ]
-
-      |
-      \break
-
-      \trillFlat
-      af''4. \startTrillSpan
-      ~
-      af''8.
-      ~
-
-      |
-
-      af''4.
-      ~
-      af''8.
-      ~
-
-      |
-
-      \oneVoice
-      <af'' d''>8. [
-      a''8. \p \<
-      bf''8. ]
-      ~
-
-      |
-
-      bf''8. [
-      b''8.
-      c'''8. ]
-      ~
-
-      \bar "||"
-
-      \key ef \major
-      c'''8. [
-      cs'''8. \f ] \stopTrillSpan
-      r8.
-
-    }
-
-    % RH voice 2
-    \new Voice {
-      \voiceTwo
-      \override Voice.TrillSpanner #'direction = #DOWN
-      d''4. \f \startTrillSpan
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''8. \stopTrillSpan
-      \trillFlat
-      d''4. \startTrillSpan
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8. \stopTrillSpan
-      ~
-
-      |
-
-      \trillFlat
-      d''4. \startTrillSpan
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      \once \override NoteColumn #'ignore-collision = ##t
-      \hideNotes
-      d''8. \stopTrillSpan
-      s4.
-
-      |
-
-      s8.
-      s8.
-
-    }
-
-  >>
-
-  % LH staff
-  \new Staff {
-    \clef bass
-    \key c \major
-    \time 9/16
-
-    r8.
-    r8.
-    <c! c,!>8 [ (
-    <g, g,,>16 ] )
-
-    |
-
-    <g, g,,>4.
-    \clef treble
-    c''8 [ (
-    b'16 ] )
-
-    |
-
-    b'4.
-    c''8 [ (
-    b'16 ] )
-
-    |
-
-    b'8. [
-    b'8.
-    b'8. ]
-
-    |
-
-    b'8. [
-    bf'8. ]
-    \clef bass
-    <f f,>8 [ (
-    <bf, bf,,>16 ] )
-
-    |
-
-    <bf, bf,,>4.
-    \clef treble
-    f'8 [ (
-    bf16 ] )
-
-    |
-
-    <<
-
-      \new Voice {
-        \voiceOne
-        \override Voice.TrillSpanner #'direction = #UP
-        f'4. \startTrillSpan
-        ~
-        f'8.
-        ~
-
-        |
-
-        f'4.
-        ~
-        f'8.
-        ~
-
-        |
-
-        f'8. \stopTrillSpan
-      }
-
-      \new Voice {
-        \voiceTwo
-        \override Voice.TrillSpanner #'direction = #DOWN
-        bf8. [
-        bf8.
-        bf8. ]
-
-        |
-
-        bf8. [
-        bf8.
-        bf8. ]
-
-        |
-
-        bf8.
-      }
-
-    >>
-
-    \oneVoice
-    r8.
-    r8.
-
-    |
-
-    r8.
-    r8.
-    r8.
-    \clef bass
-
-    |
-
-    \key ef \major
-    r8.
-    r8.
-    r8.
-
-  }
-
->>
diff --git a/Documentation/snippets/new/slides-in-tablature.ly b/Documentation/snippets/new/slides-in-tablature.ly
deleted file mode 100644
index 7a90e73be2..0000000000
--- a/Documentation/snippets/new/slides-in-tablature.ly
+++ /dev/null
@@ -1,38 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts:
-"
-  doctitle = "Slides in tablature"
-}
-
-slides = {
-  c'8\3(\glissando d'8\3)
-  c'8\3\glissando d'8\3
-  \hideNotes
-  \grace { g16\3\glissando }
-  \unHideNotes
-  c'4\3
-  \afterGrace d'4\3\glissando {
-  \stemDown \hideNotes
-  g16\3 }
-  \unHideNotes
-}
-
-\score {
-  <<
-    \new Staff { \clef "treble_8" \slides }
-    \new TabStaff { \slides }
-  >>
-  \layout {
-    \context {
-      \Score
-      \override Glissando #'minimum-length = #4
-      \override Glissando #'springs-and-rods =
-                          #ly:spanner::set-spacing-rods
-      \override Glissando #'thickness = #2
-    }
-  }
-}
diff --git a/Documentation/snippets/new/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/new/stem-and-beam-behavior-in-tablature.ly
deleted file mode 100644
index e0c249ef15..0000000000
--- a/Documentation/snippets/new/stem-and-beam-behavior-in-tablature.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-The direction of stems is controlled the same way in tablature as in
-traditional notation.  Beams can be made horizontal, as shown in this
-example.
-"
-  doctitle = "Stem and beam behavior in tablature"
-}
-
-\new TabStaff {
-  \relative c {
-    \tabFullNotation
-    g16 b d g b d g b
-    \stemDown
-    \override Beam #'concaveness = #10000
-    g,,16 b d g b d g b
-  }
-}
diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly
deleted file mode 100644
index 968bca7559..0000000000
--- a/Documentation/snippets/new/subdividing-beams.ly
+++ /dev/null
@@ -1,40 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "rhythms"
-
-  texidoc = "
-The beams of consecutive 16th (or shorter) notes are, by default, not
-subdivided.  That is, the three (or more) beams stretch unbroken over
-entire groups of notes.  This behavior can be modified to subdivide
-the beams into sub-groups by setting the property
-@code{subdivideBeams}. When set, multiple beams will be subdivided at
-intervals defined by the current value of @code{baseMoment} by reducing
-the multiple beams to just one beam between the sub-groups. Note that
-@code{baseMoment} defaults to one over the denominator of the current
-time signature if not set explicitly. It must be set to a fraction
-giving the duration of the beam sub-group using the
-@code{ly:make-moment} function, as shown in this snippet. Also, when
-@code{baseMoment} is changed, @code{beatStructure} should also be changed
-to match the new @code{baseMoment}:
-
-"
-  doctitle = "Subdividing beams"
-}
-
-\relative c'' {
-  c32[ c c c c c c c]
-  \set subdivideBeams = ##t
-  c32[ c c c c c c c]
-
-  % Set beam sub-group length to an eighth note
-  \set baseMoment = #(ly:make-moment 1 8)
-  \set beatStructure = #'(2 2 2 2)
-  c32[ c c c c c c c]
-
-  % Set beam sub-group length to a sixteenth note
-  \set baseMoment = #(ly:make-moment 1 16)
-  \set beatStructure = #'(4 4 4 4)
-  c32[ c c c c c c c]
-}
-
diff --git a/Documentation/snippets/new/text-headword.ly b/Documentation/snippets/new/text-headword.ly
deleted file mode 100644
index 9429ca4175..0000000000
--- a/Documentation/snippets/new/text-headword.ly
+++ /dev/null
@@ -1,234 +0,0 @@
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% NR 1.8 Text
-
-% L. v. Beethoven, Op. 110
-% Piano sonata 31
-% measures 1 - 7
-
-\layout {
-  \context {
-    \Score
-    \override SpacingSpanner #'base-shortest-duration =
-    #(ly:make-moment 1 20)
-  }
-}
-
-\new PianoStaff <<
-
-  % RH staff
-  \new Staff {
-    \clef treble
-    \key af \major
-    \time 3/4
-
-    \once \override TextScript #'staff-padding = #4
-    <c'' af'>4. (
-    _ \markup { \dynamic p \italic { con amabilità } }
-    <af' ef'>8 )
-    <af' ef'>8. [
-    <af' ef'>16 ]
-
-    |
-
-    <df'' g'>4
-    <bf' g'>2
-    _ \markup { \italic { ten. } }
-
-    |
-
-    <<
-
-      \new Voice {
-        \voiceOne
-        ef''4. (
-        df''8 [ )
-        ef'' (
-        f'' ) ]
-
-        |
-
-        \once \override TextScript #'staff-padding = #4
-        ef''8. (
-        _ \markup { \italic { tranqu. } }
-        d''16 )
-        df''8 \trill \fermata
-        _ \markup { \italic { ten. } }
-      }
-
-      \new Voice {
-        \voiceTwo
-        af'4.
-        af'8 [
-        af'8
-        af'8 ]
-
-        |
-
-        g'4
-        g'8
-      }
-
-    >>
-
-    \oneVoice
-    \once \override TextScript #'staff-padding = #4
-    df''32
-    _ \markup { \italic dolce }
-    c''32
-    df''32
-    ef''32
-    \acciaccatura { df''[ ef'' ] }
-    f''8
-    ef''16
-    df''16
-
-    |
-    \break
-    \overrideProperty "Score.NonMusicalPaperColumn"
-    #'line-break-system-details #'((alignment-distances . (12)))
-
-    c''4. (
-    ^ \markup \italic { cantabile, con intimissimo sentimento,
-      ma sempre molto dolce e semplice }
-    ef''4
-    af''8 )
-
-    |
-
-    af''4 (
-    g''2 )
-
-    |
-
-    bf''4. (
-    g''4
-    ef''8 )
-
-    |
-  }
-
-  % LH
-  \new Staff {
-    \clef bass
-    \key af \major
-    \time 3/4
-
-    <ef af,>4. (
-    <ef c>8 )
-    <ef c>8. [
-    <ef c>16 ]
-
-    |
-
-    <ef bf,>4
-    <ef df>2 ^ \markup { \italic ten. }
-
-    |
-
-    <<
-
-      \new Voice {
-        \voiceOne
-        ef8 [ (
-        af8
-        c'8
-        bf8 )
-        c'8 ( \staccato
-        df'8 ]  ) \staccato
-
-        |
-
-        bf4
-        bf8 ^ \markup { \italic ten. }
-      }
-
-      \new Voice {
-        \voiceTwo
-        c4. (
-        f8 [ )
-        ef8 ( \staccato
-        df8 ] ) \staccato
-
-        |
-
-        ef4
-        ef8 \fermata
-      }
-
-    >>
-
-    \oneVoice
-    r8
-    r4
-    \clef treble
-
-    |
-
-    \override Staff.SustainPedalLineSpanner #'outside-staff-priority = #1000
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #7
-    \once \override TextScript #'padding = #2
-    af16 \sustainOn
-    ^ \markup \italic { non staccato }
-    _ \markup \italic { molto \concat { \dynamic { p } , } sempre tranquillo
-      ed egualmente, non rubato }
-    <ef' c'>16
-    <ef' c'>16
-    <ef' c'>16
-    af16
-    <ef' c'>16
-    <ef' c'>16
-    <ef' c'>16
-    af16 \sustainOn
-    <ef' c'>16
-    <ef' c'>16
-    <ef' c'>16
-
-    |
-
-    bf16 \sustainOn
-    <ef' df'>16
-    <ef' df'>16
-    <ef' df'>16
-    bf16 \sustainOn
-    <ef' df'>16
-    <ef' df'>16
-    <ef' df'>16
-    bf16
-    <ef' df'>16
-    <ef' df'>16
-    <ef' df'>16
-
-    |
-
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #4
-    df'16 \sustainOn
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-    df'16
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-    df'16 \sustainOn
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-    <bf' g' ef'>16
-
-    |
-  }
-
->>
diff --git a/Documentation/snippets/new/unfretted-headword.ly b/Documentation/snippets/new/unfretted-headword.ly
deleted file mode 100644
index b4d2729c1d..0000000000
--- a/Documentation/snippets/new/unfretted-headword.ly
+++ /dev/null
@@ -1,230 +0,0 @@
-% #!lilypond lcp-extract.ly -*- coding: utf-8; -*-
-
-%%%
-%%% les-cinq-pieds:
-%%% extract for the lilypond documentaton project
-%%%
-
-%% Title:	Les cinq pieds
-%% Composer: 	David Séverin
-%% Date:	Juillet 2007
-%% Instrument:	Violon Solo
-%% Dedication:	A mon épouse Lívia De Souza Vidal
-%% Additional:	avec l'aide de Krzysztof Wagenaar
-
-%% Statement:
-
-%% Here by, I, the composer, agree that this extract of my composition
-%% be in the public domain and can be part of, used and presented in
-%% the LilyPond Documention Project.
-
-%% Statement Date: Octber the 9th, 2008
-
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-
-\version "2.14.0"
-#(set-global-staff-size 15)
-
-%%%
-%%% Abreviations
-%%%
-
-db         = \markup { \musicglyph #"scripts.downbow" }
-dub        = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" } }
-dubetc     = \markup { \line { \musicglyph #"scripts.downbow" " " \musicglyph #"scripts.upbow" "..." } }
-
-ub         = \markup { \musicglyph #"scripts.upbow" }
-udb        = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" } }
-udbetc     = \markup { \line { \musicglyph #"scripts.upbow" " " \musicglyph #"scripts.downbow" "..." } }
-
-fermaTa    = \markup \musicglyph #"scripts.ufermata"
-
-accel   = \markup \tiny \italic \bold "accel..."
-ritar   = \markup \tiny \italic \bold "ritar..."
-
-ignore     = \override NoteColumn #'ignore-collision = ##t
-
-
-%%
-%% Strings
-%%
-
-svib           = \markup \small "s. vib."
-pvib           = \markup \small "p. vib."
-mvib           = \markup \small "m. vib."
-sulp           = \markup \small "s.p."
-norm           = \markup \small "n."
-
-quatre         = \markup \teeny "IV"
-
-
-%%
-%% Shifting Notes
-%%
-
-shift      = \once \override NoteColumn #'force-hshift = #0.9
-shifta     = \once \override NoteColumn #'force-hshift = #1.2
-shiftb     = \once \override NoteColumn #'force-hshift = #1.4
-
-
-%%
-%% Hairpin
-%%
-
-% aniente        = "a niente"
-aniente        = \once \override Hairpin #'circled-tip = ##t
-
-
-%%
-%% Tuplets
-%%
-
-tupletbp       = \once \override Staff.TupletBracket #'padding = #2.25
-
-
-%%
-%% Flag [Note Head - Stem]
-%%
-
-noflag         = \once \override Flag #'style = #'no-flag
-
-%%%
-%%% Functions
-%%%
-
-#(define-markup-command (colmark layout props args)
-  (markup-list?)
-  (let ((entries (cons (list '(baseline-skip . 2.3)) props)
-       ))
-   (interpret-markup layout entries
-    (make-column-markup
-     (map (lambda (arg)
-	   (markup arg))
-      (reverse args))))))
-
-
-%%%
-%%% Instruments
-%%%
-
-ViolinSolo = \relative c' {
-
-  \voiceOne
-
-  \set Score.markFormatter     =  #format-mark-box-numbers
-  \override Score.VoltaBracket #'font-name                  = #"sans"
-  \override Score.VoltaBracket #'extra-offset               = #'(0 . 1)
-  \override SpacingSpanner     #'uniform-stretching         = ##t
-
-
-  %% Measure 1
-  \time 25/8
-  \mark \default
-  r2 ^\markup \colmark { \italic "fatigué" " " \bold "lentement"} r4 r r8
-  <<
-    { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \svib } \shifta e1 } \\
-    { d2 \open \mf \< ~ \aniente d1  \! \> r4 r ^\markup \colmark { " " \fermaTa } \! }
-  >>
-
-
-  %% Measure 2
-  \time 7/4
-  \set Score.repeatCommands = #'((volta "1) n.      2) s.p."))
-  <<
-    { \shift d2 \glissando ^\markup \colmark { \quatre \udbetc } \shifta e1 } \\
-    { d2 \open \mf \< ~ d1 \! \> ~ d4 ^\markup \colmark { " " \fermaTa } \! }
-  >>
-  \set Score.repeatCommands = #'((volta #f))
-
-
-  %% Measure 3
-  \time 15/4
-  <<
-    { \shift d2 \glissando ^\markup \colmark { \quatre \dubetc \pvib \norm } \shifta e1 \glissando d2 } \\
-    { d2 \open \mf \< ~ d1 ~ d2 \ff  ~ d1 \> ~ d2 ^\markup \colmark { " " " " \svib } ~ d4 \pp}
-  >>
-  \break
-
-  %% Measure 4
-  \time 4/4
-  \stemUp
-  \tupletDown
-  \times 2/3 { d4 ^\markup \colmark { \quatre \db \accel } d d }
-  \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d }
-
-
-
-  %% Measure 5
-  \time 5/4
-  \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d }
-  \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db \sulp } d _\open d }
-  \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d }
-  d2 \ff ^\markup \colmark { " " \pvib } \>
-
-
-  %% Measure 6
-  \time 5/8
-  \once \override Beam #'grow-direction = #RIGHT  % \featherDurations #(ly:make-moment 2 3)
-  { d16 \staccato
-    [ d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato]
-  }
-  \break
-
-
-  %% Measure 7
-  \time 7/4
-  \tupletbp \times 2/3 { d16 ^\markup \colmark { \quatre } d _\open d d d _\open d }
-  \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db } d _\open d }
-  \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db " " \sulp } d _\open d }
-  \times 2/3 { d4 ^\markup \colmark { \quatre \db \ritar \norm } d d }
-  \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d \ppp ~ }
-
-
-  %% Measure 8
-  d4 ^\markup \colmark { " " " " \pvib \norm }
-  deh2 d dih \<
-
-
-  %% Measure 9
-  <<
-    { \shift d2 \glissando ^\markup \colmark { \quatre } \shifta e1 } \\
-    { d2 \open ~ d1  ^\markup \colmark { " " " " \mvib } }
-  >>
-  \breathe r4 \!
-
-}
-
-
-%%%
-%%% Score
-%%%
-
-\score {
-
-  <<
-    \relative <<
-      \new Staff \ViolinSolo
-    >>
-
-    \override Score.Rest #'transparent = ##t
-    \set Score.defaultBarType          = "empty"
-  >>
-
-  \layout  {
-    indent       = 0.0
-    \context {
-      \Staff
-      \remove "Time_signature_engraver"
-    }
-    \context {
-      \Score
-      \remove "Bar_number_engraver"
-    }
-  }
-}
diff --git a/Documentation/snippets/new/using-ly-grob-object-to-access-grobs-with--tweak.ly b/Documentation/snippets/new/using-ly-grob-object-to-access-grobs-with--tweak.ly
deleted file mode 100644
index eed7462b43..0000000000
--- a/Documentation/snippets/new/using-ly-grob-object-to-access-grobs-with--tweak.ly
+++ /dev/null
@@ -1,75 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "tweaks-and-overrides"
-
-  texidoc = "
-Some grobs can be accessed @qq{laterally} from within another grob's
-callback.  These are usually listed as @qq{layout objects} in the
-@qq{Internal properties} section of a grob-interface.  The function
-@code{ly:grob-object} is used to access these grobs.
-
-
-Demonstrated below are some ways of accessing grobs from within a
-NoteHead callback, but the technique is not limited to NoteHeads.
-However, the NoteHead callback is particularly important, since it is
-the implicit callback used by the @code{\\tweak} command.
-
-
-The example function defined below (\"display-grobs\") is probably not
-that useful, but it demonstrates that the grobs are indeed being
-accessed.
-
-
-Example console output:
-
-
-@example
---------------------
-#-Grob Accidental -
-#-Grob Arpeggio -
-#-Grob Stem -
-@end example
-
-
-"
-  doctitle = "Using ly:grob-object to access grobs with \\tweak"
-}
-
-#(define (notehead-get-accidental notehead)
-   ;; notehead is grob
-   (ly:grob-object notehead 'accidental-grob))
-
-#(define (notehead-get-arpeggio notehead)
-   ;; notehead is grob
-   (let ((notecolumn (notehead-get-notecolumn notehead)))
-     (ly:grob-object notecolumn 'arpeggio)))
-
-#(define (notehead-get-notecolumn notehead)
-   ;; notehead is grob
-   (ly:grob-parent notehead X))
-
-#(define (notehead-get-stem notehead)
-   ;; notehead is grob
-   (let ((notecolumn (notehead-get-notecolumn notehead)))
-     (ly:grob-object notecolumn 'stem)))
-
-#(define (display-grobs notehead)
-   ;; notehead is grob
-   (let ((accidental (notehead-get-accidental notehead))
-         (arpeggio (notehead-get-arpeggio notehead))
-         (stem (notehead-get-stem notehead)))
-     (format #t "~2&~a\n" (make-string 20 #\-))
-     (for-each
-      (lambda (x) (format #t "~a\n" x))
-      (list accidental arpeggio stem))))
-
-\relative c' {
-  %% display grobs for each note head:
-  %\override NoteHead #'before-line-breaking = #display-grobs
-  <c
-  %% or just for one:
-  \tweak #'before-line-breaking #display-grobs
-  es
-  g>1\arpeggio
-}
diff --git a/Documentation/snippets/new/using-the-whiteout-property.ly b/Documentation/snippets/new/using-the-whiteout-property.ly
deleted file mode 100644
index 9464915492..0000000000
--- a/Documentation/snippets/new/using-the-whiteout-property.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "expressive-marks, editorial-annotations"
-  texidoc = "
-Any graphical object can be printed over a white background to
-mask parts of objects that lie beneath.  This can be useful to
-improve the appearance of collisions in complex situations when
-repositioning objects is impractical.  It is necessary to explicitly
-set the @code{layer} property to control which objects are masked
-by the white background.
-
-In this example the collision of the tie with the time signature is
-improved by masking out the part of the tie that crosses the time
-signature by setting the @code{whiteout} property of @code{TimeSignature}.
-To do this @code{TimeSignature} is moved to a layer above @code{Tie}, which
-is left in the default layer of 1, and @code{StaffSymbol} is moved to a
-layer above @code{TimeSignature} so it is not masked.
-"
-  doctitle = "Using the whiteout property"
-}
-
-{
-  \override Score.StaffSymbol #'layer = #4
-  \override Staff.TimeSignature #'layer = #3
-  b'2 b'~
-  \once \override Staff.TimeSignature #'whiteout = ##t
-  \time 3/4
-  b' r4
-}
diff --git a/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly
deleted file mode 100644
index 7c99b53f18..0000000000
--- a/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ /dev/null
@@ -1,101 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "vocal-music, keyboards, template"
-
-  texidoc = "
-This template adds an automatic piano reduction to the standard SATB
-vocal score demonstrated in @qq{Vocal ensemble template}. This
-demonstrates one of the strengths of LilyPond – you can use a music
-definition more than once. If any changes are made to the vocal notes
-(say, @code{tenorMusic}), then the changes will also apply to the piano
-reduction.
-"
-  doctitle = "Vocal ensemble template with automatic piano reduction"
-}
-
-\paper {
-  top-system-spacing #'basic-distance = #10
-  score-system-spacing #'basic-distance = #20
-  system-system-spacing #'basic-distance = #20
-  last-bottom-spacing #'basic-distance = #10
-}
-
-global = {
-  \key c \major
-  \time 4/4
-}
-
-sopMusic = \relative c'' {
-  c4 c c8[( b)] c4
-}
-sopWords = \lyricmode {
-  hi hi hi hi
-}
-
-altoMusic = \relative c' {
-  e4 f d e
-}
-altoWords =\lyricmode {
-  ha ha ha ha
-}
-
-tenorMusic = \relative c' {
-  g4 a f g
-}
-tenorWords = \lyricmode {
-  hu hu hu hu
-}
-
-bassMusic = \relative c {
-  c4 c g c
-}
-bassWords = \lyricmode {
-  ho ho ho ho
-}
-
-\score {
-  <<
-    \new ChoirStaff <<
-      \new Lyrics = "sopranos" \with {
-        % This is needed for lyrics above a staff
-        \override VerticalAxisGroup #'staff-affinity = #DOWN
-      }
-      \new Staff = "women" <<
-        \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> }
-        \new Voice = "altos" { \voiceTwo << \global \altoMusic >> }
-      >>
-      \new Lyrics = "altos"
-      \new Lyrics = "tenors" \with {
-        % This is needed for lyrics above a staff
-        \override VerticalAxisGroup #'staff-affinity = #DOWN
-      }
-
-      \new Staff = "men" <<
-        \clef bass
-        \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> }
-        \new Voice = "basses" { \voiceTwo << \global \bassMusic >> }
-      >>
-      \new Lyrics = "basses"
-      \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
-      \context Lyrics = "altos" \lyricsto "altos" \altoWords
-      \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
-      \context Lyrics = "basses" \lyricsto "basses" \bassWords
-    >>
-    \new PianoStaff <<
-      \new Staff <<
-        \set Staff.printPartCombineTexts = ##f
-        \partcombine
-        << \global \sopMusic >>
-        << \global \altoMusic >>
-      >>
-      \new Staff <<
-        \clef bass
-        \set Staff.printPartCombineTexts = ##f
-        \partcombine
-        << \global \tenorMusic >>
-        << \global \bassMusic >>
-      >>
-    >>
-  >>
-}
diff --git a/Documentation/snippets/new/vocal-ensemble-template-with-verse-and-refrain.ly b/Documentation/snippets/new/vocal-ensemble-template-with-verse-and-refrain.ly
deleted file mode 100644
index 17a901c06e..0000000000
--- a/Documentation/snippets/new/vocal-ensemble-template-with-verse-and-refrain.ly
+++ /dev/null
@@ -1,99 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "vocal-music, contexts-and-engravers, template"
-  texidoc = "
-This template creates a score which starts with a solo verse and
-continues into a refrain for two voices.  It also demonstrates the
-use of spacer rests within the @code{\global} variable to define
-meter changes (and other elements common to all parts) throughout
-the entire score.
-"
-  doctitle = "Vocal ensemble template with verse and refrain"
-}
-
-global = {
-  \key g \major
-
-  % verse
-  \time 3/4
-  s2.*2
-  \break
-
-  % refrain
-  \time 2/4
-  s2*2
-  \bar "|."
-}
-
-SoloNotes = \relative g' {
-  \clef "treble"
-
-  % verse
-  g4 g g |
-  b4 b b |
-
-  % refrain
-  R2*2 |
-}
-
-SoloLyrics = \lyricmode {
-  One two three |
-  four five six |
-}
-
-SopranoNotes = \relative c'' {
-  \clef "treble"
-
-  % verse
-  R2.*2 |
-
-  % refrain
-  c4 c |
-  g4 g |
-}
-
-SopranoLyrics = \lyricmode {
-  la la |
-  la la |
-}
-
-BassNotes = \relative c {
-  \clef "bass"
-
-  % verse
-  R2.*2 |
-
-  % refrain
-  c4 e |
-  d4 d |
-}
-
-BassLyrics = \lyricmode {
-  dum dum |
-  dum dum |
-}
-
-\score {
-  <<
-    \new Voice = "SoloVoice" << \global \SoloNotes >>
-    \new Lyrics \lyricsto "SoloVoice" \SoloLyrics
-
-    \new ChoirStaff <<
-      \new Voice = "SopranoVoice" << \global \SopranoNotes >>
-      \new Lyrics \lyricsto "SopranoVoice" \SopranoLyrics
-
-      \new Voice = "BassVoice" << \global \BassNotes >>
-      \new Lyrics \lyricsto "BassVoice" \BassLyrics
-    >>
-  >>
-  \layout {
-    ragged-right = ##t
-    \context { \Staff
-      % these lines prevent empty staves from being printed
-      \RemoveEmptyStaves
-      \override VerticalAxisGroup #'remove-first = ##t
-    }
-  }
-}
-
diff --git a/Documentation/snippets/new/vocal-ensemble-template.ly b/Documentation/snippets/new/vocal-ensemble-template.ly
deleted file mode 100644
index da5498872f..0000000000
--- a/Documentation/snippets/new/vocal-ensemble-template.ly
+++ /dev/null
@@ -1,94 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags = "vocal-music, template"
-
-  texidoc = "
-Here is a standard four-part SATB vocal score. With larger ensembles,
-it is often useful to include a section which is included in all parts.
-For example, the time signature and key signature are almost always the
-same for all parts. Like in the @qq{Hymn} template, the four voices are
-regrouped on only two staves.
-"
-  doctitle = "Vocal ensemble template"
-}
-
-\paper {
-  top-system-spacing #'basic-distance = #10
-  score-system-spacing #'basic-distance = #20
-  system-system-spacing #'basic-distance = #20
-  last-bottom-spacing #'basic-distance = #10
-}
-
-global = {
-  \key c \major
-  \time 4/4
-}
-
-sopMusic = \relative c'' {
-  c4 c c8[( b)] c4
-}
-sopWords = \lyricmode {
-  hi hi hi hi
-}
-
-altoMusic = \relative c' {
-  e4 f d e
-}
-altoWords = \lyricmode {
-  ha ha ha ha
-}
-
-tenorMusic = \relative c' {
-  g4 a f g
-}
-tenorWords = \lyricmode {
-  hu hu hu hu
-}
-
-bassMusic = \relative c {
-  c4 c g c
-}
-bassWords = \lyricmode {
-  ho ho ho ho
-}
-
-\score {
-  \new ChoirStaff <<
-    \new Lyrics = "sopranos" \with {
-      % this is needed for lyrics above a staff
-      \override VerticalAxisGroup #'staff-affinity = #DOWN
-    }
-    \new Staff = "women" <<
-      \new Voice = "sopranos" {
-        \voiceOne
-        << \global \sopMusic >>
-      }
-      \new Voice = "altos" {
-        \voiceTwo
-        << \global \altoMusic >>
-      }
-    >>
-    \new Lyrics = "altos"
-    \new Lyrics = "tenors" \with {
-      % this is needed for lyrics above a staff
-      \override VerticalAxisGroup #'staff-affinity = #DOWN
-    }
-    \new Staff = "men" <<
-      \clef bass
-      \new Voice = "tenors" {
-        \voiceOne
-        << \global \tenorMusic >>
-      }
-      \new Voice = "basses" {
-        \voiceTwo << \global \bassMusic >>
-      }
-    >>
-    \new Lyrics = "basses"
-    \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
-    \context Lyrics = "altos" \lyricsto "altos" \altoWords
-    \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
-    \context Lyrics = "basses" \lyricsto "basses" \bassWords
-  >>
-}
-
diff --git a/Documentation/snippets/new/vocal-headword.ly b/Documentation/snippets/new/vocal-headword.ly
deleted file mode 100644
index 0ad4130de5..0000000000
--- a/Documentation/snippets/new/vocal-headword.ly
+++ /dev/null
@@ -1,73 +0,0 @@
-\version "2.14.0"
-
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-\layout {
-  \context {
-    \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
-}
-
-% L. van Beethoven. Symphony No. 9 in D minor, op.125; Finale
-% mm. 216 -- 236
-% Text: F. von Schiller
-
-\score {
-  \new Staff \relative c' {
-    \set Score.currentBarNumber = 216
-    \bar ""  % make first bar number be shown
-    \clef bass \key d \minor \time 3/4
-    % \tempo "Presto"
-    % \compressFullBarRests  R2.*8
-    \tempo "Recitativo"
-    \autoBeamOff
-    r4^\markup { \small Baritono } r a
-    \appoggiatura a8 e'2. ~
-    e4 d8[ cis d e]
-    e4 g, r8 g
-    bes2 a8 e
-    g4 f r
-    R2.*2
-    gis2 gis4
-    r4 d'4. b8
-    b4 gis8([ a b cis]
-    e8[ d cis d)] b([ gis)]
-    e8 d d4 fis8([ e)]
-    d4 cis r
-    \key d \major
-    r4 r a'
-    d4.( e8[ fis e)]
-    e([ d)] d([ cis d a)]
-    g8([ fis)] fis([ e d c)]
-    c8([ b)] g'2~
-    \once \override Script #'outside-staff-priority = #1 % put fermata closer to staff
-    g4.\fermata ^\markup { \small \italic "ad libitum" } e8[ cis!] d
-    d8 a a4 r \bar "||"
-
-    % \time 4/4 \tempo "Allegro assai"
-    % R1
-    % e''4^\f d r2
-    % R1
-    % e4( ^\f d2) a8([ g)]
-  }
-  \addlyrics {
-    O Freun -- _ _ de, nicht die -- _ se Tö -- ne!
-    Son -- dern laßt uns an -- _ ge -- neh -- me -- re an -- stim -- men,
-    und freu -- _ _ _ _ _ _ _ den -- vol -- le -- re!
-    % Freu -- de, Freu -- de,__
-  }
-}
-
diff --git a/Documentation/snippets/new/wind-headword.ly b/Documentation/snippets/new/wind-headword.ly
deleted file mode 100644
index cadbc37601..0000000000
--- a/Documentation/snippets/new/wind-headword.ly
+++ /dev/null
@@ -1,52 +0,0 @@
-\version "2.14.0"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 2.whatever  Wind
-
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-% Tchaikovsky
-% Nutcracker Suite, VII Dance of the Merlitons
-\score {
-  \new StaffGroup <<
-    \new Staff \relative c'' {
-      \set Staff.instrumentName = "Flauto I,II"
-      \once \override Score.RehearsalMark #'self-alignment-X = #-1
-      \once \override Score.RehearsalMark #'break-align-symbols =
-#'(time-signature)
-      \once \override Score.TimeSignature
-#'break-align-anchor-alignment = #LEFT
-      \once \override Score.RehearsalMark #'padding = #4
-      \mark \markup \large \bold {Moderato assai}
-      \key d \major
-      \time 2/4
-      \compressFullBarRests
-      R2*2
-      <d a>16-.\p <cis g>-. <d a>-. <cis g>-. <d a>8-. <cis g>-.
-      <e a,>-.\< <d a>32( <fis d> <a fis> <d a> <fis d>4--)\mf
-      <g d>16-. <fis cis>-. <g d>-. <fis cis>-.
-        <e b>(\> <d a>) <a fis>-. <fis d>-.\!
-      <d bes>4--\sf \acciaccatura {<d' bes>8} <cis a>4--\mf
-    }
-    \new Staff \relative c' {
-      \set Staff.instrumentName = "Flauto III"
-      \key d \major
-      \time 2/4
-      \compressFullBarRests
-      R2*2_\markup{Gr.Fl.}
-      fis16-.\p e-. fis-. e-. fis8-. e-.
-      g8-.\< fis32( a d fis a4--)\mf
-      b16-. a-. b-. a-. g(\> fis) d-. a-.\!
-      g4--\sf \acciaccatura fis'8 g4--\mf
-    }
-  >>
-}
-
diff --git a/Documentation/snippets/new/woodwind-diagrams-listing.ly b/Documentation/snippets/new/woodwind-diagrams-listing.ly
deleted file mode 100644
index b18121fbf1..0000000000
--- a/Documentation/snippets/new/woodwind-diagrams-listing.ly
+++ /dev/null
@@ -1,95 +0,0 @@
-\version "2.14.0"
-
-\header {
-  lsrtags="winds"
-  texidoc="
-The following music shows all of the woodwind diagrams currently
-defined in LilyPond.
-"
-  doctitle = "Woodwind diagrams listing"
-
-}
-
-\relative c' {
-  \textLengthOn
-  c1^
-  \markup {
-    \center-column {
-      'piccolo
-      " "
-       \woodwind-diagram
-                  #'piccolo
-                  #'()
-    }
-  }
-
-  c1^
-  \markup {
-    \center-column {
-       'flute
-       " "
-       \woodwind-diagram
-          #'flute
-          #'()
-    }
-  }
-  c1^\markup {
-    \center-column {
-      'oboe
-      " "
-      \woodwind-diagram
-        #'oboe
-        #'()
-    }
-  }
-
-  c1^\markup {
-    \center-column {
-      'clarinet
-      " "
-      \woodwind-diagram
-        #'clarinet
-        #'()
-    }
-  }
-
-  c1^\markup {
-    \center-column {
-      'bass-clarinet
-      " "
-      \woodwind-diagram
-        #'bass-clarinet
-        #'()
-    }
-  }
-
-  c1^\markup {
-    \center-column {
-      'saxophone
-      " "
-      \woodwind-diagram
-        #'saxophone
-        #'()
-    }
-  }
-
-  c1^\markup {
-    \center-column {
-      'bassoon
-      " "
-      \woodwind-diagram
-        #'bassoon
-        #'()
-    }
-  }
-
-  c1^\markup {
-    \center-column {
-      'contrabassoon
-      " "
-      \woodwind-diagram
-        #'contrabassoon
-        #'()
-    }
-  }
-}
diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
index fe0eadc569..6ac85b2527 100644
--- a/Documentation/snippets/non-default-tuplet-numbers.ly
+++ b/Documentation/snippets/non-default-tuplet-numbers.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 LilyPond también proporciona funciones de formato para imprimir
@@ -39,17 +40,15 @@ au chiffre.
 "
   doctitlefr = "Nolets au chiffrage inhabituel"
 
-  lsrtags = "rhythms"
-
   texidoc = "
-LilyPond also provides formatting functions to print tuplet numbers different
-than the actual fraction, as well as to append a note value to the tuplet
-number or tuplet fraction.
+LilyPond also provides formatting functions to print tuplet numbers
+different than the actual fraction, as well as to append a note value
+to the tuplet number or tuplet fraction.
+
 "
   doctitle = "Non-default tuplet numbers"
 } % begin verbatim
 
-
 \relative c'' {
   \once \override TupletNumber #'text =
     #(tuplet-number::non-default-tuplet-denominator-text 7)
diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly
index 1c6b5c0f37..270d1ce684 100644
--- a/Documentation/snippets/non-traditional-key-signatures.ly
+++ b/Documentation/snippets/non-traditional-key-signatures.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "version-specific, really-cool, pitches, contemporary-notation, staff-notation"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   doctitlees = "Armaduras de tonalidad no tradicionales"
   texidoces = "
@@ -114,27 +115,34 @@ Voici, par exemple, comment générer une gamme par ton :
   doctitlefr = "Armures inhabituelles"
 
 
-  lsrtags = "pitches, staff-notation"
   texidoc = "
 The commonly used @code{\\key} command sets the @code{keySignature}
 property, in the @code{Staff} context.
 
-To create non-standard key signatures, set this property directly.  The
+To create non-standard key signatures, set this property directly. The
 format of this command is a list:
 
-@code{\\set Staff.keySignature = #`(((octave . step) . alter) ((octave
-. step) . alter) ...)} where, for each element in the list,
-@code{octave} specifies the octave (0@tie{}being the octave from
-middle@tie{}C to the B above), @code{step} specifies the note within the
-octave (0@tie{}means@tie{}C and 6@tie{}means@tie{}B), and @code{alter} is
-@code{,SHARP ,FLAT ,DOUBLE-SHARP} etc.  (Note the leading comma.)
+@code{ \\set Staff.keySignature = #`(((octave . step) . alter) ((octave
+. step) . alter) ...) } where, for each element in the list,
+@code{octave} specifies the octave (0 being the octave from middle C to
+the B above), @code{step} specifies the note within the octave (0 means
+C and 6 means B), and @code{alter} is @code{,SHARP ,FLAT ,DOUBLE-SHARP}
+etc. (Note the leading comma.) The accidentals in the key signature
+will appear in the reverse order to that in which they are specified.
+
 
 Alternatively, for each item in the list, using the more concise format
-@code{(step . alter)} specifies that the same alteration should hold in all
-octaves.
+@code{(step . alter)} specifies that the same alteration should hold in
+all octaves.
+
+
+For microtonal scales where a @qq{sharp} is not 100 cents, @code{alter}
+refers to the alteration as a proportion of a 200-cent whole tone.
+
+
+Here is an example of a possible key signature for generating a
+whole-tone scale:
 
-Here is an example of a possible key signature for generating a whole-tone
-scale:
 "
   doctitle = "Non-traditional key signatures"
 } % begin verbatim
diff --git a/Documentation/snippets/new/lyrics-old-spacing-settings.ly b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
similarity index 75%
rename from Documentation/snippets/new/lyrics-old-spacing-settings.ly
rename to Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
index 5e51f6d0df..e83b1f7753 100644
--- a/Documentation/snippets/new/lyrics-old-spacing-settings.ly
+++ b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
@@ -1,17 +1,23 @@
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
   lsrtags = "vocal-music"
 
-  doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
-
   texidoc = "
-The vertical spacing engine changed for version 2.14.  This can
-cause lyrics to be spaced differently.  It is possible to set
-properties for @code{Lyric} and @code{Staff} contexts to get the
-spacing engine to behave as it did in version 2.12.
+The vertical spacing engine changed for version 2.14.  This can cause
+lyrics to be spaced differently.  It is possible to set properties for
+@code{Lyric} and @code{Staff} contexts to get the spacing engine to
+behave as it did in version 2.12.
+
 "
-}
+  doctitle = "Obtaining 2.12 lyrics spacing in newer versions"
+} % begin verbatim
 
 global = {
   \key d \major
@@ -93,4 +99,3 @@ words = \lyricmode {
     }
   }
 }
-
diff --git a/Documentation/snippets/open-string-harmonics-in-tablature.ly b/Documentation/snippets/open-string-harmonics-in-tablature.ly
index 8888bcf4de..67fd7158b1 100644
--- a/Documentation/snippets/open-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/open-string-harmonics-in-tablature.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Referencia para armónicos sobre cuerdas al aire (armónicos naturales):
@@ -30,14 +31,13 @@ Table des harmoniques sur corde à vide (harmoniques naturelles) :
 
 
 
-  lsrtags = "fretted-strings"
   texidoc = "
-Reference for open-string harmonics:
+This snippet demonstrates open-string harmonics
+
 "
-  doctitle = "Reference for open-string harmonics"
+  doctitle = "Open string harmonics in tablature"
 } % begin verbatim
 
-
 openStringHarmonics = {
   %first harmonic
   \harmonicByFret #12 e,2\6_\markup{"1st harm."}
diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index 94a2601cbc..b8ce6908be 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, staff-notation, vocal-music, template"
+  lsrtags = "template, vocal-music, pitches, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -68,6 +68,7 @@ music for transposing instruments at concert pitch.
   doctitle = "Orchestra choir and piano template"
 } % begin verbatim
 
+
 #(set-global-staff-size 17)
 \paper {
   indent = 3.0\cm  % space for instrumentName
diff --git a/Documentation/snippets/ottava-text.ly b/Documentation/snippets/ottava-text.ly
index 0e79ec24c1..ef6e05fb6a 100644
--- a/Documentation/snippets/ottava-text.ly
+++ b/Documentation/snippets/ottava-text.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches, text"
+  lsrtags = "text, pitches"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -67,6 +67,7 @@ override the text of the bracket, set @code{ottavation} after invoking
   doctitle = "Ottava text"
 } % begin verbatim
 
+
 {
   \ottava #1
   \set Staff.ottavation = #"8"
diff --git a/Documentation/snippets/outputting-the-version-number.ly b/Documentation/snippets/outputting-the-version-number.ly
index aef2e51349..714bc1a438 100644
--- a/Documentation/snippets/outputting-the-version-number.ly
+++ b/Documentation/snippets/outputting-the-version-number.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, titles"
+  lsrtags = "text, really-simple, titles, scheme-language"
 
   texidoc = "
 By putting the output of
@@ -20,6 +20,7 @@ By putting the output of
   doctitle = "Outputting the version number"
 } % begin verbatim
 
+
 \score {
   \new Lyrics {
     \override Score.RehearsalMark #'self-alignment-X = #LEFT
diff --git a/Documentation/snippets/page-label.ly b/Documentation/snippets/page-label.ly
index 35533e7259..6a975eba66 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "spacing"
@@ -17,6 +17,7 @@ in markups.
   doctitle = "Page label"
 } % begin verbatim
 
+
 #(set-default-paper-size "a6")
 
 #(define-markup-command (toc-line layout props label text)
diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly
index fb3f88f340..d80d9abd2d 100644
--- a/Documentation/snippets/partcombine-and-autobeamoff.ly
+++ b/Documentation/snippets/partcombine-and-autobeamoff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -47,6 +47,7 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}.
 
 "
   doctitlees = "Partcombine y autoBeamOff"
+
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
@@ -78,6 +79,7 @@ wenn man es mit @code{\\partcombine} verwendet, muss @code{\\autoBeamOff}
 "
 doctitlede = "Partcombine und autoBeamOff"
 
+
 %% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 La fonction @code{\\autoBeamOff} dans le cadre d'un
@@ -145,6 +147,7 @@ with @code{\\partcombine}, it will be necessary to use three calls to
   doctitle = "Partcombine and autoBeamOff"
 } % begin verbatim
 
+
 {
   %\set Staff.autoBeaming = ##f % turns off all autobeaming
   \partcombine
diff --git a/Documentation/snippets/percent-repeat-count-visibility.ly b/Documentation/snippets/percent-repeat-count-visibility.ly
index a18c027a24..7d22d86889 100644
--- a/Documentation/snippets/percent-repeat-count-visibility.ly
+++ b/Documentation/snippets/percent-repeat-count-visibility.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
@@ -43,6 +43,7 @@ the context property @code{repeatCountVisibility}.
   doctitle = "Percent repeat count visibility"
 } % begin verbatim
 
+
 \relative c'' {
   \set countPercentRepeats = ##t
   \set repeatCountVisibility = #(every-nth-repeat-count-visible 5)
diff --git a/Documentation/snippets/percent-repeat-counter.ly b/Documentation/snippets/percent-repeat-counter.ly
index 41a186df0f..a3250530da 100644
--- a/Documentation/snippets/percent-repeat-counter.ly
+++ b/Documentation/snippets/percent-repeat-counter.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats"
@@ -45,6 +45,7 @@ convenient property is switched, as shown in this example:
   doctitle = "Percent repeat counter"
 } % begin verbatim
 
+
 \relative c'' {
   \set countPercentRepeats = ##t
   \repeat percent 4 { c1 }
diff --git a/Documentation/snippets/percussion-beaters.ly b/Documentation/snippets/percussion-beaters.ly
index c0f48e3e93..fb20e590eb 100644
--- a/Documentation/snippets/percussion-beaters.ly
+++ b/Documentation/snippets/percussion-beaters.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "percussion"
@@ -19,6 +19,7 @@ demonstrated in this example.
   doctitle = "Percussion beaters"
 } % begin verbatim
 
+
 stick = \markup {
   \with-dimensions #'(0 . 5) #'(0 . 5)
   \postscript #"
diff --git a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
index bacc4f34e3..372499a712 100644
--- a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
+++ b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "version-specific, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
  doctitlees = "Permitir saltos de línea dentro de grupos especiales con barra"
@@ -50,6 +50,7 @@ tuplets have to be beamed manually.
   doctitle = "Permitting line breaks within beamed tuplets"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Voice
diff --git a/Documentation/snippets/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
index 6f820e0e3f..b72451ad9d 100644
--- a/Documentation/snippets/piano-template-simple.ly
+++ b/Documentation/snippets/piano-template-simple.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "keyboards, template"
+  lsrtags = "template, keyboards, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -46,6 +46,7 @@ Here is a simple piano staff with some notes.
   doctitle = "Piano template (simple)"
 } % begin verbatim
 
+
 upper = \relative c'' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/piano-template-with-centered-dynamics.ly b/Documentation/snippets/piano-template-with-centered-dynamics.ly
deleted file mode 100644
index 15496ea3b3..0000000000
--- a/Documentation/snippets/piano-template-with-centered-dynamics.ly
+++ /dev/null
@@ -1,106 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  texidoces = "
-Muchas partituras de piano tienen las indicaciones dinámicas centradas
-entre los dos pentagramas.  El contexto @code{Dynamics}, si se sitúa
-entre pentagramas, coloca los matices dinámicos correctamente de forma
-automática.
-
-"
-  doctitlees = "Plantilla de piano con matices centrados"
-
-
-%% Translation of GIT committish: fa1aa6efe68346f465cfdb9565ffe35083797b86
-  texidocja = "
-多くのピアノ譜は、強弱記号を 2 つの譜の間に置きます。これを実現するにはちょっ@c
-とした調整が必要ですが、そのテンプレートがここにあるので、あなた自身が調整を行@c
-う必要はありません。
-"
-
-%% Translation of GIT committish: c3b519f0dd5ff0f8ccfc9a39ed1fe8df8b43741c
-  texidocit = "
-Molti spartiti per pianoforte hanno le dinamiche poste al centro dei due righi.
-Il contesto @code{Dynamics}, se collocato tra i righi, posiziona automaticamente
-le dinamiche in modo corretto.
-
-"
-  doctitleit = "Modello per pianoforte con dinamiche al centro"
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-In der meisten Klaviernotation werden die Dynamikzeichen zwischen
-den beiden Systemen zentriert. Für LilyPond muss man die Einstellungen
-etwas anpassen, aber Sie können ja das angepasste Beispiel von hier
-kopieren.
-"
-
-
-%% Translation of GIT committish: ceb0afe7d4d0bdb3d17b9d0bff7936bb2a424d16
-  texidocfr = "
-Nombre d'ouvrages pour piano font apparaître les nuances entre les deux
-portées.  Bien que cela nécessite quelques subtilités, voici de quoi
-obtenir un tel résultat.
-
-"
-  doctitlefr = "Piano et nuances entre les portées"
-
-  lsrtags = "expressive-marks, keyboards, template"
-  texidoc = "
-Many piano scores have the dynamics centered between the two staves.
-The @code{Dynamics} context, if placed between staves, will
-automatically position dynamics correctly.
-
-"
-  doctitle = "Piano template with centered dynamics"
-} % begin verbatim
-
-
-global = {
-  \key c \major
-  \time 4/4
-}
-
-upper = \relative c'' {
-  \clef treble
-  a4 b c d
-}
-
-lower = \relative c {
-  \clef bass
-  a2 c
-}
-
-dynamics = {
-  s2\fff\> s4 s\!\pp
-}
-
-pedal = {
-  s2\sustainOn s\sustainOff
-}
-
-\score {
-  \new PianoStaff = "PianoStaff_pf" <<
-    \new Staff = "Staff_pfUpper" << \global \upper >>
-    \new Dynamics = "Dynamics_pf" \dynamics
-    \new Staff = "Staff_pfLower" << \global \lower >>
-    \new Dynamics = "pedal" \pedal
-  >>
-  \layout { }
-}
-
-\score {
-  \new PianoStaff = "PianoStaff_pf" <<
-    \new Staff = "Staff_pfUpper" << \global \upper \dynamics \pedal >>
-    \new Staff = "Staff_pfLower" << \global \lower \dynamics \pedal >>
-  >>
-  \midi { }
-}
diff --git a/Documentation/snippets/piano-template-with-centered-lyrics.ly b/Documentation/snippets/piano-template-with-centered-lyrics.ly
index 4bc34652ee..8e2b2be9ad 100644
--- a/Documentation/snippets/piano-template-with-centered-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-centered-lyrics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, keyboards, template"
+  lsrtags = "template, keyboards, text, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -56,6 +56,7 @@ centered between the staves of a piano staff.
   doctitle = "Piano template with centered lyrics"
 } % begin verbatim
 
+
 upper = \relative c'' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index b6c568fb35..82777d029a 100644
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, keyboards, template"
+  lsrtags = "template, vocal-music, keyboards, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -56,6 +56,7 @@ with piano accompaniment underneath.
   doctitle = "Piano template with melody and lyrics"
 } % begin verbatim
 
+
 melody = \relative c'' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly
index 1bc6489db9..a7b21dea91 100644
--- a/Documentation/snippets/pitches-headword.ly
+++ b/Documentation/snippets/pitches-headword.ly
@@ -1,33 +1,27 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
-
-% NR 1.1 Pitches
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
+  lsrtags = "headword"
 
+  texidoc = "
+Piches headword
 
+"
+  doctitle = "Pitches headword"
+} % begin verbatim
 
 % L. v. Beethoven
 % Piano sonata 21 - Dem Grafen von Waldstein Gewidmet
 % chorale at measures 34 - 40+
 
+\include "english.ly"
+
 \new PianoStaff <<
 
   % RH Staff
diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list
index 47a78e3584..756236dd17 100644
--- a/Documentation/snippets/pitches.snippet-list
+++ b/Documentation/snippets/pitches.snippet-list
@@ -8,7 +8,6 @@ changing-the-interval-of-lines-on-the-stave.ly
 clefs-can-be-transposed-by-arbitrary-amounts.ly
 coloring-notes-depending-on-their-pitch.ly
 creating-a-sequence-of-notes-on-various-pitches.ly
-dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 forcing-a-clef-symbol-to-be-displayed.ly
 generating-random-notes.ly
 hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
diff --git a/Documentation/snippets/placement-of-right-hand-fingerings.ly b/Documentation/snippets/placement-of-right-hand-fingerings.ly
index 108976ad0d..b86a78ef18 100644
--- a/Documentation/snippets/placement-of-right-hand-fingerings.ly
+++ b/Documentation/snippets/placement-of-right-hand-fingerings.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings"
@@ -48,6 +48,7 @@ in the following example. Note: you must use a chord construct
   doctitle = "Placement of right-hand fingerings"
 } % begin verbatim
 
+
 #(define RH rightHandFinger)
 
 \relative c {
diff --git a/Documentation/snippets/polyphony-in-tablature.ly b/Documentation/snippets/polyphony-in-tablature.ly
index 75e7e4731e..c9cab656c4 100644
--- a/Documentation/snippets/polyphony-in-tablature.ly
+++ b/Documentation/snippets/polyphony-in-tablature.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "fretted-strings"
@@ -43,6 +43,7 @@ staff.
   doctitle = "Polyphony in tablature"
 } % begin verbatim
 
+
 upper = \relative c' {
   \time 12/8
   \key e \minor
diff --git a/Documentation/snippets/positioning-arpeggios.ly b/Documentation/snippets/positioning-arpeggios.ly
index 4777a4bac0..fa3c97a352 100644
--- a/Documentation/snippets/positioning-arpeggios.ly
+++ b/Documentation/snippets/positioning-arpeggios.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -27,6 +27,7 @@ and lower start positions independently.
   doctitle = "Positioning arpeggios"
 } % begin verbatim
 
+
 \relative c' {
   <c e g b>1\arpeggio
   \once \override Arpeggio #'positions = #'(-5 . 0)
diff --git a/Documentation/snippets/positioning-fingering-indications-precisely.ly b/Documentation/snippets/positioning-fingering-indications-precisely.ly
index 17a8603edc..3c5b9f0aec 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -20,6 +20,7 @@ involved.
   doctitle = "Positioning fingering indications precisely"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(left)
   <c-1 d-2 a'-5>4
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 e9e8a08573..784d4239b3 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -33,6 +33,7 @@ beaming for grace notes.
   doctitle = "Positioning grace note beams at the height of normal note beams"
 } % begin verbatim
 
+
 \relative c {
   f8[ e]
   \grace {
diff --git a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
index 1f5435ed0f..51eda5a666 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -59,6 +59,7 @@ the) graces are put left of the musical columns for the main notes.
   doctitle = "Positioning grace notes with floating space"
 } % begin verbatim
 
+
 \relative c'' {
   <<
     \override Score.SpacingSpanner #'strict-grace-spacing = ##t
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 1813823270..4906994cce 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "repeats, breaks"
+  lsrtags = "repeats, workaround, breaks, symbols-and-glyphs"
 
   texidoc = "
 If you want to place an exiting segno sign and add text like @qq{D.S.
@@ -20,6 +20,7 @@ line.
   doctitle = "Positioning segno and coda (with line break)"
 } % begin verbatim
 
+
 {
   \clef treble
   \key g \major
diff --git a/Documentation/snippets/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
index 7d2c889e6b..4cbc417d27 100644
--- a/Documentation/snippets/positioning-text-markups-inside-slurs.ly
+++ b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -45,6 +45,7 @@ set to false in order to be printed inside slurs.
   doctitle = "Positioning text markups inside slurs"
 } % begin verbatim
 
+
 \relative c'' {
   \override TextScript #'avoid-slur = #'inside
   \override TextScript #'outside-staff-priority = ##f
diff --git a/Documentation/snippets/preparing-parts.snippet-list b/Documentation/snippets/preparing-parts.snippet-list
new file mode 100644
index 0000000000..fedf0f6e20
--- /dev/null
+++ b/Documentation/snippets/preparing-parts.snippet-list
@@ -0,0 +1,4 @@
+adding-drum-parts.ly
+forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+nesting-staves.ly
+string-quartet-template-with-separate-parts.ly
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 093f11852b..faec195de3 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches"
+  lsrtags = "pitches, automatic-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 doctitlees = "Evitar que se añadan becuadros adicionales automáticamente"
@@ -67,6 +67,7 @@ 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 0601a666e5..25bfa49c5c 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -18,6 +18,7 @@ tuplet marking.  This can be overcome by setting @code{TupletBracket
   doctitle = "Preventing final mark from removing final tuplet"
 } % begin verbatim
 
+
 \new Staff {
    \set tupletFullLength = ##t
    \time 1/8
@@ -27,7 +28,10 @@ tuplet marking.  This can be overcome by setting @code{TupletBracket
    \override Score.RehearsalMark #'break-visibility = #'#(#t #t #t)
    \override Score.RehearsalMark #'direction = #DOWN
    \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-   \mark "Composed Feb 2007 - Feb 2008"
+% due to issue 2362 the following line is commented
+%   \mark "Composed Feb 2007 - Feb 2008"
+% and a shorter mark is used.
+   \mark "1234"
 }
 
 \new Staff {
@@ -42,6 +46,9 @@ tuplet marking.  This can be overcome by setting @code{TupletBracket
   \override Score.RehearsalMark #'break-visibility = #'#(#t #t #t)
   \override Score.RehearsalMark #'direction = #DOWN
   \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-  \mark "Composed Feb 2007 - Feb 2008"
+% due to issue 2362 the following line is commented
+%   \mark "Composed Feb 2007 - Feb 2008"
+% and a shorter mark is used.
+   \mark "1234"
 }
 
diff --git a/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
index abcb3174e9..17c3448651 100644
--- a/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
+++ b/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches"
+  lsrtags = "pitches, automatic-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 doctitlees = "Evitar que se impriman becuadros cuando cambia la armadura"
@@ -62,6 +62,7 @@ property in the @code{Staff} context.
   doctitle = "Preventing natural signs from being printed when the key signature changes"
 } % begin verbatim
 
+
 \relative c' {
   \key d \major
   a4 b cis d
diff --git a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
index bc8a6808a7..28fc2fcfdd 100644
--- a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
+++ b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
@@ -44,6 +44,7 @@ overriding the relevant property:
   doctitle = "Printing a repeat sign at the beginning of a piece"
 } % begin verbatim
 
+
 \relative c'' {
   \once \override Score.BreakAlignment #'break-align-orders =
     #(make-vector 3 '(instrument-name
diff --git a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
index e1cfde056e..a5c8fea36b 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -54,6 +54,7 @@ measures except at the end of the line.
   doctitle = "Printing bar numbers at regular intervals"
 } % begin verbatim
 
+
 \relative c' {
   \override Score.BarNumber #'break-visibility = #end-of-line-invisible
   \set Score.currentBarNumber = #11
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 9c5357e224..ff1653c3fe 100644
--- a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
+++ b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -42,6 +42,7 @@ Bar numbers can also be printed inside boxes or circles.
   doctitle = "Printing bar numbers inside boxes or circles"
 } % begin verbatim
 
+
 \relative c' {
   % Prevent bar numbers at the end of a line and permit them elsewhere
   \override Score.BarNumber #'break-visibility = #end-of-line-invisible
diff --git a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
index 77bd61d01c..1614cb0dfd 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -48,6 +48,7 @@ notation) by setting the @code{circled-tip} property of the
   doctitle = "Printing hairpins using al niente notation"
 } % begin verbatim
 
+
 \relative c'' {
   \override Hairpin #'circled-tip = ##t
   c2\< c\!
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 500f6c2d53..f5c9e85bf7 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
@@ -39,6 +39,7 @@ to align the right end of the mark with the bar line.
   doctitle = "Printing marks at the end of a line"
 } % begin verbatim
 
+
 \relative c'' {
   g2 c
   d,2 a'
diff --git a/Documentation/snippets/printing-marks-on-every-staff.ly b/Documentation/snippets/printing-marks-on-every-staff.ly
index 8a3d47ccbd..7f78a44c9f 100644
--- a/Documentation/snippets/printing-marks-on-every-staff.ly
+++ b/Documentation/snippets/printing-marks-on-every-staff.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
@@ -45,6 +45,7 @@ they may also be printed on every staff.
   doctitle = "Printing marks on every staff"
 } % begin verbatim
 
+
 \score {
   <<
     \new Staff { c''1 \mark "molto" c'' }
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 9d5e2017e1..5866f5de7c 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -52,6 +52,7 @@ of @code{MetronomeMark} or @code{RehearsalMark} appropriately.
   doctitle = "Printing metronome and rehearsal marks below the staff"
 } % begin verbatim
 
+
 \layout { ragged-right = ##f }
 
 {
diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index af6da55529..944f69ad0c 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, percussion"
+  lsrtags = "really-cool, real-music, percussion, contemporary-notation, rhythms"
 
   texidoc = "
 In the following snippet, two parts have a completely different time
diff --git a/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly b/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
index 4f4c1998cb..8c5fe23ed4 100644
--- a/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
+++ b/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "tweaks-and-overrides"
@@ -29,6 +29,7 @@ representation of the octave of the note.
   doctitle = "Printing note names with and without an octave marker"
 } % begin verbatim
 
+
 scale = \relative c' {
   a4 b c d
   e4 f g a
diff --git a/Documentation/snippets/printing-text-from-right-to-left.ly b/Documentation/snippets/printing-text-from-right-to-left.ly
index 196b134cfa..1ebaff222a 100644
--- a/Documentation/snippets/printing-text-from-right-to-left.ly
+++ b/Documentation/snippets/printing-text-from-right-to-left.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, text, world-music"
+  lsrtags = "editorial-annotations, workaround, text, world-music"
 
   texidoc = "
 It is possible to print text from right to left in a markup object, as
@@ -17,6 +17,7 @@ demonstrated here.
   doctitle = "Printing text from right to left"
 } % begin verbatim
 
+
 {
   b1^\markup {
     \line { i n g i r u m i m u s n o c t e }
diff --git a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
index 7b35fa2fce..19c232c255 100644
--- a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
+++ b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -63,6 +63,7 @@ must be inserted before the first note for this to work.
   doctitle = "Printing the bar number for the first measure"
 } % begin verbatim
 
+
 \relative c' {
   \set Score.barNumberVisibility = #all-bar-numbers-visible
   \bar ""
diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
index 0d09688eab..d3a5011cbc 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
@@ -18,6 +18,7 @@ the note that occurs at the same time. This may cause collisions.
   doctitle = "Proportional strict notespacing"
 } % begin verbatim
 
+
 \relative c'' <<
   \override Score.SpacingSpanner #'strict-note-spacing = ##t
   \set Score.proportionalNotationDuration = #(ly:make-moment 1 16)
diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
index 44824cb9f5..3b95a02218 100644
--- a/Documentation/snippets/putting-lyrics-inside-the-staff.ly
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, text, vocal-music"
+  lsrtags = "vocal-music, text, staff-notation"
 
   texidoc = "
 Lyrics can be moved vertically to place them inside the staff.  The
diff --git a/Documentation/snippets/quoting-another-voice-with-transposition.ly b/Documentation/snippets/quoting-another-voice-with-transposition.ly
index 0d6f801720..c5a19e37f9 100644
--- a/Documentation/snippets/quoting-another-voice-with-transposition.ly
+++ b/Documentation/snippets/quoting-another-voice-with-transposition.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches, staff-notation"
@@ -59,6 +59,7 @@ quoted ones) are transposed.
   doctitle = "Quoting another voice with transposition"
 } % begin verbatim
 
+
 \addQuote clarinet {
   \transposition bes
   \repeat unfold 8 { d'16 d' d'8 }
diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
index 0d52d050e3..3cec13d8ce 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "staff-notation"
@@ -76,6 +76,7 @@ the Internals Reference.
   doctitle = "Quoting another voice"
 } % begin verbatim
 
+
 quoteMe = \relative c' {
   fis4 r16 a8.-> b4\ff c
 }
diff --git a/Documentation/snippets/real-music.snippet-list b/Documentation/snippets/real-music.snippet-list
new file mode 100644
index 0000000000..67467c170c
--- /dev/null
+++ b/Documentation/snippets/real-music.snippet-list
@@ -0,0 +1,13 @@
+ancient-notation-template----modern-transcription-of-mensural-music.ly
+changing-midi-output-to-one-channel-per-voice.ly
+creating-a-sequence-of-notes-on-various-pitches.ly
+creating-slurs-across-voices.ly
+cross-staff-tremolos.ly
+demo-midiinstruments.ly
+dotted-harmonics.ly
+heavily-customized-polymetric-time-signatures.ly
+indicating-cross-staff-chords-with-arpeggio-bracket.ly
+inserting-score-fragments-above-a-staff,-as-markups.ly
+jazz-combo-template.ly
+printing-music-with-different-time-signatures.ly
+score-for-diatonic-accordion.ly
diff --git a/Documentation/snippets/really-cool.snippet-list b/Documentation/snippets/really-cool.snippet-list
new file mode 100644
index 0000000000..507d91f7cc
--- /dev/null
+++ b/Documentation/snippets/really-cool.snippet-list
@@ -0,0 +1,16 @@
+adding-the-current-date-to-a-score.ly
+ancient-notation-template----modern-transcription-of-mensural-music.ly
+blanking-staff-lines-using-the--whiteout-command.ly
+center-text-below-hairpin-dynamics.ly
+changing-properties-for-individual-grobs.ly
+clusters.ly
+coloring-notes-depending-on-their-pitch.ly
+creating-a-sequence-of-notes-on-various-pitches.ly
+embedding-native-postscript-in-a--markup-block.ly
+generating-random-notes.ly
+generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+incipit.ly
+making-some-staff-lines-thicker-than-the-others.ly
+non-traditional-key-signatures.ly
+printing-music-with-different-time-signatures.ly
+using-postscript-to-generate-special-note-head-shapes.ly
diff --git a/Documentation/snippets/really-simple.snippet-list b/Documentation/snippets/really-simple.snippet-list
new file mode 100644
index 0000000000..1381ca63fc
--- /dev/null
+++ b/Documentation/snippets/really-simple.snippet-list
@@ -0,0 +1,27 @@
+adding-an-extra-staff.ly
+adding-drum-parts.ly
+adding-fingerings-to-a-score.ly
+analysis-brackets-above-the-staff.ly
+changing-a-single-notes-size-in-a-chord.ly
+changing-stanza-fonts.ly
+changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+changing-the-chord-names-to-german-or-semi-german-notation.ly
+combining-dynamics-with-markup-texts.ly
+forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+lyrics-alignment.ly
+merging-multi-measure-rests-in-a-polyphonic-part.ly
+modifying-tuplet-bracket-length.ly
+outputting-the-version-number.ly
+piano-template-simple.ly
+piano-template-with-centered-lyrics.ly
+piano-template-with-melody-and-lyrics.ly
+single-staff-template-with-notes,-lyrics,-and-chords.ly
+single-staff-template-with-notes-and-chords.ly
+single-staff-template-with-notes-and-lyrics.ly
+single-staff-template-with-only-notes.ly
+skips-in-lyric-mode-2.ly
+skips-in-lyric-mode.ly
+string-quartet-template-simple.ly
+using-the--tweak-command-to-tweak-individual-grobs.ly
+vocal-ensemble-template.ly
+volta-multi-staff.ly
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index 60bb305945..87bdb2a49f 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.15.25"
+\version "2.15.32"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/removing-bar-numbers-from-a-score.ly b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
index 12618eb269..8e841f8e7a 100644
--- a/Documentation/snippets/removing-bar-numbers-from-a-score.ly
+++ b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -50,6 +50,7 @@ Bar numbers can be removed entirely by removing the
   doctitle = "Removing bar numbers from a score"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Score
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 1b3319b954..14eee059b6 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -29,6 +29,7 @@ a staff-by-staff basis.
   doctitle = "Removing connecting bar lines on StaffGroup PianoStaff or GrandStaff"
 } % begin verbatim
 
+
 \relative c' {
   \new StaffGroup <<
     \new Staff {
diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index d95cf59d3d..6bd7dce38e 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides, breaks"
+  lsrtags = "breaks, staff-notation, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -78,6 +78,7 @@ written.
   doctitle = "Removing the first empty line"
 } % begin verbatim
 
+
 \layout {
   \context {
     \Staff \RemoveEmptyStaves
diff --git a/Documentation/snippets/repeats-headword.ly b/Documentation/snippets/repeats-headword.ly
index 7fe25c65c7..d803cd2b18 100644
--- a/Documentation/snippets/repeats-headword.ly
+++ b/Documentation/snippets/repeats-headword.ly
@@ -1,32 +1,27 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "headword"
 
-% NR 1.7 Repeats
+  texidoc = "
+Repeats headword
+
+"
+  doctitle = "Repeats headword"
+} % begin verbatim
 
 % Beethoven, Op. 57
 % Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet
 % Movt II, Andante con moto
 % Measures 9 - 16
 
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
-
-
+\include "english.ly"
 
 \new PianoStaff <<
 
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index 50ebf45599..351dc18b72 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, ancient-notation, tweaks-and-overrides"
+  lsrtags = "ancient-notation, symbols-and-glyphs, tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   doctitlees = "Estilos de silencios"
@@ -41,6 +41,7 @@ Rests may be used in various styles.
   doctitle = "Rest styles"
 } % begin verbatim
 
+
 \layout {
   indent = 0
   \context {
diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly
index 7f7761c524..1a4e84793d 100644
--- a/Documentation/snippets/reverting-default-beam-endings.ly
+++ b/Documentation/snippets/reverting-default-beam-endings.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "version-specific, rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 Para tipografiar las barras agrupadas en la forma @code{3-4-3-2} sólo
@@ -38,10 +39,11 @@ défaut relatifs à 12/8, puis ajouter nos propres règles :
 "
   doctitlefr = "Annulation des règles de ligature par défaut"
 
-  lsrtags = "rhythms"
   texidoc = "
-To typeset beams grouped @code{3-4-3-2} one need only change the
-beat structure:
+To typeset beams grouped @code{3-4-3-2} in 12/8 it is necessary first
+to override the default beam endings  in 12/8, and then to set up the
+new beaming endings:
+
 "
   doctitle = "Reverting default beam endings"
 } % begin verbatim
diff --git a/Documentation/snippets/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly
index 63a3f20e97..cc45cfe3ea 100644
--- a/Documentation/snippets/rhythmic-slashes.ly
+++ b/Documentation/snippets/rhythmic-slashes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
   texidoc = "
 In @qq{simple} lead-sheets, sometimes no actual notes are written,
@@ -26,6 +26,7 @@ the appropriate duration).
   doctitle = "Rhythmic slashes"
 } % begin verbatim
 
+
 % Macro to print single slash
 rs = {
   \once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash
diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly
index 6a187f64b2..e0b11fa45b 100644
--- a/Documentation/snippets/rhythms-headword.ly
+++ b/Documentation/snippets/rhythms-headword.ly
@@ -1,33 +1,28 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 1.2 Rhythms
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
+  lsrtags = "headword"
 
+  texidoc = "
+Rhythms headword
 
+"
+  doctitle = "Rhythms headword"
+} % begin verbatim
 
 % Beethoven, Op. 81a
 % Piano sonata 26 - Das Lebewohl
 % Movt II - Abwesenheit
 % Measures 31 - 34
 
+\include "english.ly"
+
 \layout {
   \context {
     \Score
diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list
index c4ed36b3ba..e68f29d662 100644
--- a/Documentation/snippets/rhythms.snippet-list
+++ b/Documentation/snippets/rhythms.snippet-list
@@ -13,7 +13,6 @@ changing-beam-knee-gap.ly
 changing-form-of-multi-measure-rests.ly
 changing-the-number-of-augmentation-dots-per-note.ly
 changing-the-tempo-without-a-metronome-mark.ly
-changing-the-time-signature-without-affecting-the-beaming.ly
 changing-the-tuplet-number.ly
 changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
 chant-or-psalms-notation.ly
@@ -27,7 +26,6 @@ entering-several-tuplets-using-only-one--times-command.ly
 flat-flags-and-beam-nibs.ly
 forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 generating-custom-flags.ly
-grouping-beats.ly
 guitar-strum-rhythms.ly
 heavily-customized-polymetric-time-signatures.ly
 making-an-object-invisible-with-the-transparent-property.ly
diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly
index 7c12589d67..491564a7ee 100644
--- a/Documentation/snippets/satb-choir-template---four-staves.ly
+++ b/Documentation/snippets/satb-choir-template---four-staves.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
@@ -49,6 +49,7 @@ SATB choir template (four staves)
   doctitle = "SATB Choir template - four staves"
 } % begin verbatim
 
+
 global = {
   \key c \major
   \time 4/4
diff --git a/Documentation/snippets/scheme-language.snippet-list b/Documentation/snippets/scheme-language.snippet-list
new file mode 100644
index 0000000000..3e9034afe7
--- /dev/null
+++ b/Documentation/snippets/scheme-language.snippet-list
@@ -0,0 +1,18 @@
+adding-extra-fingering-with-scheme.ly
+adding-the-current-date-to-a-score.ly
+center-text-below-hairpin-dynamics.ly
+changing--flageolet-mark-size.ly
+changing-properties-for-individual-grobs.ly
+creating-a-sequence-of-notes-on-various-pitches.ly
+creating-double-digit-fingerings.ly
+displaying-grob-ancestry.ly
+drawing-boxes-around-grobs.ly
+drawing-circles-around-various-objects.ly
+generating-random-notes.ly
+generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+outputting-the-version-number.ly
+string-number-extender-lines.ly
+three-sided-box.ly
+transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+using-ly-grob-object-to-access-grobs-with--tweak.ly
+using-postscript-to-generate-special-note-head-shapes.ly
diff --git a/Documentation/snippets/screech-boink.ly b/Documentation/snippets/screech-and-boink.ly
similarity index 81%
rename from Documentation/snippets/screech-boink.ly
rename to Documentation/snippets/screech-and-boink.ly
index 92315a87b2..7f40d17551 100644
--- a/Documentation/snippets/screech-boink.ly
+++ b/Documentation/snippets/screech-and-boink.ly
@@ -1,18 +1,21 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.15.32
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
 \version "2.15.32"
+
 \header {
-  lsrtags = "headwords"
-  texidoc = "Random complex notation"
+  lsrtags = "headword"
+
+  texidoc = "
+Random complex notation
+
+"
   doctitle = "Screech and Boink"
 } % begin verbatim
 
-
 \score {
   \context PianoStaff <<
     \new Staff = "up" {
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 b342eaed09..148699d7c5 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.14.0"
+\version "2.14.2"
 
 \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 738cc24b69..bb628b652e 100644
--- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
+++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -51,6 +51,7 @@ by overriding the @code{'to-barline} property.
   doctitle = "Setting hairpin behavior at bar lines"
 } % begin verbatim
 
+
 \relative c'' {
   e4\< e2.
   e1\!
diff --git a/Documentation/snippets/setting-system-separators.ly b/Documentation/snippets/setting-system-separators.ly
index c55e2a3834..a239523515 100644
--- a/Documentation/snippets/setting-system-separators.ly
+++ b/Documentation/snippets/setting-system-separators.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
+  lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -30,6 +30,7 @@ default.
   doctitle = "Setting system separators"
 } % begin verbatim
 
+
 \paper {
   system-separator-markup = \slashSeparator
 }
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 6c4359877c..b67be30537 100644
--- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
+++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
@@ -1,12 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
 \header {
+  lsrtags = "repeats"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -29,15 +31,14 @@ l'aide de la propriété @code{doubleRepeatType}.
   doctitlefr = "Succession de reprise et style de barre par défaut"
 
 
-  lsrtags = "repeats"
-  texidoc = "There are three different styles of double repeats for
-volte, that can be set using @code{doubleRepeatType}."
+  texidoc = "
+There are three different styles of double repeats for volte, that can
+be set using @code{doubleRepeatType}.
 
+"
   doctitle = "Setting the double repeat default for volte"
 } % begin verbatim
 
-
-
 \relative c'' {
   \repeat volta 1 { c1 }
   \set Score.doubleRepeatType = #":|:"
diff --git a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
index fe31af1b9c..adf4757699 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -45,6 +45,7 @@ If hairpins are too short, they can be lengthened by modifying the
   doctitle = "Setting the minimum length of hairpins"
 } % begin verbatim
 
+
 \relative c'' {
   c4\< c\! d\> e\!
   \override Hairpin #'minimum-length = #5
diff --git a/Documentation/snippets/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly
index 2341c485a7..699a702acd 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats"
@@ -52,6 +52,7 @@ lasts one measure, which is a duration of 3/4.
   doctitle = "Shortening volta brackets"
 } % begin verbatim
 
+
 \relative c'' {
   \time 3/4
   c4 c c
diff --git a/Documentation/snippets/showing-chords-at-changes.ly b/Documentation/snippets/showing-chords-at-changes.ly
index ceee85907f..bc89b4038e 100644
--- a/Documentation/snippets/showing-chords-at-changes.ly
+++ b/Documentation/snippets/showing-chords-at-changes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords"
@@ -42,6 +42,7 @@ chord changes.
   doctitle = "Showing chords at changes"
 } % begin verbatim
 
+
 harmonies = \chordmode {
   c1:m c:m \break c:m c:m d
 }
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 f7c9a3e682..8602449476 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
@@ -1,23 +1,29 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "version-specific, tweaks-and-overrides, expressive-marks"
 
   texidoc = "
 By default, LilyPond does not allow the same articulation (e.g., an
 accent, a fermata, a flageolet, etc.) to be displayed above and below a
-note.  For example, @code{c4_\\fermata^\\fermata} will only show a fermata
-below, ignoring the fermata above.  However, one can stick
+note. For example, c4_\\fermata^\\fermata will only show a fermata
+below. The fermata above will simply be ignored. However, one can stick
 scripts (just like fingerings) inside a chord, which means it is
-possible to have as many articulations as desired.  So, the solution is to
-write the note as a chord and add the articulations inside the @code{<@dots{}>}.
+possible to have as many articulations as desired. This approach has
+the advantage that it ignores the stem and positions the articulation
+relative to the note head. This can be seen in the case of the
+flageolets in the snippet. To mimic the behaviour of scripts outside a
+chord, 'add-stem-support would be required. So, the solution is to
+write the note as a chord and add the articulations inside the <...>.
+The direction will always be above, but one can tweak this via a
+\\tweak: @code{<c-\\tweak #'direction #DOWN-\\fermata^\\fermata>}
+
 "
   doctitle = "Showing the same articulation above and below a note or chord"
 } % begin verbatim
diff --git a/Documentation/snippets/simple-lead-sheet.ly b/Documentation/snippets/simple-lead-sheet.ly
index 411a37f5e7..40ee7f2ffb 100644
--- a/Documentation/snippets/simple-lead-sheet.ly
+++ b/Documentation/snippets/simple-lead-sheet.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords"
@@ -40,6 +40,7 @@ When put together, chord names, a melody, and lyrics form a lead sheet:
   doctitle = "Simple lead sheet"
 } % begin verbatim
 
+
 <<
   \chords { c2 g:sus4 f e }
   \relative c'' {
diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index 1d4e31faa5..6362766050 100644
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -1,25 +1,22 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
+  lsrtags = "headword"
+
+  texidoc = "
+Simultaneous notes
+
+"
+  doctitle = "Simultaneous headword"
 } % begin verbatim
 
+\include "english.ly"
 
 % NR 1.5 Simultaneous notes
 
diff --git a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
index 102d670e2e..fca843b6ea 100644
--- a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, chords, template"
+  lsrtags = "template, vocal-music, chords, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -57,6 +57,7 @@ chords.
   doctitle = "Single staff template with notes lyrics and chords"
 } % begin verbatim
 
+
 melody = \relative c' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
index f56af35f1f..ed061b2488 100644
--- a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
+++ b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, chords, template"
+  lsrtags = "template, vocal-music, chords"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -26,6 +26,7 @@ fret diagrams.
   doctitle = "Single staff template with notes lyrics chords and frets"
 } % begin verbatim
 
+
 verseI = \lyricmode {
   \set stanza = #"1."
   This is the first verse
diff --git a/Documentation/snippets/single-staff-template-with-notes-and-chords.ly b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
index 42bdabb5dc..0fa3b1f4ea 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "chords, template"
+  lsrtags = "template, chords, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -57,6 +57,7 @@ Want to prepare a lead sheet with a melody and chords? Look no further!
   doctitle = "Single staff template with notes and chords"
 } % begin verbatim
 
+
 melody = \relative c' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
index fc1eae3636..341d533268 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, template"
+  lsrtags = "template, vocal-music, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -76,6 +76,7 @@ beaming, change or comment out the relevant line.
   doctitle = "Single staff template with notes and lyrics"
 } % begin verbatim
 
+
 melody = \relative c' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/single-staff-template-with-only-notes.ly b/Documentation/snippets/single-staff-template-with-only-notes.ly
index b3f7df69f4..cfbe3180fd 100644
--- a/Documentation/snippets/single-staff-template-with-only-notes.ly
+++ b/Documentation/snippets/single-staff-template-with-only-notes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "template"
+  lsrtags = "template, really-simple"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -65,6 +65,7 @@ add notes, and you're finished!
   doctitle = "Single staff template with only notes"
 } % begin verbatim
 
+
 melody = \relative c' {
   \clef treble
   \key c \major
diff --git a/Documentation/snippets/skips-in-lyric-mode-2.ly b/Documentation/snippets/skips-in-lyric-mode-2.ly
index 8e3936b533..0899a14693 100644
--- a/Documentation/snippets/skips-in-lyric-mode-2.ly
+++ b/Documentation/snippets/skips-in-lyric-mode-2.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, vocal-music"
+  lsrtags = "vocal-music, really-simple, rhythms"
 
   texidoc = "
 Although @code{s} skips cannot be used in @code{\\lyricmode} (it is
@@ -18,6 +18,7 @@ or underscores (@code{_}) are available.So for example:
   doctitle = "Skips in lyric mode (2)"
 } % begin verbatim
 
+
 <<
   \relative c'' { a4 b c d }
   \new Lyrics \lyricmode { a4 "" _ gap }
diff --git a/Documentation/snippets/skips-in-lyric-mode.ly b/Documentation/snippets/skips-in-lyric-mode.ly
index f9efee48c7..337021ae2d 100644
--- a/Documentation/snippets/skips-in-lyric-mode.ly
+++ b/Documentation/snippets/skips-in-lyric-mode.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, vocal-music"
+  lsrtags = "vocal-music, really-simple, rhythms"
 
   texidoc = "
 The @code{s} syntax for skips is only available in note mode and chord
@@ -18,6 +18,7 @@ mode. In other situations, for example, when entering lyrics, using the
   doctitle = "Skips in lyric mode"
 } % begin verbatim
 
+
 <<
   \relative c'' { a1 | a }
   \new Lyrics \lyricmode { \skip 1 bla1 }
diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly
index f62ec9374d..a36833c3f6 100644
--- a/Documentation/snippets/slides-in-tablature.ly
+++ b/Documentation/snippets/slides-in-tablature.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 
@@ -33,14 +34,14 @@ Un glissando s'indique dans un @code{TabStaff} tout comme dans un
   doctitlefr = "Glissando et tablature"
 
 
-  lsrtags = "fretted-strings"
   texidoc = "
-Slides can be typeset in both @code{Staff} and @code{TabStaff} contexts:
+Slides can be typeset in both @code{Staff} and @code{TabStaff}
+contexts:
+
 "
   doctitle = "Slides in tablature"
 } % begin verbatim
 
-
 slides = {
   c'8\3(\glissando d'8\3)
   c'8\3\glissando d'8\3
diff --git a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
deleted file mode 100644
index 92ff742f12..0000000000
--- a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
+++ /dev/null
@@ -1,53 +0,0 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-\header {
-%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
-  doctitlees = "Marca de pizzicato de chasquido (`pizzicato de Bartók')"
-  texidoces = "
-El pizzicato de chasquido (también llamado @q{Pizzicato de Bartók}) es un
-@q{pizzicato fuerte en que la cuerda se pulsa verticalmente produciendo un
-chasquido y rebotando en el diapasón del instrumento} (Wikipedia).  Se
-denota mediante una circunferencia con una línea vertical corta que parte
-del centro de aquélla hacia fuera.  Aunque LilyPond no tiene ninguna
-instrucción predefinida para crear esta marca, es fácil hacer la definición
-y colocarla directamente en el archivo de lilypond.
-"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  doctitlede = "Bartók-Pizzicato"
-  texidocde = "
-Das Bartók-Pizzicato @q{ist eine besondere Form des Pizzicato, bei dem der
-Spieler die Saite auf das Griffbrett aufschlagen lässt, sodass zusätzlich
-zum angeschlagenen Ton ein scharfes, knallendes Geräusch ertönt}
-(Wikipedia).  Es wird dargestellt als kleiner Kreis mit einer vertikalen
-Linie, die vom Kreiszentrum aus nach oben weist und ein Stück außerhalb des
-Kreises endet.  Lilypond hat keinen eigenen Glyphen für dieses Symbol; es
-ist aber einfach, direkt eine Definition in die Eingabedatei einzufügen.
-"
-
-  lsrtags = "expressive-marks, unfretted-strings"
-  texidoc = "
-A snap-pizzicato (also known as @qq{Bartok pizzicato}) is a @qq{strong
-pizzicato where the string is plucked vertically by snapping and
-rebounds off the fingerboard of the instrument} (Wikipedia).  It is
-denoted by a circle with a vertical line going from the center upwards
-outside the circle.
-"
-  doctitle = "Snap-pizzicato (\"Bartok pizzicato\")"
-} % begin verbatim
-
-
-\relative c' {
-  c4\snappizzicato
-  <c' e g>4\snappizzicato
-  <c' e g>4^\snappizzicato
-  <c, e g>4_\snappizzicato
-}
diff --git a/Documentation/snippets/new/snap-pizzicato-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
similarity index 52%
rename from Documentation/snippets/new/snap-pizzicato-bartok-pizzicato.ly
rename to Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
index f25ee35372..78800a4e9e 100644
--- a/Documentation/snippets/new/snap-pizzicato-bartok-pizzicato.ly
+++ b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
@@ -1,16 +1,24 @@
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, unfretted-strings"
+  lsrtags = "unfretted-strings, expressive-marks"
+
   texidoc = "
 A snap-pizzicato (also known as @qq{Bartok pizzicato}) is a @qq{strong
 pizzicato where the string is plucked vertically by snapping and
 rebounds off the fingerboard of the instrument} (Wikipedia).  It is
 denoted by a circle with a vertical line going from the center upwards
 outside the circle.
+
 "
-  doctitle = "Snap-pizzicato (@qq{Bartok pizzicato})"
-}
+  doctitle = "Snap-pizzicato or Bartok pizzicato"
+} % begin verbatim
 
 \relative c' {
   c4\snappizzicato
diff --git a/Documentation/snippets/specific-notation.snippet-list b/Documentation/snippets/specific-notation.snippet-list
new file mode 100644
index 0000000000..29d2685ee5
--- /dev/null
+++ b/Documentation/snippets/specific-notation.snippet-list
@@ -0,0 +1,29 @@
+accordion-discant-symbols.ly
+adding-bar-lines-to-chordnames-context.ly
+adding-drum-parts.ly
+adding-fingerings-to-tablatures.ly
+allowing-fingerings-to-be-printed-inside-the-staff.ly
+changing--flageolet-mark-size.ly
+changing-a-single-notes-size-in-a-chord.ly
+changing-the-number-of-lines-in-a-staff.ly
+chant-or-psalms-notation.ly
+chord-name-exceptions.ly
+chord-name-major7.ly
+clusters.ly
+contemporary-glissando.ly
+controlling-the-placement-of-chord-fingerings.ly
+creating-blank-staves.ly
+custodes.ly
+demo-midiinstruments.ly
+embedding-native-postscript-in-a--markup-block.ly
+engravers-one-by-one.ly
+faking-a-hammer-in-tablatures.ly
+flamenco-notation.ly
+how-to-change-fret-diagram-position.ly
+how-to-put-ties-between-syllables-in-lyrics.ly
+laissez-vibrer-ties.ly
+score-for-diatonic-accordion.ly
+time-signature-in-parentheses---method-3.ly
+time-signature-in-parentheses.ly
+transcription-of-ancient-music-with-incipit.ly
+woodwind-diagrams-listing.ly
diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
index 68d68be232..39dfd206ff 100644
--- a/Documentation/snippets/staff-notation.snippet-list
+++ b/Documentation/snippets/staff-notation.snippet-list
@@ -19,7 +19,6 @@ letter-tablature-formatting.ly
 making-some-staff-lines-thicker-than-the-others.ly
 measure-counter.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
-modern-tab-text-clef.ly
 nesting-staves.ly
 non-traditional-key-signatures.ly
 orchestra,-choir-and-piano-template.ly
@@ -29,6 +28,7 @@ quoting-another-voice.ly
 removing-the-first-empty-line.ly
 setting-system-separators.ly
 tick-bar-lines.ly
+time-signature-in-parentheses---method-3.ly
 time-signature-in-parentheses.ly
 tweaking-clef-properties.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
diff --git a/Documentation/snippets/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly
index 0f7ea51565..2ada51b72b 100644
--- a/Documentation/snippets/stand-alone-two-column-markup.ly
+++ b/Documentation/snippets/stand-alone-two-column-markup.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
@@ -43,6 +43,7 @@ Stand-alone text may be arranged in several columns using
   doctitle = "Stand-alone two-column markup"
 } % begin verbatim
 
+
 \markup {
   \fill-line {
     \hspace #1
diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
index 758fc7aaea..d6455c6493 100644
--- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
+++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "fretted-strings"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 La dirección de las plicas se contola de la misma forma en la
@@ -37,11 +38,11 @@ comme le montre cet exemple.
   doctitlefr = "Hampes et ligatures en mode tablature"
 
 
-  lsrtags = "fretted-strings"
   texidoc = "
 The direction of stems is controlled the same way in tablature as in
-traditional notation.  Beams can be made horizontal, as shown in this
+traditional notation. Beams can be made horizontal, as shown in this
 example.
+
 "
   doctitle = "Stem and beam behavior in tablature"
 } % begin verbatim
diff --git a/Documentation/snippets/stemlets.ly b/Documentation/snippets/stemlets.ly
index 3f4f4c4b6c..f705093e17 100644
--- a/Documentation/snippets/stemlets.ly
+++ b/Documentation/snippets/stemlets.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms"
+  lsrtags = "contemporary-notation, rhythms"
 
   texidoc = "
 In some notational conventions beams are allowed to extend over rests.
@@ -30,6 +30,7 @@ the different notations.
   doctitle = "Stemlets"
 } % begin verbatim
 
+
 \paper { ragged-right = ##f }
 
 {
diff --git a/Documentation/snippets/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
index d294413dfb..e1573a393d 100644
--- a/Documentation/snippets/string-quartet-template-simple.ly
+++ b/Documentation/snippets/string-quartet-template-simple.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "unfretted-strings, template"
+  lsrtags = "template, really-simple, unfretted-strings"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -58,6 +58,7 @@ This template demonstrates a simple string quartet. It also uses a
   doctitle = "String quartet template (simple)"
 } % begin verbatim
 
+
 global= {
   \time 4/4
   \key c \major
diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
index a88f45926c..a8d49ceb13 100644
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "unfretted-strings, template"
+  lsrtags = "preparing-parts, template, unfretted-strings"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -125,6 +125,7 @@ Do not forget to remove specified comments when using separate files!
   doctitle = "String quartet template with separate parts"
 } % begin verbatim
 
+
 %%%%% piece.ly
 %%%%% (This is the global definitions file)
 
diff --git a/Documentation/snippets/stylesheet.snippet-list b/Documentation/snippets/stylesheet.snippet-list
new file mode 100644
index 0000000000..82b78d802b
--- /dev/null
+++ b/Documentation/snippets/stylesheet.snippet-list
@@ -0,0 +1 @@
+flamenco-notation.ly
diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index ed1745c757..0c956f5aaa 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -51,28 +52,25 @@ avec les nouvelles valeurs de @code{baseMoment}.
 "
   doctitlefr = "Subdivision des ligatures"
 
-  lsrtags = "rhythms"
-
   texidoc = "
 The beams of consecutive 16th (or shorter) notes are, by default, not
 subdivided.  That is, the three (or more) beams stretch unbroken over
-entire groups of notes.  This behavior can be modified to subdivide
-the beams into sub-groups by setting the property
-@code{subdivideBeams}. When set, multiple beams will be subdivided at
-intervals defined by the current value of @code{baseMoment} by reducing
-the multiple beams to just one beam between the sub-groups. Note that
-@code{baseMoment} defaults to one over the denominator of the current
-time signature if not set explicitly. It must be set to a fraction
-giving the duration of the beam sub-group using the
-@code{ly:make-moment} function, as shown in this snippet. Also, when
-@code{baseMoment} is changed, @code{beatStructure} should also be changed
-to match the new @code{baseMoment}:
+entire groups of notes.  This behavior can be modified to subdivide the
+beams into sub-groups by setting the property @code{subdivideBeams}.
+When set, multiple beams will be subdivided at intervals defined by the
+current value of @code{baseMoment} by reducing the multiple beams to
+just one beam between the sub-groups. Note that @code{baseMoment}
+defaults to one over the denominator of the current time signature if
+not set explicitly. It must be set to a fraction giving the duration of
+the beam sub-group using the @code{ly:make-moment} function, as shown
+in this snippet. Also, when @code{baseMoment} is changed,
+@code{beatStructure} should also be changed to match the new
+@code{baseMoment}:
 
 "
   doctitle = "Subdividing beams"
 } % begin verbatim
 
-
 \relative c'' {
   c32[ c c c c c c c]
   \set subdivideBeams = ##t
diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 29de9a64ec..2ad9fb5f10 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -24,6 +24,7 @@ used with care.
   doctitle = "Suppressing warnings for clashing note columns"
 } % begin verbatim
 
+
 ignore = \override NoteColumn #'ignore-collision = ##t
 
 \relative c' {
diff --git a/Documentation/snippets/symbols-and-glyphs.snippet-list b/Documentation/snippets/symbols-and-glyphs.snippet-list
new file mode 100644
index 0000000000..c10bd2fa9e
--- /dev/null
+++ b/Documentation/snippets/symbols-and-glyphs.snippet-list
@@ -0,0 +1,13 @@
+accordion-discant-symbols.ly
+adding-indicators-to-staves-which-get-split-after-a-break.ly
+ancient-fonts.ly
+breathing-signs.ly
+broken-crescendo-hairpin.ly
+caesura-railtracks-with-fermata.ly
+changing--flageolet-mark-size.ly
+custodes.ly
+fingering-symbols-for-wind-instruments.ly
+how-to-put-ties-between-syllables-in-lyrics.ly
+positioning-segno-and-coda-with-line-break.ly
+rest-styles.ly
+volta-text-markup-using-repeatcommands.ly
diff --git a/Documentation/snippets/syntax-and-expressions.snippet-list b/Documentation/snippets/syntax-and-expressions.snippet-list
new file mode 100644
index 0000000000..7e72565d66
--- /dev/null
+++ b/Documentation/snippets/syntax-and-expressions.snippet-list
@@ -0,0 +1,2 @@
+combining-two-parts-on-the-same-staff.ly
+entering-several-tuplets-using-only-one--times-command.ly
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 1aef0291f1..9670958eb8 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.15.25"
+\version "2.15.32"
 
 \header {
   lsrtags = "paper-and-layout"
@@ -18,6 +18,7 @@ A table of contents is included using @code{\\markuplist
   doctitle = "Table of contents"
 } % begin verbatim
 
+
 #(set-default-paper-size "a6")
 
 \book {
diff --git a/Documentation/snippets/template.snippet-list b/Documentation/snippets/template.snippet-list
index 4be0dd20ac..45be61d85b 100644
--- a/Documentation/snippets/template.snippet-list
+++ b/Documentation/snippets/template.snippet-list
@@ -5,7 +5,6 @@ hymn-template.ly
 jazz-combo-template.ly
 orchestra,-choir-and-piano-template.ly
 piano-template-simple.ly
-piano-template-with-centered-dynamics.ly
 piano-template-with-centered-lyrics.ly
 piano-template-with-melody-and-lyrics.ly
 satb-choir-template---four-staves.ly
diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly
index 34aaf30d2b..ebe97de461 100644
--- a/Documentation/snippets/text-headword.ly
+++ b/Documentation/snippets/text-headword.ly
@@ -1,25 +1,22 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
+  lsrtags = "headword"
+
+  texidoc = "
+Text headword
+
+"
+  doctitle = "Text headword"
 } % begin verbatim
 
+\include "english.ly"
 
 % NR 1.8 Text
 
diff --git a/Documentation/snippets/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly
index a758cb3e58..5d5d7a3ae8 100644
--- a/Documentation/snippets/three-sided-box.ly
+++ b/Documentation/snippets/three-sided-box.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, text"
+  lsrtags = "text, rhythms, scheme-language"
 
   texidoc = "
 This example shows how to add a markup command to get a three sided box
@@ -17,6 +17,7 @@ around some text (or other markup).
   doctitle = "Three-sided box"
 } % begin verbatim
 
+
 % New command to add a three sided box, with sides north, west and south
 % Based on the box-stencil command defined in scm/stencil.scm
 % Note that ";;" is used to comment a line in Scheme
diff --git a/Documentation/snippets/tick-bar-lines.ly b/Documentation/snippets/tick-bar-lines.ly
index 766fccce67..4a8f07924e 100644
--- a/Documentation/snippets/tick-bar-lines.ly
+++ b/Documentation/snippets/tick-bar-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "staff-notation"
@@ -17,6 +17,7 @@ only for coordination and is not meant to imply any rhythmic stress.
   doctitle = "Tick bar lines"
 } % begin verbatim
 
+
 \relative c' {
   \set Score.defaultBarType = #"'"
   c4 d e f
diff --git a/Documentation/snippets/time-signature-in-parentheses---method-3.ly b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
new file mode 100644
index 0000000000..817ee9e67e
--- /dev/null
+++ b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
@@ -0,0 +1,25 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
+
+  texidoc = "
+Another way to put the time signature in parenthesis
+
+"
+  doctitle = "Time signature in parentheses - method 3"
+} % begin verbatim
+
+
+\relative c'' {
+  \override Staff.TimeSignature #'stencil = #(lambda (grob)
+    (parenthesize-stencil (ly:time-signature::print grob) 0.1 0.4 0.4 0.1 ))
+  \time 2/4
+  a4 b8 c
+}
diff --git a/Documentation/snippets/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
index 4e8d3a34de..05eb0de0cf 100644
--- a/Documentation/snippets/time-signature-in-parentheses.ly
+++ b/Documentation/snippets/time-signature-in-parentheses.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides"
+  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
 
   texidoc = "
 The time signature can be enclosed within parentheses.
@@ -16,6 +16,7 @@ The time signature can be enclosed within parentheses.
   doctitle = "Time signature in parentheses"
 } % begin verbatim
 
+
 \relative c'' {
   \override Staff.TimeSignature #'stencil = #(lambda (grob)
     (bracketify-stencil (ly:time-signature::print grob) Y 0.1 0.2 0.1))
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 072307e41b..7cee5aecb0 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -53,6 +53,7 @@ the single-digit style to only one time signature, use the
   doctitle = "Time signature printing only the numerator as a number (instead of the fraction)"
 } % begin verbatim
 
+
 \relative c'' {
   \time 3/4
   c4 c c
diff --git a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
index 727fc56387..c8133e210e 100644
--- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
+++ b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, tweaks-and-overrides"
+  lsrtags = "specific-notation, ancient-notation, workaround, tweaks-and-overrides"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -32,6 +32,7 @@ main lyrics.
   doctitle = "Transcription of Ancient music with incipit"
 } % begin verbatim
 
+
 global = {
   \set Score.skipBars = ##t
   \key g \major
diff --git a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 9735ef2f1e..460c00f348 100644
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "pitches"
+  lsrtags = "workaround, pitches, scheme-language"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 doctitlees = "Transportar música con el menor número de alteraciones"
@@ -152,6 +152,7 @@ In this manner, the most natural enharmonic notes are chosen.
   doctitle = "Transposing pitches with minimum accidentals (\"Smart\" transpose)"
 } % begin verbatim
 
+
 #(define (naturalize-pitch p)
    (let ((o (ly:pitch-octave p))
          (a (* 4 (ly:pitch-alteration p)))
diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index 09e4292523..f7ae4b0e74 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
@@ -184,6 +184,7 @@ line, they do not.
   doctitle = "Tweaking clef properties"
 } % begin verbatim
 
+
 \layout { ragged-right = ##t }
 
 {
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index b16d338a41..56f83b327a 100644
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.25"
+\version "2.15.32"
 
 \header {
-  lsrtags = "rhythms, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -62,6 +62,7 @@ up, and changes the default note heads to crosses.
   doctitle = "Tweaking grace layout within music"
 } % begin verbatim
 
+
 \relative c'' {
   \new Staff {
     $(remove-grace-property 'Voice 'Stem 'direction)
diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list
index 2a20fe2191..e3f35bc165 100644
--- a/Documentation/snippets/tweaks-and-overrides.snippet-list
+++ b/Documentation/snippets/tweaks-and-overrides.snippet-list
@@ -70,6 +70,7 @@ setting-system-separators.ly
 showing-the-same-articulation-above-and-below-a-note-or-chord.ly
 string-number-extender-lines.ly
 suppressing-warnings-for-clashing-note-columns.ly
+time-signature-in-parentheses---method-3.ly
 time-signature-in-parentheses.ly
 time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
 transcription-of-ancient-music-with-incipit.ly
diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 709a3997c6..31ed44ac7c 100644
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -1,10 +1,21 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.15.32"
+
+\header {
+  lsrtags = "headword"
+
+  texidoc = "
+Unfretted headword
+
+"
+  doctitle = "Unfretted headword"
+} % begin verbatim
+
 % #!lilypond lcp-extract.ly -*- coding: utf-8; -*-
 
 %%%
@@ -28,19 +39,8 @@
 %% Statement Date: Octber the 9th, 2008
 
 
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
-
-
-
-\version "2.14.0"
-#(set-global-staff-size 15)
-
 %%%
-%%% Abreviations
+%%% Abbreviations
 %%%
 
 db         = \markup { \musicglyph #"scripts.downbow" }
diff --git a/Documentation/snippets/unfretted-strings.snippet-list b/Documentation/snippets/unfretted-strings.snippet-list
index a6c6120a5c..102a6d9482 100644
--- a/Documentation/snippets/unfretted-strings.snippet-list
+++ b/Documentation/snippets/unfretted-strings.snippet-list
@@ -1,6 +1,6 @@
 changing--flageolet-mark-size.ly
 creating-slurs-across-voices.ly
 dotted-harmonics.ly
-snap-pizzicato-bartok-pizzicato.ly
+snap-pizzicato-or-bartok-pizzicato.ly
 string-quartet-template-simple.ly
 string-quartet-template-with-separate-parts.ly
diff --git a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
index 6258ceb9c8..3faa3738ea 100644
--- a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
+++ b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, staff-notation"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -48,6 +48,7 @@ context.
   doctitle = "Use square bracket at the start of a staff group"
 } % begin verbatim
 
+
 \score {
   \new StaffGroup { <<
   \set StaffGroup.systemStartDelimiter = #'SystemStartSquare
diff --git a/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly b/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
index fa7049dc59..f4307ba6b7 100644
--- a/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
+++ b/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, vocal-music"
+  lsrtags = "vocal-music, expressive-marks"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -51,6 +51,7 @@ often seen in choral music.
   doctitle = "Using arpeggioBracket to make divisi more visible"
 } % begin verbatim
 
+
 \include "english.ly"
 
 \score {
diff --git a/Documentation/snippets/using-double-slurs-for-legato-chords.ly b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
index f60d87ee70..a3e3edbcf2 100644
--- a/Documentation/snippets/using-double-slurs-for-legato-chords.ly
+++ b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -44,6 +44,7 @@ be achieved by setting @code{doubleSlurs}.
   doctitle = "Using double slurs for legato chords"
 } % begin verbatim
 
+
 \relative c' {
   \set doubleSlurs = ##t
   <c e>4( <d f> <c e> <d f>)
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 69eaf2e597..16e98228b8 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
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "devel, tweaks-and-overrides, scheme-language"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -48,12 +49,10 @@ Salida de ejemplo de la consola:
   doctitlees = "Utilizar ly:grob-object para acceder a los grobs con \\tweak"
 
 
-  lsrtags = "tweaks-and-overrides"
-
   texidoc = "
 Some grobs can be accessed @qq{laterally} from within another grob's
-callback.  These are usually listed as @qq{layout objects} in the
-@qq{Internal properties} section of a grob-interface.  The function
+callback. These are usually listed as @qq{layout objects} in the
+@qq{Internal properties} section of a grob-interface. The function
 @code{ly:grob-object} is used to access these grobs.
 
 
@@ -71,12 +70,8 @@ accessed.
 Example console output:
 
 
-@example
---------------------
-#-Grob Accidental -
-#-Grob Arpeggio -
-#-Grob Stem -
-@end example
+-------------------- #-Grob Accidental - #-Grob Arpeggio - #-Grob Stem -
+
 
 
 "
@@ -84,6 +79,7 @@ Example console output:
 } % begin verbatim
 
 
+
 #(define (notehead-get-accidental notehead)
    ;; notehead is grob
    (ly:grob-object notehead 'accidental-grob))
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 ff14f5a769..e42137ee41 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, really-cool, tweaks-and-overrides, scheme-language"
 
 %% Translation of GIT committish: 5a898cf43a2a78be6c3a58e4359dccd82196fbe7
   texidocfr = "
@@ -28,6 +28,7 @@ This example shows how a parallelogram-shaped note head is generated.
   doctitle = "Using PostScript to generate special note head shapes"
 } % begin verbatim
 
+
 parallelogram =
   #(ly:make-stencil (list 'embedded-ps
     "gsave
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 1e5bc644af..ffda278283 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,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, really-simple"
 
   texidoc = "
 With the @code{\\tweak} command, every grob can be tuned directly.
@@ -17,6 +17,7 @@ Here are some examples of available tweaks.
   doctitle = "Using the \\tweak command to tweak individual grobs"
 } % begin verbatim
 
+
 \relative c' {
   \time 2/4
   \set fingeringOrientations = #'(right)
diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly
index eb9a8fca9e..deddc277ad 100644
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "editorial-annotations, expressive-marks"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -33,26 +34,26 @@ enmascarada.
 
   doctitlees = "Uso de la propiedad whiteout"
 
-  lsrtags = "expressive-marks, editorial-annotations"
   texidoc = "
-Any graphical object can be printed over a white background to
-mask parts of objects that lie beneath.  This can be useful to
-improve the appearance of collisions in complex situations when
-repositioning objects is impractical.  It is necessary to explicitly
-set the @code{layer} property to control which objects are masked
-by the white background.
+Any graphical object can be printed over a white background to mask
+parts of objects that lie beneath.  This can be useful to improve the
+appearance of collisions in complex situations when repositioning
+objects is impractical.  It is necessary to explicitly set the
+@code{layer} property to control which objects are masked by the white
+background.
 
 In this example the collision of the tie with the time signature is
 improved by masking out the part of the tie that crosses the time
-signature by setting the @code{whiteout} property of @code{TimeSignature}.
-To do this @code{TimeSignature} is moved to a layer above @code{Tie}, which
-is left in the default layer of 1, and @code{StaffSymbol} is moved to a
-layer above @code{TimeSignature} so it is not masked.
+signature by setting the @code{whiteout} property of
+@code{TimeSignature}. To do this @code{TimeSignature} is moved to a
+layer above @code{Tie}, which is left in the default layer of 1, and
+@code{StaffSymbol} is moved to a layer above @code{TimeSignature} so it
+is not masked.
+
 "
   doctitle = "Using the whiteout property"
 } % begin verbatim
 
-
 {
   \override Score.StaffSymbol #'layer = #4
   \override Staff.TimeSignature #'layer = #3
diff --git a/Documentation/snippets/using-ties-with-arpeggios.ly b/Documentation/snippets/using-ties-with-arpeggios.ly
index 7b6ec8b43e..50adba052f 100644
--- a/Documentation/snippets/using-ties-with-arpeggios.ly
+++ b/Documentation/snippets/using-ties-with-arpeggios.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "rhythms"
@@ -56,6 +56,7 @@ can also be used for ordinary consecutive notes.
   doctitle = "Using ties with arpeggios"
 } % begin verbatim
 
+
 \relative c' {
   \set tieWaitForNote = ##t
   \grace { c16[ ~ e ~ g] ~ } <c, e g>2
diff --git a/Documentation/snippets/utf-8.ly b/Documentation/snippets/utf-8.ly
index de9b92d4d2..546af804e2 100644
--- a/Documentation/snippets/utf-8.ly
+++ b/Documentation/snippets/utf-8.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/version-specific.snippet-list b/Documentation/snippets/version-specific.snippet-list
new file mode 100644
index 0000000000..19de199217
--- /dev/null
+++ b/Documentation/snippets/version-specific.snippet-list
@@ -0,0 +1,8 @@
+flamenco-notation.ly
+horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
+makam-example.ly
+merging-multi-measure-rests-in-a-polyphonic-part.ly
+non-traditional-key-signatures.ly
+permitting-line-breaks-within-beamed-tuplets.ly
+reverting-default-beam-endings.ly
+showing-the-same-articulation-above-and-below-a-note-or-chord.ly
diff --git a/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly b/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
index aac584a965..1f368a1a34 100644
--- a/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
+++ b/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "expressive-marks, ancient-notation"
+  lsrtags = "ancient-notation, expressive-marks"
 
   texidoc = "
 This short vertical line placed above the note is commonly used in
@@ -19,6 +19,7 @@ demonstrates how to achieve such a notation.
   doctitle = "Vertical line as a baroque articulation mark"
 } % begin verbatim
 
+
 upline =
 #(let ((m (make-articulation "stopped")))
    (set! (ly:music-property m 'tweaks)
diff --git a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
index ea9412cd14..da434a3e0f 100644
--- a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
+++ b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, spacing"
+  lsrtags = "workaround, tweaks-and-overrides, spacing"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -68,6 +68,7 @@ The same idea is used to align the text scripts along their baseline.
   doctitle = "Vertically aligned dynamics and textscripts"
 } % begin verbatim
 
+
 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 38eb080029..4b8ae7e69d 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "expressive-marks"
@@ -30,6 +30,7 @@ of the @code{DynamicLineSpanner} object.
   doctitle = "Vertically aligning dynamics across multiple notes"
 } % begin verbatim
 
+
 \relative c' {
   \override DynamicLineSpanner #'staff-padding = #4
   c2\p f\mf
diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
index 15400cb6cb..d6601539fd 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "vocal-music, tweaks-and-overrides, spacing"
@@ -47,6 +47,7 @@ positioning of lyrics and ossias.
   doctitle = "Vertically aligning ossias and lyrics"
 } % begin verbatim
 
+
 \paper {
   ragged-right = ##t
 }
diff --git a/Documentation/snippets/vertically-centered-common-lyrics.ly b/Documentation/snippets/vertically-centered-common-lyrics.ly
index 1b56f6ff47..36738222f3 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.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
index f4cdb66e85..2b923de2de 100644
--- a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
+++ b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "chords, tweaks-and-overrides"
@@ -32,6 +32,7 @@ extender lines are vertically centered if
   doctitle = "Vertically centering paired figured bass extenders"
 } % begin verbatim
 
+
 <<
   \relative c' {
     c8 c b b a a c16 c b b
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 a9d1e6a4f3..4661b74dea 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "template, vocal-music, keyboards, automatic-notation"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 
@@ -62,8 +63,6 @@ sera automatiquement reportée dans la réduction pour piano.
 "
   doctitlefr = "Ensemble vocal avec réduction pour piano"
 
-  lsrtags = "vocal-music, keyboards, template"
-
   texidoc = "
 This template adds an automatic piano reduction to the standard SATB
 vocal score demonstrated in @qq{Vocal ensemble template}. This
@@ -71,6 +70,7 @@ demonstrates one of the strengths of LilyPond – you can use a music
 definition more than once. If any changes are made to the vocal notes
 (say, @code{tenorMusic}), then the changes will also apply to the piano
 reduction.
+
 "
   doctitle = "Vocal ensemble template with automatic piano reduction"
 } % begin verbatim
diff --git a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
index 40cf86676e..38111e089f 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "text, vocal-music, contexts-and-engravers, template"
+  lsrtags = "template, vocal-music, text, contexts-and-engravers"
 
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
@@ -63,6 +63,7 @@ using @code{alignAboveContext} and @code{alignBelowContext}.
   doctitle = "Vocal ensemble template with lyrics aligned below and above the staves"
 } % begin verbatim
 
+
 global = {
   \key c \major
   \time 4/4
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 01051224ff..a81fe9bc7e 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "template, vocal-music, contexts-and-engravers"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
@@ -54,13 +55,13 @@ communs à toutes les parties et pour l'intégralité du morceau.
 "
   doctitlefr = "Ensemble vocal avec couplet et refrain"
 
-  lsrtags = "vocal-music, contexts-and-engravers, template"
   texidoc = "
 This template creates a score which starts with a solo verse and
-continues into a refrain for two voices.  It also demonstrates the
-use of spacer rests within the @code{\\global} variable to define
-meter changes (and other elements common to all parts) throughout
-the entire score.
+continues into a refrain for two voices.  It also demonstrates the use
+of spacer rests within the @code{\\global} variable to define meter
+changes (and other elements common to all parts) throughout the entire
+score.
+
 "
   doctitle = "Vocal ensemble template with verse and refrain"
 } % begin verbatim
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index ec03c5d6b6..7c17454df3 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "template, vocal-music, really-simple"
+
 %% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 He aquí una partitura vocal estándar para cuatro voces SATB. Con
@@ -61,14 +62,13 @@ portées.
 "
   doctitlefr = "Ensemble vocal (simple)"
 
-  lsrtags = "vocal-music, template"
-
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
 it is often useful to include a section which is included in all parts.
 For example, the time signature and key signature are almost always the
 same for all parts. Like in the @qq{Hymn} template, the four voices are
 regrouped on only two staves.
+
 "
   doctitle = "Vocal ensemble template"
 } % begin verbatim
diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly
index 6991676199..22f47ad758 100644
--- a/Documentation/snippets/vocal-headword.ly
+++ b/Documentation/snippets/vocal-headword.ly
@@ -1,25 +1,20 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
+  lsrtags = "headword"
 
+  texidoc = "
+Vocal headword
+
+"
+  doctitle = "Vocal headword"
+} % begin verbatim
 
 \layout {
   \context {
diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
index e38fb6c94d..d38ce6d521 100644
--- a/Documentation/snippets/vocal-music.snippet-list
+++ b/Documentation/snippets/vocal-music.snippet-list
@@ -13,8 +13,8 @@ formatting-lyrics-syllables.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
 hymn-template.ly
 lyrics-alignment.ly
-lyrics-old-spacing-settings.ly
 marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+obtaining-2.12-lyrics-spacing-in-newer-versions.ly
 orchestra,-choir-and-piano-template.ly
 piano-template-with-melody-and-lyrics.ly
 putting-lyrics-inside-the-staff.ly
diff --git a/Documentation/snippets/volta-below-chords.ly b/Documentation/snippets/volta-below-chords.ly
index 68c703e726..b5a54865d8 100644
--- a/Documentation/snippets/volta-below-chords.ly
+++ b/Documentation/snippets/volta-below-chords.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
   lsrtags = "repeats, staff-notation, chords"
@@ -45,6 +45,7 @@ put under chords.
   doctitle = "Volta below chords"
 } % begin verbatim
 
+
 \score {
   <<
     \chords {
diff --git a/Documentation/snippets/volta-multi-staff.ly b/Documentation/snippets/volta-multi-staff.ly
index 030a54aa80..975ec83da9 100644
--- a/Documentation/snippets/volta-multi-staff.ly
+++ b/Documentation/snippets/volta-multi-staff.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "repeats, staff-notation"
+  lsrtags = "repeats, staff-notation, really-simple"
 
   texidoc = "
 By adding the @code{Volta_engraver} to the relevant staff, volte can be
@@ -17,6 +17,7 @@ put over staves other than the topmost one in a score.
   doctitle = "Volta multi staff"
 } % begin verbatim
 
+
 voltaMusic = \relative c'' {
   \repeat volta 2 {
     c1
diff --git a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
index b739b7b4c0..106b318a41 100644
--- a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
+++ b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.14.0"
+\version "2.14.2"
 
 \header {
-  lsrtags = "repeats, text"
+  lsrtags = "repeats, text, symbols-and-glyphs"
 
   texidoc = "
 Though volte are best specified using @code{\\repeat volta}, the
@@ -25,6 +25,7 @@ separate list elements:
   doctitle = "Volta text markup using repeatCommands"
 } % begin verbatim
 
+
 voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
 
 \relative c'' {
diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly
index 7e52280c0f..f6798a5a3e 100644
--- a/Documentation/snippets/wind-headword.ly
+++ b/Documentation/snippets/wind-headword.ly
@@ -1,26 +1,22 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
-#(set-global-staff-size 15)
-\paper {
-  line-width = 16\cm
-  indent = 0\cm
-}
-
-% NR 2.whatever  Wind
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
+  lsrtags = "headword"
 
+  texidoc = "
+Wind headword
 
+"
+  doctitle = "Wind headword"
+} % begin verbatim
+
+% NR 2.whatever  Wind
 % Tchaikovsky
 % Nutcracker Suite, VII Dance of the Merlitons
 \score {
@@ -28,10 +24,8 @@
     \new Staff \relative c'' {
       \set Staff.instrumentName = "Flauto I,II"
       \once \override Score.RehearsalMark #'self-alignment-X = #-1
-      \once \override Score.RehearsalMark #'break-align-symbols =
-#'(time-signature)
-      \once \override Score.TimeSignature
-#'break-align-anchor-alignment = #LEFT
+      \once \override Score.RehearsalMark #'break-align-symbols = #'(time-signature)
+      \once \override Score.TimeSignature #'break-align-anchor-alignment = #LEFT
       \once \override Score.RehearsalMark #'padding = #4
       \mark \markup \large \bold {Moderato assai}
       \key d \major
diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly
index 1f08d705f9..9e4830830a 100644
--- a/Documentation/snippets/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/woodwind-diagrams-listing.ly
@@ -1,13 +1,14 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.14.0
-\version "2.14.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
 
 \header {
+  lsrtags = "winds, specific-notation"
+
 %%%    Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 El fragmento de música que aparece a continuación presenta todos los
@@ -36,16 +37,14 @@ dont les doigtés sont disponibles à ce jour.
   doctitlefr = "Liste des diagrammes de doigtés pour bois"
 
 
-  lsrtags="winds"
-  texidoc="
+  texidoc = "
 The following music shows all of the woodwind diagrams currently
 defined in LilyPond.
+
 "
   doctitle = "Woodwind diagrams listing"
-
 } % begin verbatim
 
-
 \relative c' {
   \textLengthOn
   c1^
diff --git a/Documentation/snippets/workaround.snippet-list b/Documentation/snippets/workaround.snippet-list
new file mode 100644
index 0000000000..3d43a69835
--- /dev/null
+++ b/Documentation/snippets/workaround.snippet-list
@@ -0,0 +1,19 @@
+accordion-discant-symbols.ly
+adding-an-extra-staff-at-a-line-break.ly
+adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
+adjusting-lyrics-vertical-spacing.ly
+changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+creating-real-parenthesized-dynamics.ly
+cross-staff-chords---beaming-problems-workaround.ly
+displaying-complex-chords.ly
+double-glissando.ly
+faking-a-hammer-in-tablatures.ly
+forcing-measure-width-to-adapt-to-metronomemarks-width.ly
+making-some-staff-lines-thicker-than-the-others.ly
+marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+measure-counter.ly
+positioning-segno-and-coda-with-line-break.ly
+printing-text-from-right-to-left.ly
+transcription-of-ancient-music-with-incipit.ly
+transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+vertically-aligned-dynamics-and-textscripts.ly
diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely
index 8b38c1c46d..71f0dbe9f3 100644
--- a/Documentation/usage/lilypond-book.itely
+++ b/Documentation/usage/lilypond-book.itely
@@ -99,9 +99,9 @@ Options are put in brackets.
 Larger examples can be put into a separate file, and introduced with
 \verb+\lilypondfile+.
 
-\lilypondfile[quote,noindent]{screech-boink.ly}
+\lilypondfile[quote,noindent]{screech-and-boink.ly}
 
-(If needed, replace @file{screech-boink.ly} by any @file{.ly} file
+(If needed, replace @file{screech-and-boink.ly} by any @file{.ly} file
 you put in the same directory as this file.)
 
 \end{document}
@@ -158,7 +158,7 @@ c'4 f16
 Larger examples can be put into a separate file, and introduced with
 @code{\lilypondfile}.
 
-@lilypondfile[quote,noindent]{screech-boink.ly}
+@lilypondfile[quote,noindent]{screech-and-boink.ly}
 
 If a @code{tagline} is required, either default or custom, then the
 entire snippet must be enclosed in a @code{\book @{ @}} construct.
diff --git a/input/regression/lilypond-book/tex-verbatim.lytex b/input/regression/lilypond-book/tex-verbatim.lytex
index efd6e7baa7..8d0b71c31e 100644
--- a/input/regression/lilypond-book/tex-verbatim.lytex
+++ b/input/regression/lilypond-book/tex-verbatim.lytex
@@ -28,7 +28,7 @@ c d e
 % TODO: These do not yet work, as \verb is explicitly disabled in lilypond-book for now!
 % \verb|\begin{lilypond}[fragment]c d e\end{lilypond}|
 
-% \verb+\lilypondfile[quote,noindent]{screech-boink.ly}+
+% \verb+\lilypondfile[quote,noindent]{screech-and-boink.ly}+
 
 Neither does a verbatim inside verb:
 
-- 
2.39.2