From 8ffecf6be17c6ec2ff87cf31873121a8cce29b09 Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Thu, 24 Jul 2014 15:17:57 +0100
Subject: [PATCH] Import snippets from LSR and delete initial batch in
 snippets/new

---
 Documentation/es/notation/keyboards.itely     |   2 +-
 Documentation/fr/notation/keyboards.itely     |   2 +-
 Documentation/notation/keyboards.itely        |   2 +-
 .../snippets/accordion-discant-symbols.ly     |  29 +-
 .../snippets/accordion-register-symbols.ly    |  46 +++
 Documentation/snippets/accordion-registers.ly |  40 ---
 ...a-figured-bass-above-or-below-the-notes.ly |  23 +-
 .../snippets/adding-ambitus-per-voice.ly      |   5 +-
 .../adding-an-extra-staff-at-a-line-break.ly  |   5 +-
 .../snippets/adding-an-extra-staff.ly         |   5 +-
 ...ing-an-ottava-marking-to-a-single-voice.ly |   4 +-
 .../adding-bar-lines-to-chordnames-context.ly |   6 +-
 ...hen-using-tuplet-and-non-tuplet-rhythms.ly |   5 +-
 Documentation/snippets/adding-drum-parts.ly   |   5 +-
 .../adding-extra-fingering-with-scheme.ly     |  21 +-
 .../snippets/adding-fingerings-to-a-score.ly  |   5 +-
 .../adding-fingerings-to-tablatures.ly        |   6 +-
 ...to-staves-which-get-split-after-a-break.ly | 135 ++++++---
 .../snippets/adding-links-to-objects.ly       |   4 +-
 ...adding-orchestral-cues-to-a-vocal-score.ly |  16 +-
 ...ound-an-expressive-mark-or-chordal-note.ly |   5 +-
 .../adding-the-current-date-to-a-score.ly     |   5 +-
 .../adding-timing-marks-to-long-glissandi.ly  |  28 +-
 ...ing-volta-brackets-to-additional-staves.ly |   5 +-
 .../additional-voices-to-avoid-collisions.ly  |   4 +-
 .../snippets/adjusting-grace-note-spacing.ly  |   5 +-
 .../adjusting-lyrics-vertical-spacing.ly      |   6 +-
 .../adjusting-the-shape-of-falls-and-doits.ly |   4 +-
 ...aligning-and-centering-instrument-names.ly |   5 +-
 .../snippets/aligning-bar-numbers.ly          |   5 +-
 ...-objects-created-with-the--mark-command.ly |   5 +-
 .../aligning-syllables-with-melisma.ly        |   2 +-
 ...ngerings-to-be-printed-inside-the-staff.ly |   5 +-
 .../altering-the-length-of-beamed-stems.ly    |   5 +-
 .../snippets/alternative-bar-numbering.ly     |  24 +-
 .../snippets/alternative-breve-notes.ly       |   4 +-
 .../snippets/ambitus-with-multiple-voices.ly  |   5 +-
 Documentation/snippets/ambitus.ly             |   5 +-
 .../analysis-brackets-above-the-staff.ly      |   6 +-
 Documentation/snippets/ancient-fonts.ly       |  33 +-
 Documentation/snippets/ancient-headword.ly    |   4 +-
 ...modern-transcription-of-gregorian-music.ly |  18 +-
 ...-modern-transcription-of-mensural-music.ly |   5 +-
 .../snippets/ancient-time-signatures.ly       |   5 +-
 .../snippets/anglican-psalm-template.ly       |   5 +-
 ...yles-depending-on-the-step-of-the-scale.ly |   4 +-
 .../snippets/arabic-improvisation.ly          |   5 +-
 Documentation/snippets/asymmetric-slurs.ly    |   5 +-
 .../snippets/automatic-beam-subdivisions.ly   |   4 +-
 .../automatically-change-durations.ly         |  11 +-
 ...-of-the-middle-note-based-on-the-melody.ly |  10 +-
 ...oiding-collisions-with-chord-fingerings.ly |  10 +-
 ...-notation-for-guitar-with-text-spanner.ly} |  27 +-
 .../snippets/beam-endings-in-score-context.ly |   5 +-
 .../snippets/beam-grouping-in-7-8-time.ly     |   4 +-
 .../snippets/beams-across-line-breaks.ly      |   5 +-
 ...staff-lines-using-the--whiteout-command.ly |   8 +-
 Documentation/snippets/book-parts.ly          |   5 +-
 Documentation/snippets/breathing-signs.ly     |   5 +-
 .../snippets/broken-crescendo-hairpin.ly      |  33 +-
 .../caesura-railtracks-with-fermata.ly        |  15 +-
 .../center-text-below-hairpin-dynamics.ly     |  72 ++---
 .../snippets/centered-measure-numbers.ly      |  27 +-
 ...ring-markup-on-note-heads-automatically.ly |  26 +-
 .../snippets/changing--flageolet-mark-size.ly |   5 +-
 ...changing-a-single-notes-size-in-a-chord.ly |   5 +-
 .../snippets/changing-beam-knee-gap.ly        |   5 +-
 .../changing-beam-thickness-and-spacing.ly    |  32 ++
 .../snippets/changing-chord-separator.ly      |   5 +-
 .../changing-form-of-multi-measure-rests.ly   |   5 +-
 .../snippets/changing-fret-orientations.ly    |   5 +-
 ...ng-midi-output-to-one-channel-per-voice.ly |  12 +-
 .../snippets/changing-partcombine-texts.ly    |   5 +-
 ...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      |   4 +-
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly |   5 +-
 .../changing-the-breath-mark-symbol.ly        |   4 +-
 ...names-to-german-or-semi-german-notation.ly |  35 ++-
 .../changing-the-default-text-font-family.ly  |   5 +-
 ...ging-the-interval-of-lines-on-the-stave.ly |   5 +-
 ...he-number-of-augmentation-dots-per-note.ly |   4 +-
 ...changing-the-number-of-lines-in-a-staff.ly |   5 +-
 ...e-positions-of-figured-bass-alterations.ly |   5 +-
 .../changing-the-size-of-woodwind-diagrams.ly |   4 +-
 .../snippets/changing-the-staff-size.ly       |   5 +-
 ...ging-the-tempo-without-a-metronome-mark.ly |   5 +-
 .../changing-the-text-for-sustain-markings.ly |   5 +-
 .../snippets/changing-the-tuplet-number.ly    |  24 +-
 ...olymetric-section-using--scaledurations.ly |  29 +-
 .../snippets/chant-or-psalms-notation.ly      |  22 +-
 .../snippets/chord-glissando-in-tablature.ly  |  21 +-
 .../snippets/chord-name-exceptions.ly         |   5 +-
 Documentation/snippets/chord-name-major7.ly   |   5 +-
 .../snippets/chordchanges-for-fretboards.ly   |   4 +-
 Documentation/snippets/chords-headword.ly     |  24 +-
 Documentation/snippets/chords.snippet-list    |   2 +-
 ...-can-be-transposed-by-arbitrary-amounts.ly |   5 +-
 Documentation/snippets/clip-systems.ly        |   5 +-
 Documentation/snippets/clusters.ly            |   5 +-
 ...coloring-notes-depending-on-their-pitch.ly |   4 +-
 .../combining-dynamics-with-markup-texts.ly   |   7 +-
 .../combining-two-parts-on-the-same-staff.ly  |   5 +-
 .../snippets/compound-time-signatures.ly      |  28 +-
 ...onducting-signs,-measure-grouping-signs.ly |  47 ++-
 .../consistently-left-aligned-bar-numbers.ly  |   6 +-
 .../snippets/contemporary-glissando.ly        |   5 +-
 ...g-spanner-visibility-after-a-line-break.ly |   4 +-
 ...lling-the-placement-of-chord-fingerings.ly |   5 +-
 ...olling-the-vertical-ordering-of-scripts.ly |   5 +-
 .../controlling-tuplet-bracket-visibility.ly  |   8 +-
 .../snippets/correction-wanted.snippet-list   |   1 -
 .../snippets/creating-a-delayed-turn.ly       |  21 +-
 ...eggios-across-notes-in-different-voices.ly |   5 +-
 .../snippets/creating-blank-staves.ly         |  20 +-
 ...-cross-staff-arpeggios-in-a-piano-staff.ly |   5 +-
 ...cross-staff-arpeggios-in-other-contexts.ly |   5 +-
 .../creating-double-digit-fingerings.ly       |  17 +-
 ...creating-metronome-marks-in-markup-mode.ly |   5 +-
 .../creating-real-parenthesized-dynamics.ly   |  16 +-
 .../creating-simultaneous-rehearsal-marks.ly  |   6 +-
 .../snippets/creating-slurs-across-voices.ly  |   5 +-
 .../snippets/creating-text-spanners.ly        |   5 +-
 ...ff-chords---beaming-problems-workaround.ly |   9 +-
 Documentation/snippets/cross-staff-stems.ly   |  29 +-
 .../snippets/cross-staff-tremolos.ly          |   5 +-
 Documentation/snippets/custodes.ly            |   5 +-
 .../customizing-fretboard-fret-diagrams.ly    |   5 +-
 .../customizing-markup-fret-diagrams.ly       |   5 +-
 ...number-of-dots-in-repeat-sign-bar-lines.ly |  76 +++++
 ...f-stems-on-the-center-line-of-the-staff.ly |   5 +-
 ...efined-fretboards-for-other-instruments.ly |   7 +-
 .../snippets/demo-midiinstruments.ly          |   5 +-
 .../snippets/demonstrating-all-headers.ly     |   5 +-
 ...bracket-with-only-one-staff-in-a-system.ly |   4 +-
 ...stem-if-only-one-of-its-staves-is-alive.ly |  10 +-
 .../snippets/displaying-complex-chords.ly     |  12 +-
 .../snippets/displaying-grob-ancestry.ly      |   9 +-
 Documentation/snippets/dotted-harmonics.ly    |   5 +-
 Documentation/snippets/double-glissando.ly    |   5 +-
 .../snippets/drawing-boxes-around-grobs.ly    |   6 +-
 .../drawing-circles-around-note-heads.ly      |   6 +-
 .../drawing-circles-around-various-objects.ly |   4 +-
 .../dynamics-custom-text-spanner-postfix.ly   |   4 +-
 .../snippets/dynamics-text-spanner-postfix.ly |   4 +-
 Documentation/snippets/editorial-headword.ly  |   6 +-
 ...ng-native-postscript-in-a--markup-block.ly |   5 +-
 .../snippets/engravers-one-by-one.ly          |   3 +-
 .../snippets/engraving-ties-manually.ly       |   5 +-
 .../engraving-tremolos-with-floating-beams.ly |   5 +-
 .../snippets/extending-a-trillspanner.ly      |  37 +++
 .../snippets/faking-a-hammer-in-tablatures.ly |   5 +-
 .../snippets/figured-bass-headword.ly         |   6 +-
 .../snippets/fine-tuning-pedal-brackets.ly    |   5 +-
 .../fingering-symbols-for-wind-instruments.ly |  28 +-
 ...-indications,-and-right-hand-fingerings.ly |   5 +-
 Documentation/snippets/flamenco-notation.ly   | 183 +++++------
 Documentation/snippets/flute-slap-notation.ly |   5 +-
 .../forcing-a-clef-symbol-to-be-displayed.ly  |   5 +-
 .../forcing-horizontal-shift-of-notes.ly      |   5 +-
 .../snippets/forcing-hyphens-to-be-shown.ly   |   5 +-
 ...-width-to-adapt-to-metronomemarks-width.ly |  18 +-
 ...-to-start-from-a-given-letter-or-number.ly |   5 +-
 .../snippets/formatting-lyrics-syllables.ly   |   4 +-
 .../fret-diagrams-explained-and-developed.ly  |   5 +-
 .../snippets/fretboards-alternate-tables.ly   |   4 +-
 .../fretted-string-harmonics-in-tablature.ly  |   7 +-
 .../snippets/fretted-strings.snippet-list     |   2 +-
 .../snippets/generating-random-notes.ly       |   5 +-
 ...arts-in-scheme-without-using-the-parser.ly |   5 +-
 .../graphical-and-text-woodwind-diagrams.ly   |   4 +-
 .../grid-lines--changing-their-appearance.ly  |   5 +-
 ...izing-rhythms-and-notes-synchronization.ly |   5 +-
 .../snippets/guitar-strum-rhythms.ly          |   5 +-
 .../hairpins-with-different-line-styles.ly    |   5 +-
 ...tied-notes-at-the-start-of-a-new-system.ly |   6 +-
 ...ing-the-extender-line-for-text-dynamics.ly |   5 +-
 .../how-to-change-fret-diagram-position.ly    |   7 +-
 ...ove-and-below-the-same-barline-method-2.ly |   5 +-
 ...to-put-ties-between-syllables-in-lyrics.ly |   5 +-
 Documentation/snippets/hymn-template.ly       |   5 +-
 ...ross-staff-chords-with-arpeggio-bracket.ly |   5 +-
 Documentation/snippets/inserting-a-caesura.ly |   5 +-
 .../snippets/isolated-percent-repeats.ly      |   5 +-
 .../snippets/keep-change-clefs-full-sized.ly  |   5 +-
 Documentation/snippets/keyboards.snippet-list |   3 +-
 Documentation/snippets/laissez-vibrer-ties.ly |   5 +-
 .../snippets/letter-tablature-formatting.ly   |   5 +-
 Documentation/snippets/line-arrows.ly         |   5 +-
 Documentation/snippets/lyrics-alignment.ly    |   4 +-
 Documentation/snippets/makam-example.ly       |   3 +-
 ...aking-slurs-with-complex-dash-structure.ly |   4 +-
 ...ome-staff-lines-thicker-than-the-others.ly |   4 +-
 ...ed-bass-extenders-for-only-some-numbers.ly |   5 +-
 .../manually-controlling-beam-positions.ly    |   5 +-
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |   5 +-
 Documentation/snippets/markup-lines.ly        |  18 +-
 Documentation/snippets/measure-counter.ly     |   4 +-
 ...che-layout-bar-lines-between-the-staves.ly |   6 +-
 ...ues-for-articulation-shorthand-notation.ly |  15 +-
 .../moving-dotted-notes-in-polyphony.ly       |  10 +-
 .../moving-slur-positions-vertically.ly       |   5 +-
 .../snippets/multi-measure-rest-markup.ly     |   4 +-
 Documentation/snippets/nesting-staves.ly      |   5 +-
 .../snippets/new/accordion-discant-symbols.ly | 176 -----------
 .../snippets/new/accordion-registers.ly       |  32 --
 ...a-figured-bass-above-or-below-the-notes.ly |  42 ---
 .../new/adding-extra-fingering-with-scheme.ly |  39 ---
 ...adding-orchestral-cues-to-a-vocal-score.ly |  80 -----
 .../adding-timing-marks-to-long-glissandi.ly  |  48 ---
 .../snippets/new/alternative-bar-numbering.ly |  27 --
 Documentation/snippets/new/ancient-fonts.ly   | 225 --------------
 ...modern-transcription-of-gregorian-music.ly |  51 ----
 ...-notation-for-guitar--with-text-spanner.ly |  63 ----
 .../snippets/new/broken-crescendo-hairpin.ly  |  42 ---
 .../snippets/new/centered-measure-numbers.ly  |  48 ---
 ...ring-markup-on-note-heads-automatically.ly |  57 ----
 .../new/changing-the-tuplet-number.ly         |  23 --
 ...olymetric-section-using--scaledurations.ly |  39 ---
 .../snippets/new/chant-or-psalms-notation.ly  |  30 --
 Documentation/snippets/new/chords-headword.ly |  95 ------
 .../snippets/new/compound-time-signatures.ly  |  22 --
 ...onducting-signs,-measure-grouping-signs.ly |  49 ---
 .../snippets/new/creating-a-delayed-turn.ly   |  37 ---
 .../new/creating-double-digit-fingerings.ly   |  17 --
 .../creating-real-parenthesized-dynamics.ly   |  35 ---
 .../snippets/new/cross-staff-stems.ly         |  36 ---
 .../snippets/non-default-tuplet-numbers.ly    |   6 +-
 ...g-2.12-lyrics-spacing-in-newer-versions.ly |  14 +-
 .../open-string-harmonics-in-tablature.ly     |  59 ++--
 .../orchestra,-choir-and-piano-template.ly    |   5 +-
 Documentation/snippets/ottava-text.ly         |   5 +-
 .../snippets/outputting-the-version-number.ly |   5 +-
 ...erriding-articulations-of-destinct-type.ly |   4 +-
 Documentation/snippets/page-label.ly          |   5 +-
 .../snippets/partcombine-and-autobeamoff.ly   |   5 +-
 .../percent-repeat-count-visibility.ly        |   5 +-
 .../snippets/percent-repeat-counter.ly        |   5 +-
 Documentation/snippets/percussion-beaters.ly  |   5 +-
 ...tting-line-breaks-within-beamed-tuplets.ly |   5 +-
 .../snippets/piano-template-simple.ly         |   5 +-
 .../piano-template-with-centered-lyrics.ly    |   5 +-
 .../piano-template-with-melody-and-lyrics.ly  |   5 +-
 .../placement-of-right-hand-fingerings.ly     |   5 +-
 .../snippets/polyphony-in-tablature.ly        |   5 +-
 .../snippets/positioning-arpeggios.ly         |   5 +-
 ...tioning-fingering-indications-precisely.ly |  15 +-
 ...eams-at-the-height-of-normal-note-beams.ly |   5 +-
 ...tioning-grace-notes-with-floating-space.ly |   5 +-
 ...itioning-segno-and-coda-with-line-break.ly |  44 +--
 .../positioning-text-markups-inside-slurs.ly  |   5 +-
 ...naturals-from-being-automatically-added.ly |   4 +-
 ...g-final-mark-from-removing-final-tuplet.ly |   6 +-
 ...-printed-when-the-key-signature-changes.ly |   5 +-
 ...repeat-sign-at-the-beginning-of-a-piece.ly |  26 ++
 ...inting-bar-numbers-at-regular-intervals.ly |   5 +-
 ...ing-bar-numbers-inside-boxes-or-circles.ly |   5 +-
 ...nting-hairpins-using-al-niente-notation.ly |   5 +-
 .../printing-marks-at-the-end-of-a-line.ly    |   5 +-
 .../snippets/printing-marks-on-every-staff.ly |   5 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly |  10 +-
 ...ng-music-with-different-time-signatures.ly |   4 +-
 ...names-with-and-without-an-octave-marker.ly |   5 +-
 .../printing-text-from-right-to-left.ly       |   5 +-
 ...ng-the-bar-number-for-the-first-measure.ly |   8 +-
 .../proportional-strict-notespacing.ly        |   7 +-
 .../putting-lyrics-inside-the-staff.ly        |  10 +-
 .../snippets/quoting-another-voice.ly         |   5 +-
 .../snippets/recorder-fingering-chart.ly      |   4 +-
 .../removing-bar-numbers-from-a-score.ly      |   9 +-
 ...ving-brace-on-first-line-of-piano-score.ly |  44 +++
 ...n-staffgroup,-pianostaff,-or-grandstaff.ly |   5 +-
 .../snippets/removing-the-first-empty-line.ly |   5 +-
 Documentation/snippets/repeats-headword.ly    |   7 +-
 Documentation/snippets/repeats.snippet-list   |   1 +
 Documentation/snippets/rest-styles.ly         |   5 +-
 .../reverting-default-beam-endings.ly         |   5 +-
 Documentation/snippets/rhythmic-slashes.ly    |   5 +-
 Documentation/snippets/rhythms-headword.ly    |  10 +-
 Documentation/snippets/rhythms.snippet-list   |   2 +
 .../satb-choir-template---four-staves.ly      |   3 +-
 .../snippets/scheme-language.snippet-list     |   1 +
 Documentation/snippets/screech-and-boink.ly   |   4 +-
 ...ancellations-from-key-signature-changes.ly |   4 +-
 .../setting-hairpin-behavior-at-bar-lines.ly  |   5 +-
 .../snippets/setting-system-separators.ly     |   5 +-
 ...ing-the-double-repeat-default-for-volte.ly |   4 +-
 .../setting-the-minimum-length-of-hairpins.ly |   6 +-
 .../snippets/shortening-volta-brackets.ly     |   5 +-
 .../snippets/showing-chords-at-changes.ly     |   6 +-
 ...ulation-above-and-below-a-note-or-chord.ly |   5 +-
 Documentation/snippets/simple-lead-sheet.ly   |   5 +-
 .../snippets/simultaneous-headword.ly         |  27 +-
 ...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 |   7 +-
 ...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 |   7 +-
 .../snap-pizzicato-or-bartok-pizzicato.ly     |   4 +-
 .../snippets/specific-notation.snippet-list   |   2 +-
 .../snippets/staff-notation.snippet-list      |   2 +
 .../snippets/stand-alone-two-column-markup.ly |   4 +-
 .../stem-and-beam-behavior-in-tablature.ly    |   5 +-
 Documentation/snippets/stemlets.ly            |   5 +-
 .../string-quartet-template-simple.ly         |   5 +-
 ...ng-quartet-template-with-separate-parts.ly |   5 +-
 Documentation/snippets/subdividing-beams.ly   |   4 +-
 ...sing-warnings-for-clashing-note-columns.ly |   5 +-
 .../snippets/symbols-and-glyphs.snippet-list  |   3 +-
 .../syntax-and-expressions.snippet-list       |   1 +
 Documentation/snippets/table-of-contents.ly   |   7 +-
 Documentation/snippets/text-headword.ly       |   9 +-
 Documentation/snippets/three-sided-box.ly     |   5 +-
 Documentation/snippets/tick-bar-lines.ly      |   5 +-
 ...ime-signature-in-parentheses---method-3.ly |   7 +-
 .../snippets/time-signature-in-parentheses.ly |   7 +-
 ...tor-as-a-number-instead-of-the-fraction.ly |   9 +-
 ...scription-of-ancient-music-with-incipit.ly | 286 +++++++++---------
 ...ith-minimum-accidentals-smart-transpose.ly |   5 +-
 .../tuplet-bracket-and-change-staff.ly        |  54 ++++
 .../snippets/tweaking-clef-properties.ly      |  13 +-
 .../tweaking-grace-layout-within-music.ly     |   5 +-
 .../tweaks-and-overrides.snippet-list         |   6 +
 ...e-bracket-at-the-start-of-a-staff-group.ly |   5 +-
 ...ggiobracket-to-make-divisi-more-visible.ly |   9 +-
 ...ing-autochange-with-more-than-one-voice.ly |   4 +-
 .../using-double-slurs-for-legato-chords.ly   |   5 +-
 ...grob-object-to-access-grobs-with--tweak.ly |  14 +-
 ...pt-to-generate-special-note-head-shapes.ly |   5 +-
 ...tweak-command-to-tweak-individual-grobs.ly |   5 +-
 .../snippets/using-the-whiteout-property.ly   |   4 +-
 .../snippets/using-ties-with-arpeggios.ly     |   5 +-
 Documentation/snippets/utf-8.ly               |   4 +-
 ...roups-without-connecting-systemstartbar.ly |   4 +-
 ...cal-line-as-a-baroque-articulation-mark.ly |   5 +-
 ...aligning-dynamics-across-multiple-notes.ly |   5 +-
 .../vertically-aligning-ossias-and-lyrics.ly  |   5 +-
 .../vertically-centered-common-lyrics.ly      |  76 ++---
 ...centering-paired-figured-bass-extenders.ly |   5 +-
 ...template-with-automatic-piano-reduction.ly |   5 +-
 ...rics-aligned-below-and-above-the-staves.ly |   5 +-
 ...nsemble-template-with-verse-and-refrain.ly |   5 +-
 .../snippets/vocal-ensemble-template.ly       |   5 +-
 Documentation/snippets/vocal-headword.ly      |  15 +-
 Documentation/snippets/volta-below-chords.ly  |   5 +-
 Documentation/snippets/volta-multi-staff.ly   |   5 +-
 .../volta-text-markup-using-repeatcommands.ly |   5 +-
 Documentation/snippets/wind-headword.ly       |   7 +-
 .../snippets/woodwind-diagrams-listing.ly     |   8 +-
 353 files changed, 1830 insertions(+), 2954 deletions(-)
 create mode 100644 Documentation/snippets/accordion-register-symbols.ly
 delete mode 100644 Documentation/snippets/accordion-registers.ly
 rename Documentation/snippets/{bar-chords-notation-for-guitar--with-text-spanner.ly => bar-chords-notation-for-guitar-with-text-spanner.ly} (82%)
 create mode 100644 Documentation/snippets/changing-beam-thickness-and-spacing.ly
 create mode 100644 Documentation/snippets/customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly
 create mode 100644 Documentation/snippets/extending-a-trillspanner.ly
 delete mode 100644 Documentation/snippets/new/accordion-discant-symbols.ly
 delete mode 100644 Documentation/snippets/new/accordion-registers.ly
 delete mode 100644 Documentation/snippets/new/adding-a-figured-bass-above-or-below-the-notes.ly
 delete mode 100644 Documentation/snippets/new/adding-extra-fingering-with-scheme.ly
 delete mode 100644 Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly
 delete mode 100644 Documentation/snippets/new/adding-timing-marks-to-long-glissandi.ly
 delete mode 100644 Documentation/snippets/new/alternative-bar-numbering.ly
 delete mode 100644 Documentation/snippets/new/ancient-fonts.ly
 delete mode 100644 Documentation/snippets/new/ancient-notation-template----modern-transcription-of-gregorian-music.ly
 delete mode 100644 Documentation/snippets/new/bar-chords-notation-for-guitar--with-text-spanner.ly
 delete mode 100644 Documentation/snippets/new/broken-crescendo-hairpin.ly
 delete mode 100644 Documentation/snippets/new/centered-measure-numbers.ly
 delete mode 100644 Documentation/snippets/new/centering-markup-on-note-heads-automatically.ly
 delete mode 100644 Documentation/snippets/new/changing-the-tuplet-number.ly
 delete mode 100644 Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
 delete mode 100644 Documentation/snippets/new/chant-or-psalms-notation.ly
 delete mode 100644 Documentation/snippets/new/chords-headword.ly
 delete mode 100644 Documentation/snippets/new/compound-time-signatures.ly
 delete mode 100644 Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
 delete mode 100644 Documentation/snippets/new/creating-a-delayed-turn.ly
 delete mode 100644 Documentation/snippets/new/creating-double-digit-fingerings.ly
 delete mode 100644 Documentation/snippets/new/creating-real-parenthesized-dynamics.ly
 delete mode 100644 Documentation/snippets/new/cross-staff-stems.ly
 create mode 100644 Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
 create mode 100644 Documentation/snippets/removing-brace-on-first-line-of-piano-score.ly
 create mode 100644 Documentation/snippets/tuplet-bracket-and-change-staff.ly

diff --git a/Documentation/es/notation/keyboards.itely b/Documentation/es/notation/keyboards.itely
index 793e1fab8b..f512aebf73 100644
--- a/Documentation/es/notation/keyboards.itely
+++ b/Documentation/es/notation/keyboards.itely
@@ -618,7 +618,7 @@ ejecución.
 @snippets
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{accordion-registers.ly}
+{accordion-register-symbols.ly}
 
 @seealso
 Fragmentos de código:
diff --git a/Documentation/fr/notation/keyboards.itely b/Documentation/fr/notation/keyboards.itely
index 5f0075d66a..8bbdaf0b0b 100644
--- a/Documentation/fr/notation/keyboards.itely
+++ b/Documentation/fr/notation/keyboards.itely
@@ -607,7 +607,7 @@ pour exécuter un morceau.
 
 @snippets
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{accordion-registers.ly}
+{accordion-register-symbols.ly}
 
 @seealso
 Morceaux choisis :
diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely
index 4ee9cee885..d9213d98f9 100644
--- a/Documentation/notation/keyboards.itely
+++ b/Documentation/notation/keyboards.itely
@@ -580,7 +580,7 @@ come into use to simplify the performance instructions.
 @snippets
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
-{accordion-registers.ly}
+{accordion-register-symbols.ly}
 
 @seealso
 Snippets:
diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 505bda3c57..0cecbfdc91 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -1,28 +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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "keyboards, specific-notation, symbols-and-glyphs, workaround"
 
   texidoc = "
 This snippet has been obsoleted by predefined markup commands, see
-@ruser{Accordion Registers}.  It's still useful as a simple
-demonstration of how to combine symbols: the placement of the symbols
-added with @code{\\markup} can be tweaked by changing the
-@code{\\translate-scaled} arguments.  @code{\\translate-scaled} is
-used here rather than @code{\\translate} in order to let the
-positioning of the symbol parts adapt to changes of @code{font-size}.
+'Accordion Registers' in the Notation Reference.  It's still useful as
+a simple demonstration of how to combine symbols: the placement of the
+symbols added with @code{\\markup} can be tweaked by changing the
+@code{\\translate-scaled} arguments.  @code{\\translate-scaled} is used
+here rather than @code{\\translate} in order to let the positioning of
+the symbol parts adapt to changes of @code{font-size}.
+
 "
   doctitle = "Accordion-discant symbols"
 } % begin verbatim
 
-
 discant = \markup {
   \musicglyph #"accordion.discant"
 }
diff --git a/Documentation/snippets/accordion-register-symbols.ly b/Documentation/snippets/accordion-register-symbols.ly
new file mode 100644
index 0000000000..deba1eeb93
--- /dev/null
+++ b/Documentation/snippets/accordion-register-symbols.ly
@@ -0,0 +1,46 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "keyboards, specific-notation, symbols-and-glyphs"
+
+  texidoc = "
+Accordion register symbols are available as @code{\\markup} as well as
+as standalone music events (as register changes tend to occur between
+actual music events.  Bass registers are not overly standardized.  The
+available commands can be found in 'Accordion Registers' in the
+Notation Reference.
+
+"
+  doctitle = "Accordion register symbols"
+} % begin verbatim
+
+#(use-modules (scm accreg))
+
+\new PianoStaff
+<<
+  \new Staff \relative {
+    \clef treble \discant "10" r8 s32 f'[ bes f] s e[ a e] s d[ g d] s16 e32[ a]
+    <<
+      { r16 <f bes> r <e a> r <d g> }
+      \\
+      { d r a r bes r }
+    >> |
+    <cis e a>1
+  }
+  \new Staff \relative {
+    \clef treble \freeBass "1" r8 d'32 s16. c32 s16. bes32 s16. a32[ cis] s16
+    \clef bass \stdBass "Master"
+    <<
+      { r16 <f, bes d>^"b" r <e a c>^"am" r <d g bes>^"gm" |
+      <e a cis>1^"a" }
+      \\
+      { d8_"D" c_"C" bes_"B" | a1_"A" }
+    >>
+  }
+>>
diff --git a/Documentation/snippets/accordion-registers.ly b/Documentation/snippets/accordion-registers.ly
deleted file mode 100644
index 00df0215a7..0000000000
--- a/Documentation/snippets/accordion-registers.ly
+++ /dev/null
@@ -1,40 +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.17.23
-\version "2.17.23"
-
-\header {
-  lsrtags = "keyboards, specific-notation, symbols-and-glyphs"
-
-  texidoc = "Accordion register symbols are available as
-@code{\\markup} as well as as standalone music events (as register
-changes tend to occur between actual music events.  Bass registers are
-not overly standardized.  The available commands can be found in
-@ruser{Accordion Registers}."
-
-  doctitle = "Accordion register symbols"
-} % begin verbatim
-
-
-\layout { ragged-right = ##t }
-
-#(use-modules (scm accreg))
-
-\new PianoStaff
-<<
-  \new Staff \relative
-  { \clef treble \discant "10" r8 s32 f'[ bes f] s e[ a e] s d[ g d] s16 e32[ a]
-    << { r16 <f bes> r <e a> r <d g> } \\ { d r a r bes r } >> | <cis e a>1 }
-  \new Staff \relative
-  { \clef treble \freeBass "1" r8 d'32 s16. c32 s16. bes32 s16. a32[ cis] s16
-    \clef bass \stdBass "Master"
-    << { r16 <f, bes d>^"b" r <e a c>^"am" r <d g bes>^"gm" |
-	 <e a cis>1^"a" } \\
-       { d8_"D" c_"C" bes_"B" | a1_"A" }
-     >>
-  }
->>
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 d0e13e5adc..35f23de0a5 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
@@ -1,11 +1,10 @@
-% 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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "ancient-notation, chords, contexts-and-engravers"
@@ -14,10 +13,10 @@
 When writing a figured bass, you can place the figures above or below
 the bass notes, by defining the
 @code{BassFigureAlignmentPositioning.direction} property (exclusively
-in a @code{Staff} context).  Choices are @code{#UP} (or @code{#1}),
+in a @code{Staff} context). Choices are @code{#UP} (or @code{#1}),
 @code{#CENTER} (or @code{#0}) and @code{#DOWN} (or @code{#-1}).
 
-This property can be changed as many times as you wish.  Use
+This property can be changed as many times as you wish. Use
 @code{\\once \\override} if you don't want the override to apply to the
 whole score.
 
@@ -25,13 +24,12 @@ 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>4 <5/>4
   \override Staff.BassFigureAlignmentPositioning.direction = #UP
@@ -42,6 +40,7 @@ continuo = \figuremode {
   %\bassFigureStaffAlignmentDown
   <4>4. <4>8 <_+>4
 }
+
 \score {
   <<
     \new Staff = bassStaff \bass
diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
index 6f05ed94ed..5223ba116e 100644
--- a/Documentation/snippets/adding-ambitus-per-voice.ly
+++ b/Documentation/snippets/adding-ambitus-per-voice.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
@@ -17,7 +17,6 @@ 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 f4a9963b3f..ef1d5ad8ae 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "breaks, contexts-and-engravers, staff-notation, workaround"
@@ -21,7 +21,6 @@ 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 430371a644..7bf2674b7a 100644
--- a/Documentation/snippets/adding-an-extra-staff.ly
+++ b/Documentation/snippets/adding-an-extra-staff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, really-simple, staff-notation"
@@ -17,7 +17,6 @@ piece.
   doctitle = "Adding an extra staff"
 } % begin verbatim
 
-
 \score {
   <<
     \new Staff \relative c'' {
diff --git a/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly b/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
index fce68d84b7..99971e914a 100644
--- a/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
+++ b/Documentation/snippets/adding-an-ottava-marking-to-a-single-voice.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index ee14a8aff5..893733a42d 100644
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, specific-notation"
@@ -17,11 +17,11 @@ 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"
 }
+
 \chordmode {
   f1:maj7 f:7 bes:7
 }
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 5912d2d8aa..e295281286 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
@@ -24,7 +24,6 @@ sections (enclosed within curly braces).
   doctitle = "Adding beams slurs ties etc. when using tuplet and non-tuplet rhythms"
 } % begin verbatim
 
-
 {
   r16[ g16 \tuplet 3/2 { r16 e'8] }
   g16( a \tuplet 3/2 { b d e') }
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 7f354029fe..168e82e65b 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "percussion, preparing-parts, really-simple, rhythms, specific-notation"
@@ -21,7 +21,6 @@ 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
index 9e3f6072cb..7c7a7b9dbc 100644
--- a/Documentation/snippets/adding-extra-fingering-with-scheme.ly
+++ b/Documentation/snippets/adding-extra-fingering-with-scheme.ly
@@ -1,27 +1,26 @@
-% 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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "scheme-language"
 
   texidoc = "
-You can add additional elements to notes using @code{map-some-music}. In this
-example, an extra script is attached to a note.
+You can add additional elements to notes using @code{map-some-music}.
+In this example, an extra script is attached to a note.
 
 In general, first do a @code{\\displayMusic} of the music you want to
 create, then write a function that will work on the appropriate parts
 of the music for you.
+
 "
   doctitle = "Adding extra fingering with scheme"
 } % begin verbatim
 
-
 addScript =
 #(define-music-function (parser location script music)
    (ly:event? ly:music?)
diff --git a/Documentation/snippets/adding-fingerings-to-a-score.ly b/Documentation/snippets/adding-fingerings-to-a-score.ly
index 0d32b04f1c..6231619a91 100644
--- a/Documentation/snippets/adding-fingerings-to-a-score.ly
+++ b/Documentation/snippets/adding-fingerings-to-a-score.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings, really-simple"
@@ -16,7 +16,6 @@ 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 af261ba71d..1ff5fc74fd 100644
--- a/Documentation/snippets/adding-fingerings-to-tablatures.ly
+++ b/Documentation/snippets/adding-fingerings-to-tablatures.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, specific-notation"
@@ -17,8 +17,6 @@ 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 80df7dc6d0..bdaf405caf 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation, symbols-and-glyphs, vocal-music"
@@ -20,85 +20,144 @@ their own in the next system.
 } % begin verbatim
 
 #(define-markup-command (arrow-at-angle layout props angle-deg length fill)
-   (number? number? boolean?)
-   (let* (
-          ;; PI-OVER-180 and degrees->radians are taken from flag-styles.scm
-          (PI-OVER-180 (/ (atan 1 1) 45))
-          (degrees->radians (lambda (degrees) (* degrees PI-OVER-180)))
-          (angle-rad (degrees->radians angle-deg))
-          (target-x (* length (cos angle-rad)))
-          (target-y (* length (sin angle-rad))))
-     (interpret-markup layout props
-                       (markup
-                        #:translate (cons (/ target-x 2) (/ target-y 2))
-                        #:rotate angle-deg
-                        #:translate (cons (/ length -2) 0)
-                        #:concat (#:draw-line (cons length 0)
-                                              #:arrow-head X RIGHT fill)))))
+  (number? number? boolean?)
+  (let* (
+      (PI-OVER-180 (/ (atan 1 1) 34))
+      (degrees->radians (lambda (degrees) (* degrees PI-OVER-180)))
+      (angle-rad (degrees->radians angle-deg))
+      (target-x (* length (cos angle-rad)))
+      (target-y (* length (sin angle-rad))))
+    (interpret-markup layout props
+      (markup
+      #:translate (cons (/ target-x 2) (/ target-y 2))
+      #:rotate angle-deg
+      #:translate (cons (/ length -2) 0)
+      #:concat (#:draw-line (cons length 0)
+      #:arrow-head X RIGHT fill)))))
 
-splitStaffBarLineMarkup = \markup \with-dimensions #'(0 . 0) #'(0 . 0) {
-  \combine
-    \arrow-at-angle #45 #(sqrt 8) ##f
-    \arrow-at-angle #-45 #(sqrt 8) ##f
+splitStaffBarLine = {
+  \once \override Staff.BarLine.stencil =
+  #(lambda (grob)
+    (ly:stencil-combine-at-edge
+    (ly:bar-line::print grob)
+    X RIGHT
+    (grob-interpret-markup grob #{
+      \markup\with-dimensions #'(0 . 0) #'(0 . 0) {
+        \translate #'(5.95 . .14)\arrow-at-angle #45 #(sqrt 8) ##t
+        \translate #'(5.35 . -.13)\arrow-at-angle #-45 #(sqrt 8) ##t }#})
+    0))
+  \break
 }
 
-splitStaffBarLine = {
+convDownStaffBarLine = {
   \once \override Staff.BarLine.stencil =
-    #(lambda (grob)
-       (ly:stencil-combine-at-edge
-        (ly:bar-line::print grob)
-        X RIGHT
-        (grob-interpret-markup grob splitStaffBarLineMarkup)
-        0))
+  #(lambda (grob)
+    (ly:stencil-combine-at-edge
+    (ly:bar-line::print grob)
+    X RIGHT
+    (grob-interpret-markup grob #{
+        \markup\with-dimensions #'(0 . 0) #'(0 . 0) {
+          \translate #'(5.3 . -.13)\arrow-at-angle #-45 #(sqrt 8) ##t }#})
+      0))
   \break
 }
 
-\paper {
-  ragged-right = ##t
-  short-indent = 5\mm
+convUpStaffBarLine = {
+  \once \override Staff.BarLine.stencil =
+  #(lambda (grob)
+    (ly:stencil-combine-at-edge
+    (ly:bar-line::print grob)
+    X RIGHT
+    (grob-interpret-markup grob #{
+        \markup\with-dimensions #'(0 . 0) #'(0 . 0) {
+          \translate #'(5.28 . .14)\arrow-at-angle #45 #(sqrt 8) ##t }#})
+      0))
+  \break
 }
 
+
 \score {
   <<
     \new ChoirStaff <<
-      \new Staff \with { instrumentName = #"High I + II" } {
+      \new Staff
+      \with {
+        instrumentName = #"H I + H II"
+      } {
+        \key f\minor
         <<
           \repeat unfold 4 f''1
           \\
-          \repeat unfold 4 d''1
+          \repeat unfold 4 des''1
         >>
+        \key f\major
         \splitStaffBarLine
       }
       \new Staff \with { instrumentName = #"Low" } {
+        \key f\minor
         <<
-          \repeat unfold 4 b'1
+          \repeat unfold 4 bes'1
           \\
           \repeat unfold 4 g'1
         >>
+        \key f\major
       }
 
-      \new Staff \with { shortInstrumentName = #"H I" } {
+      \new Staff \with { shortInstrumentName = #"I" } {
+        \key f \major
         R1*4
         \repeat unfold 2 { r4 f''2 r4 } \repeat unfold 2 e''1
+        \key f\minor
+        \convDownStaffBarLine
       }
-      \new Staff \with { shortInstrumentName = #"H II" } {
+      \new Staff \with { shortInstrumentName = #"II" } {
+        \key f \major
         R1*4
-        \repeat unfold 4 b'2 \repeat unfold 2 c''1
+        \repeat unfold 4 bes'2 \repeat unfold 2 c''1
+        \key f\minor
+        \convUpStaffBarLine
       }
+
       \new Staff \with { shortInstrumentName = #"L" } {
+        \key f\major
         R1*4
         <<
           \repeat unfold 4 g'1
           \\
           \repeat unfold 4 c'1
         >>
+        \key f\minor
+      }
+
+      \new Staff
+      \with {
+        shortInstrumentName = #"I+II"
+      } {
+        \key f\minor
+        R1*8
+        <<
+          \repeat unfold 4 f''1
+          \\
+          \repeat unfold 4 des''1
+        >>
+      }
+      \new Staff \with { shortInstrumentName = #"L" } {
+        \key f\minor
+        R1*8
+        <<
+          \repeat unfold 4 bes'1
+          \\
+          \repeat unfold 4 g'1
+        >>
       }
     >>
   >>
   \layout {
     \context {
       \Staff \RemoveEmptyStaves
-      \override VerticalAxisGroup.remove-first = ##t
+      \override VerticalAxisGroup #'remove-first = ##t
     }
   }
 }
+\paper {
+  ragged-right = ##t
+}
diff --git a/Documentation/snippets/adding-links-to-objects.ly b/Documentation/snippets/adding-links-to-objects.ly
index a2d214337d..16e00b927e 100644
--- a/Documentation/snippets/adding-links-to-objects.ly
+++ b/Documentation/snippets/adding-links-to-objects.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
index 92c4fc31e5..f4d790c113 100644
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -1,11 +1,10 @@
-% 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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "staff-notation, vocal-music"
@@ -26,7 +25,6 @@ can be cued, but they cannot overlap each other in time.
   doctitle = "Adding orchestral cues to a vocal score"
 } % begin verbatim
 
-
 cueWhile =
 #(define-music-function
    (parser location instrument name dir music)
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 05b4e9ba07..151b11cfa5 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, workaround"
@@ -18,7 +18,6 @@ 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 32fd66cdfd..9b79e4f447 100644
--- a/Documentation/snippets/adding-the-current-date-to-a-score.ly
+++ b/Documentation/snippets/adding-the-current-date-to-a-score.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-cool, scheme-language, text, titles"
@@ -17,7 +17,6 @@ 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-timing-marks-to-long-glissandi.ly b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly
index 0cbcfeb719..3b4472e9bd 100644
--- a/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly
+++ b/Documentation/snippets/adding-timing-marks-to-long-glissandi.ly
@@ -1,28 +1,26 @@
-% 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.17.30
-\version "2.17.30"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "expressive-marks, staff-notation, tweaks-and-overrides"
 
   texidoc = "
-Skipped beats in very long glissandi are sometimes indicated by
-timing marks, often consisting of stems without noteheads.  Such
-stems can also be used to carry intermediate expression markings.
+Skipped beats in very long glissandi are sometimes indicated by timing
+marks, often consisting of stems without noteheads.  Such stems can
+also be used to carry intermediate expression markings.
 
-If the stems do not align well with the glissando, they may need to
-be repositioned slightly.
-"
+If the stems do not align well with the glissando, they may need to be
+repositioned slightly.
 
+"
   doctitle = "Adding timing marks to long glissandi"
 } % begin verbatim
 
-
 glissandoSkipOn = {
   \override NoteColumn.glissando-skip = ##t
   \hide NoteHead
diff --git a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
index fc0d3673d1..1826ea194d 100644
--- a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
+++ b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats"
@@ -20,7 +20,6 @@ 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 e8d2f55187..7587f35e48 100644
--- a/Documentation/snippets/additional-voices-to-avoid-collisions.ly
+++ b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes"
diff --git a/Documentation/snippets/adjusting-grace-note-spacing.ly b/Documentation/snippets/adjusting-grace-note-spacing.ly
index d442d817ec..69e2658b3c 100644
--- a/Documentation/snippets/adjusting-grace-note-spacing.ly
+++ b/Documentation/snippets/adjusting-grace-note-spacing.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 e7bcf160f1..77f626113a 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -1,13 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
-  lsrtags = "correction-wanted, spacing, text, vocal-music, workaround"
+  lsrtags = "spacing, text, tweaks-and-overrides, vocal-music, workaround"
 
   texidoc = "
 This snippet shows how to bring the lyrics line closer to the staff.
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 6b0b03478d..89f013ced6 100644
--- a/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
+++ b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
index b67aeac03a..4aa325956f 100644
--- a/Documentation/snippets/aligning-and-centering-instrument-names.ly
+++ b/Documentation/snippets/aligning-and-centering-instrument-names.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout, text, titles"
@@ -20,7 +20,6 @@ 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 321f4cb3d7..c65d4fa4af 100644
--- a/Documentation/snippets/aligning-bar-numbers.ly
+++ b/Documentation/snippets/aligning-bar-numbers.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -19,7 +19,6 @@ 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-objects-created-with-the--mark-command.ly b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
index c25eccd8a1..dac50af89f 100644
--- a/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
+++ b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
@@ -17,7 +17,6 @@ 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/aligning-syllables-with-melisma.ly b/Documentation/snippets/aligning-syllables-with-melisma.ly
index ae3f731ed2..1fd2703869 100644
--- a/Documentation/snippets/aligning-syllables-with-melisma.ly
+++ b/Documentation/snippets/aligning-syllables-with-melisma.ly
@@ -1,5 +1,5 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
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 d4a211ffe5..3afb47f27a 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings, spacing, specific-notation"
@@ -18,7 +18,6 @@ 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 719aa97ea1..4a35b1c8cd 100644
--- a/Documentation/snippets/altering-the-length-of-beamed-stems.ly
+++ b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
@@ -22,7 +22,6 @@ 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-bar-numbering.ly b/Documentation/snippets/alternative-bar-numbering.ly
index 017551b62b..f69ecd3391 100644
--- a/Documentation/snippets/alternative-bar-numbering.ly
+++ b/Documentation/snippets/alternative-bar-numbering.ly
@@ -1,20 +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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides"
-  texidoc = "Two alternative methods for bar numbering can be set,
-  especially for when using repeated music."
+
+  texidoc = "
+Two alternative methods for bar numbering can be set, especially for
+when using repeated music.
+
+"
   doctitle = "Alternative bar numbering"
 } % begin verbatim
 
-
 \relative c'{
   \set Score.alternativeNumberingStyle = #'numbers
   \repeat volta 3 { c4 d e f | }
diff --git a/Documentation/snippets/alternative-breve-notes.ly b/Documentation/snippets/alternative-breve-notes.ly
index d735931c31..cb104d169f 100644
--- a/Documentation/snippets/alternative-breve-notes.ly
+++ b/Documentation/snippets/alternative-breve-notes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
diff --git a/Documentation/snippets/ambitus-with-multiple-voices.ly b/Documentation/snippets/ambitus-with-multiple-voices.ly
index 229d08a66a..df6ccf010c 100644
--- a/Documentation/snippets/ambitus-with-multiple-voices.ly
+++ b/Documentation/snippets/ambitus-with-multiple-voices.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, vocal-music"
@@ -18,7 +18,6 @@ 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 0111acda59..0d5e38b43b 100644
--- a/Documentation/snippets/ambitus.ly
+++ b/Documentation/snippets/ambitus.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, vocal-music"
@@ -20,7 +20,6 @@ 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 02a153baf7..f823565e62 100644
--- a/Documentation/snippets/analysis-brackets-above-the-staff.ly
+++ b/Documentation/snippets/analysis-brackets-above-the-staff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-simple, tweaks-and-overrides"
@@ -18,13 +18,13 @@ staff instead.
   doctitle = "Analysis brackets above the staff"
 } % begin verbatim
 
-
 \layout {
   \context {
     \Voice
     \consists "Horizontal_bracket_engraver"
   }
 }
+
 \relative c'' {
   \once \override HorizontalBracket.direction = #UP
   c2\startGroup
diff --git a/Documentation/snippets/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly
index e0d6f54f92..be2ee37a23 100644
--- a/Documentation/snippets/ancient-fonts.ly
+++ b/Documentation/snippets/ancient-fonts.ly
@@ -1,12 +1,10 @@
-% 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.17.6
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, symbols-and-glyphs"
@@ -14,11 +12,11 @@
   texidoc = "
 Shown here are many (all?) of the symbols that are included in
 LilyPond's support for ancient notation.
+
 "
   doctitle = "Ancient fonts"
 } % begin verbatim
 
-
 upperStaff = \new VaticanaStaff = "upperStaff" <<
   \context VaticanaVoice <<
     \transpose c c {
@@ -31,7 +29,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \override NoteHead.style = #'vaticana.inclinatum
       a! b ces'
       \bar "|"
-      % \break % 1 (8*1)
 
       \override NoteHead.style = #'vaticana.quilisma
       b! des'! ges! fes!
@@ -42,7 +39,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \override NoteHead.style = #'vaticana.reverse.plica
       c d
       \bar "|"
-      % \break %2 (8*1)
 
       \override NoteHead.style = #'vaticana.punctum.cavum
       es f
@@ -54,7 +50,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       g f
       \override NoteHead.style = #'vaticana.linea.punctum
       \once \override Staff.BarLine.bar-extent = #'(-1 . 1) \bar "|"
-      % \break % 3 (8*1)
 
       es d
       \override NoteHead.style = #'vaticana.epiphonus
@@ -69,7 +64,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \clef "medicaea-fa2"
       ces des
       \bar "|"
-      % \break % 4 (8*1)
 
       e! f! ges
       \clef "medicaea-do2"
@@ -78,7 +72,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \override NoteHead.style = #'medicaea.virga
       b! a!
       \bar "|"
-      % \break % 5 (8*1)
 
       ges fes
       \clef "medicaea-fa1"
@@ -92,7 +85,6 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \clef "hufnagel-fa2"
       ces des es
       \bar "|"
-      % \break % 6 (8*1)
 
       fes ges
       \clef "hufnagel-do2"
@@ -101,17 +93,14 @@ upperStaff = \new VaticanaStaff = "upperStaff" <<
       \override NoteHead.style = #'hufnagel.virga
       bes! as!
       \bar "|"
-      % \break % 7 (8*1)
 
       ges! fes!
       \clef "hufnagel-do-fa"
       \override NoteHead.style = #'hufnagel.punctum
       es! des ces des! es! fes!
       \bar "||"
-      % \break % 8 (8*1)
 
       s32*1
-      % \break % 12 (32*1)
     }
   >>
 >>
@@ -126,12 +115,10 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
       \clef "neomensural-c2"
       cis1
       \bar "|"
-      % \break % 2 (16*1)
 
       \[ g\breve dis''\longa \]
       b\breve \[ a\longa d\longa \]
       \clef "petrucci-c2"
-      % \break % 4 (16*1)
 
       fis1 ces1
       \clef "petrucci-c2"
@@ -140,7 +127,6 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
       \clef "mensural-c2"
       r\breve
       \bar "|"
-      % \break % 5 (8*1)
 
       r2
       \clef "mensural-g"
@@ -155,7 +141,6 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
       \clef "petrucci-f"
       r\breve
       \bar "|"
-      % \break % 6 (8*1)
 
       r\breve
       \clef "mensural-f"
@@ -165,18 +150,15 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
       \clef "mensural-f"
       e\breve f g a1
       \clef "mensural-g"
-      % \break % 7 (8*1)
 
       \[ bes'!\longa a'!\longa c''!\longa \]
       e'1 d' c' d' \bar "|"
       \bar "|"
-      % \break % 9 (16*1)
 
       bes'!\longa fis'!1 as'!1 ges'!\longa % lig
       \set Staff.forceClef = ##t
       \clef "mensural-g"
       e'2 d' c' \bar "|"
-      % \break % 11 (16*1)
 
       \set Staff.forceClef = ##t
       \clef "petrucci-g"
@@ -187,7 +169,6 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
       \set Staff.forceClef = ##t
       \clef "mensural-g"
       es'! des'! cis'!1 \bar "||"
-      % \break % 12 (8*1)
     }
   >>
 >>
diff --git a/Documentation/snippets/ancient-headword.ly b/Documentation/snippets/ancient-headword.ly
index a0117699c4..4b02168205 100644
--- a/Documentation/snippets/ancient-headword.ly
+++ b/Documentation/snippets/ancient-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
index fbab93e75f..afffd25ad0 100644
--- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
+++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
@@ -1,14 +1,13 @@
-% 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.17.30
-\version "2.17.30"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
-  lsrtags = "vocal-music, ancient-notation, template"
+  lsrtags = "ancient-notation, template, vocal-music"
 
   texidoc = "
 This example demonstrates how to do modern transcription of Gregorian
@@ -20,7 +19,6 @@ length.
   doctitle = "Ancient notation template -- modern transcription of gregorian music"
 } % begin verbatim
 
-
 \include "gregorian.ly"
 
 chant = \relative c' {
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 f9867cb5d6..b03a124a46 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, real-music, really-cool, template"
@@ -22,7 +22,6 @@ 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 84e12ce3dc..1fb3e32a4a 100644
--- a/Documentation/snippets/ancient-time-signatures.ly
+++ b/Documentation/snippets/ancient-time-signatures.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation"
@@ -18,7 +18,6 @@ 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 81f5816c0a..252138644d 100644
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "template, vocal-music"
@@ -19,7 +19,6 @@ 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 8cefbedea7..a340ac0028 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, pitches"
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index 3d1708e455..60b3b0ae83 100644
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "world-music"
@@ -20,7 +20,6 @@ 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 2ff6e85ab8..eda9c7fb29 100644
--- a/Documentation/snippets/asymmetric-slurs.ly
+++ b/Documentation/snippets/asymmetric-slurs.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 40e9e04d68..ae63f423c2 100644
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, connecting-notes, rhythms"
diff --git a/Documentation/snippets/automatically-change-durations.ly b/Documentation/snippets/automatically-change-durations.ly
index 5f5f7c05e3..de773e60c0 100644
--- a/Documentation/snippets/automatically-change-durations.ly
+++ b/Documentation/snippets/automatically-change-durations.ly
@@ -1,24 +1,23 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
 
   texidoc = "
-<code>shiftDurations</code> can be used to change the note lengths of a
-piece of music.  It takes two arguments - the scaling factor as a power
-of two, and the number of dots to be added as a positive integer.
+@code{shiftDurations} can be used to change the note lengths of a piece
+of music. It takes two arguments - the scaling factor as a power 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/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly b/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly
index 6ff6b99856..4f830f0c8e 100644
--- a/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly
+++ b/Documentation/snippets/automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, pitches"
@@ -20,15 +20,15 @@ Voice context and overriding the @code{neutral-direction} of Stem.
 
 \relative c'' {
   \time 3/4
-  \autoBeamOff
   a8 b g f b g |
-  c b d c b c
+  c  b d c b c |
 }
 
 \layout {
   \context {
     \Voice
     \consists "Melody_engraver"
-    \override Stem.neutral-direction = #'()
+    \autoBeamOff
+    \stemNeutral
   }
 }
diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index 9af5fffa99..f522582080 100644
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, editorial-annotations, rhythms, tweaks-and-overrides"
@@ -20,7 +20,6 @@ overridden.
   doctitle = "Avoiding collisions with chord fingerings"
 } % begin verbatim
 
-
 \relative c' {
   \set fingeringOrientations = #'(up)
   \set stringNumberOrientations = #'(up)
@@ -32,12 +31,11 @@ overridden.
   <f c'\5>8
   <f c'-\rightHandFinger #2 >8
 
-  % Corrected to avoid collisions
+  % No tweak needed
   r8
-  \override Fingering.add-stem-support = ##t
   <f c'-5>8
-  \override StringNumber.add-stem-support = ##t
   <f c'\5>8
+   % Corrected to avoid collisions
   \override StrokeFinger.add-stem-support = ##t
   <f c'-\rightHandFinger #2 >8
 }
diff --git a/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly b/Documentation/snippets/bar-chords-notation-for-guitar-with-text-spanner.ly
similarity index 82%
rename from Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
rename to Documentation/snippets/bar-chords-notation-for-guitar-with-text-spanner.ly
index a1e7232187..9a8b950cda 100644
--- a/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
+++ b/Documentation/snippets/bar-chords-notation-for-guitar-with-text-spanner.ly
@@ -1,25 +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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "chords, fretted-strings"
 
   texidoc = "
-Here is how to print bar chords, or half-bar chords (just uncomment the
-appropriate line for to select either one).
+Here is how to print bar chords (or barre chords) or half-bar chords
+(just uncomment the appropriate line for to select either one). The
+syntax is : @code{\\bbarre #'fret_number' note(s)}
+
+
+
+
+
 
-The syntax is @code{\\bbarre #\"@var{fret number}\" @{ notes @} }.
 "
   doctitle = "Bar chords notation for Guitar (with Text Spanner)"
 } % begin verbatim
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% %%%%%%%  Cut here ----- Start 'bbarred.ly'
 
diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index a09e8853d0..be7e458d63 100644
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -18,7 +18,6 @@ levels:
   doctitle = "Beam endings in Score context"
 } % begin verbatim
 
-
 \relative c'' {
   \time 5/4
   % Set default beaming for all staves
diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
index 5d77375ddc..9fff57e114 100644
--- a/Documentation/snippets/beam-grouping-in-7-8-time.ly
+++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/beams-across-line-breaks.ly b/Documentation/snippets/beams-across-line-breaks.ly
index 1b60a49d41..755e676815 100644
--- a/Documentation/snippets/beams-across-line-breaks.ly
+++ b/Documentation/snippets/beams-across-line-breaks.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -17,7 +17,6 @@ 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 c9139bafb1..6e49f9e5ec 100644
--- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, text"
@@ -18,8 +18,10 @@ white box will not overlap any other grob.
   doctitle = "Blanking staff lines using the \\whiteout command"
 } % begin verbatim
 
+\layout {
+  ragged-right = ##f
+}
 
-\layout { ragged-right = ##f }
 \relative c' {
   \override TextScript.extra-offset = #'(2 . 4)
   c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c
diff --git a/Documentation/snippets/book-parts.ly b/Documentation/snippets/book-parts.ly
index 52f1e4b469..07c4822696 100644
--- a/Documentation/snippets/book-parts.ly
+++ b/Documentation/snippets/book-parts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout"
@@ -19,7 +19,6 @@ 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 c1af6d24da..b4583bd4d9 100644
--- a/Documentation/snippets/breathing-signs.ly
+++ b/Documentation/snippets/breathing-signs.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, symbols-and-glyphs"
@@ -17,7 +17,6 @@ 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 1515b52fa3..8272553331 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -1,11 +1,10 @@
-% 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.19.2
-\version "2.19.2"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
@@ -13,21 +12,21 @@
   texidoc = "
 In order to make parts of a crescendo hairpin invisible, the following
 method is used: A white rectangle is drawn on top of the respective
-part of the crescendo hairpin, making it invisible.
+part of the crescendo hairpin, making it invisible.  The rectangle is
+defined as postscript code within a text markup.
 
-The markup command @code{with-dimensions} tells LilyPond to consider only
-the bottom edge of the rectangle when spacing it against the hairpin.
-The property @code{staff-padding} prevents the rectangle from fitting
-between the hairpin and staff.
+The markup command @code{with-dimensions} tells LilyPond to consider
+only the bottom edge of the rectangle when spacing it against the
+hairpin. The property @code{staff-padding} prevents the rectangle from
+fitting between the hairpin and staff.
 
-Make sure to put the hairpin in a lower layer than the text markup to
-draw the rectangle over the hairpin.
+Make sure the hairpin is in a lower layer than the text markup to draw
+the rectangle over the hairpin.
 
 "
   doctitle = "Broken Crescendo Hairpin"
 } % begin verbatim
 
-
 \relative c' {
   <<
     {
@@ -44,7 +43,7 @@ draw the rectangle over the hairpin.
       des16_\markup \with-dimensions #'(2 . 7) #'(0 . 0)
                     \with-color #white
                     \filled-box #'(2 . 7) #'(0 . 2) #0
-      r8. des4 ~ 16->\sff
+      r8. des4 ~ des16->\sff r8.
     }
   >>
 }
diff --git a/Documentation/snippets/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
index c42000b8af..219fa11bf9 100644
--- a/Documentation/snippets/caesura-railtracks-with-fermata.ly
+++ b/Documentation/snippets/caesura-railtracks-with-fermata.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, symbols-and-glyphs, tweaks-and-overrides"
@@ -18,15 +18,16 @@ pleasing combination of railtracks and fermata.
   doctitle = "Caesura (\"railtracks\") with fermata"
 } % begin verbatim
 
-
 \relative c'' {
   c2.
   % construct the symbol
   \override BreathingSign.text = \markup {
-    \line {
-      \musicglyph #"scripts.caesura.curved"
-      \translate #'(-1.75 . 1.6)
-      \musicglyph #"scripts.ufermata"
+    \override #'(direction . 1)
+    \override #'(baseline-skip . 1.8)
+    \dir-column {
+      \translate #'(0.155 . 0)
+        \center-align \musicglyph #"scripts.caesura.curved"
+      \center-align \musicglyph #"scripts.ufermata"
     }
   }
   \breathe c4
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 67e1972270..9aea589ed2 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, really-cool, scheme-language, text"
@@ -24,41 +24,41 @@ normally printed, using some Scheme code.
 
 hairpinWithCenteredText =
 #(define-music-function (parser location text) (markup?)
-#{
-  \once \override Voice.Hairpin.after-line-breaking =
-    #(lambda (grob)
-      (let* ((stencil (ly:hairpin::print grob))
-             (par-y (ly:grob-parent grob Y))
-             (dir (ly:grob-property par-y 'direction))
-             (new-stencil (ly:stencil-aligned-to
-               (ly:stencil-combine-at-edge
-                 (ly:stencil-aligned-to stencil X CENTER)
-                 Y dir
-                 (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER))
-               X LEFT))
-             (staff-space (ly:output-def-lookup (ly:grob-layout grob) 'staff-space))
-             (staff-line-thickness
-               (ly:output-def-lookup (ly:grob-layout grob) 'line-thickness))
-             (grob-name (lambda (x) (assq-ref (ly:grob-property x 'meta) 'name)))
-             (par-x (ly:grob-parent grob X))
-             (dyn-text (eq? (grob-name par-x) 'DynamicText ))
-             (dyn-text-stencil-x-length
-               (if dyn-text
-                 (interval-length
-                   (ly:stencil-extent (ly:grob-property par-x 'stencil) X))
-                 0))
-             (x-shift
-               (if dyn-text
-                 (-
-                   (+ staff-space dyn-text-stencil-x-length)
-                   (* 0.5 staff-line-thickness)) 0)))
+  #{
+    \once \override Voice.Hairpin.after-line-breaking =
+      #(lambda (grob)
+        (let* ((stencil (ly:hairpin::print grob))
+               (par-y (ly:grob-parent grob Y))
+               (dir (ly:grob-property par-y 'direction))
+               (new-stencil (ly:stencil-aligned-to
+                 (ly:stencil-combine-at-edge
+                   (ly:stencil-aligned-to stencil X CENTER)
+                   Y dir
+                   (ly:stencil-aligned-to (grob-interpret-markup grob text) X CENTER))
+                 X LEFT))
+               (staff-space (ly:output-def-lookup (ly:grob-layout grob) 'staff-space))
+               (staff-line-thickness
+                 (ly:output-def-lookup (ly:grob-layout grob) 'line-thickness))
+               (grob-name (lambda (x) (assq-ref (ly:grob-property x 'meta) 'name)))
+               (par-x (ly:grob-parent grob X))
+               (dyn-text (eq? (grob-name par-x) 'DynamicText ))
+               (dyn-text-stencil-x-length
+                 (if dyn-text
+                   (interval-length
+                     (ly:stencil-extent (ly:grob-property par-x 'stencil) X))
+                   0))
+               (x-shift
+                 (if dyn-text
+                   (-
+                     (+ staff-space dyn-text-stencil-x-length)
+                     (* 0.5 staff-line-thickness)) 0)))
 
-      (ly:grob-set-property! grob 'Y-offset 0)
-      (ly:grob-set-property! grob 'stencil
-         (ly:stencil-translate-axis
-          new-stencil
-          x-shift X))))
-#})
+        (ly:grob-set-property! grob 'Y-offset 0)
+        (ly:grob-set-property! grob 'stencil
+           (ly:stencil-translate-axis
+            new-stencil
+            x-shift X))))
+  #})
 
 hairpinMolto =
 \hairpinWithCenteredText \markup { \italic molto }
diff --git a/Documentation/snippets/centered-measure-numbers.ly b/Documentation/snippets/centered-measure-numbers.ly
index 490fde1580..26e962dc6e 100644
--- a/Documentation/snippets/centered-measure-numbers.ly
+++ b/Documentation/snippets/centered-measure-numbers.ly
@@ -1,28 +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.17.7
-\version "2.17.7"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, repeats, staff-notation"
 
   texidoc = "
-Scores of large ensemble works often have bar numbers placed beneath the
-system, centered horizontally on the measure's extent.  This snippet shows
-how the @code{Measure_counter_engraver} may be used to simulate this
-notational practice.  Here, the engraver has been added to a @code{Dynamics}
-context.
+Scores of large ensemble works often have bar numbers placed beneath
+the system, centered horizontally on the measure's extent.  This
+snippet shows how the @code{Measure_counter_engraver} may be used to
+simulate this notational practice.  Here, the engraver has been added
+to a @code{Dynamics} context.
 
 "
-
   doctitle = "Centered measure numbers"
 } % begin verbatim
 
-
 \layout {
   \context {
     \Dynamics
diff --git a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
index b5342b4131..6b48240774 100644
--- a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
+++ b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
@@ -1,27 +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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
-  lsrtags = "text, tweaks-and-overrides, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, text, tweaks-and-overrides"
+
   texidoc = "
 For technical reasons, text scripts attached to note heads cannot
 easily be centered on a note head's width, unlike articulations.
 
 Instead of using trial-and-error offset tweaks, this snippet uses a
 Scheme engraver to reset the horizontal parent of each markup to a
-@code{NoteColumn}.  This also allows text to follow note heads which have
-been shifted via @code{force-hshift}.
+@code{NoteColumn}.  This also allows text to follow note heads which
+have been shifted via @code{force-hshift}.
+
+
+
 "
   doctitle = "Centering markup on note heads automatically"
 } % begin verbatim
 
-
 #(define (Text_align_engraver ctx)
   (let ((scripts '())
         (note-column #f))
diff --git a/Documentation/snippets/changing--flageolet-mark-size.ly b/Documentation/snippets/changing--flageolet-mark-size.ly
index cc835b9e5d..c97cb8d439 100644
--- a/Documentation/snippets/changing--flageolet-mark-size.ly
+++ b/Documentation/snippets/changing--flageolet-mark-size.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, scheme-language, specific-notation, symbols-and-glyphs, unfretted-strings"
@@ -17,7 +17,6 @@ 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 741edb8388..059eccdc17 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-simple, simultaneous-notes, specific-notation, tweaks-and-overrides"
@@ -26,7 +26,6 @@ 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 6409e4b15d..190be19f39 100644
--- a/Documentation/snippets/changing-beam-knee-gap.ly
+++ b/Documentation/snippets/changing-beam-knee-gap.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -22,7 +22,6 @@ 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-beam-thickness-and-spacing.ly b/Documentation/snippets/changing-beam-thickness-and-spacing.ly
new file mode 100644
index 0000000000..6725d75177
--- /dev/null
+++ b/Documentation/snippets/changing-beam-thickness-and-spacing.ly
@@ -0,0 +1,32 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "tweaks-and-overrides"
+
+  texidoc = "
+To make beams thicker or thinner alter the @code{Beam.beam-thickness}
+property.  To adjust the spacing between beams alter the
+@code{Beam.length-fraction} property.
+
+"
+  doctitle = "Changing beam thickness and spacing"
+} % begin verbatim
+
+\relative f' {
+  \time 1/8
+  \override Beam.beam-thickness = #0.4
+  \override Beam.length-fraction = #0.8
+  c32 c c c
+  \revert Beam.beam-thickness  % 0.48 is default thickness
+  \revert Beam.length-fraction  % 1.0 is default spacing
+  c32 c c c
+  \override Beam.beam-thickness = #0.6
+  \override Beam.length-fraction = #1.3
+  c32 c c c
+}
diff --git a/Documentation/snippets/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly
index 3e02b65b43..1fd367c3d6 100644
--- a/Documentation/snippets/changing-chord-separator.ly
+++ b/Documentation/snippets/changing-chord-separator.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords"
@@ -17,7 +17,6 @@ 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 118341b7a8..2ed1698168 100644
--- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly
+++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -20,7 +20,6 @@ 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 b174cb5bd8..51ca53c65c 100644
--- a/Documentation/snippets/changing-fret-orientations.ly
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -17,7 +17,6 @@ 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 1cd549b742..f817d558bb 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, midi, real-music"
@@ -13,8 +13,7 @@
 When outputting MIDI, the default behavior is for each staff to
 represent one MIDI channel, with all the voices on a staff amalgamated.
 This minimizes the risk of running out of MIDI channels, since there
-are only 16 available per MIDI port, and most devices support only one
-port.
+are only 16 available per track.
 
 However, by moving the @code{Staff_performer} to the @code{Voice}
 context, each voice on a staff can have its own MIDI channel, as is
@@ -26,7 +25,6 @@ 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''' {
@@ -36,8 +34,8 @@ two MIDI channels are created, each with a different
       \time 2/2
       r2 g-"Flute" ~
       g fis ~
-      4 g8 fis e2 ~
-      4 d8 cis d2
+      fis4 g8 fis e2 ~
+      e4 d8 cis d2
     }
     \new Voice \relative c'' {
       \set midiInstrument = #"clarinet"
diff --git a/Documentation/snippets/changing-partcombine-texts.ly b/Documentation/snippets/changing-partcombine-texts.ly
index 4cd8109965..eafe5679cb 100644
--- a/Documentation/snippets/changing-partcombine-texts.ly
+++ b/Documentation/snippets/changing-partcombine-texts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes"
@@ -17,7 +17,6 @@ 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 7005946043..ad9842492d 100644
--- a/Documentation/snippets/changing-properties-for-individual-grobs.ly
+++ b/Documentation/snippets/changing-properties-for-individual-grobs.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-cool, scheme-language, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 4ef7475f41..38581bb551 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, vocal-music"
diff --git a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
index 002aaf7216..77c5a40eb5 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -23,7 +23,6 @@ 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 7d13dc3b06..ade2d8e63b 100644
--- a/Documentation/snippets/changing-the-ambitus-gap.ly
+++ b/Documentation/snippets/changing-the-ambitus-gap.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches"
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 4da9c337f5..45e60243b2 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "connecting-notes, editorial-annotations, expressive-marks, really-simple"
@@ -16,7 +16,6 @@ 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 33978945b0..45fbff7ce0 100644
--- a/Documentation/snippets/changing-the-breath-mark-symbol.ly
+++ b/Documentation/snippets/changing-the-breath-mark-symbol.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
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 26cc5d92ec..fdd185ca79 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, really-simple"
@@ -21,17 +21,14 @@ 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 {
+scm = \chordmode {
   c1/c | cis/cis
   b1/b | bis/bis | bes/bes
 }
 
-%% The following is only here to print the names of the
-%% chords styles; it can be removed if you do not need to
-%% print them.
 
 \layout {
+  ragged-right = ##t
   \context {
     \ChordNames
     \consists "Instrument_name_engraver"
@@ -40,14 +37,24 @@ music = \chordmode {
 
 <<
   \new ChordNames {
-    \set ChordNames.instrumentName = #"default"
-    \music
+    \set instrumentName = #"default"
+    \scm
+  }
+  \new ChordNames {
+    \set instrumentName = #"german"
+    \germanChords \scm
   }
   \new ChordNames {
-    \set ChordNames.instrumentName = #"german"
-    \germanChords \music }
+    \set instrumentName = #"semi-german"
+    \semiGermanChords \scm
+  }
   \new ChordNames {
-    \set ChordNames.instrumentName = #"semi-german"
-    \semiGermanChords \music }
-  \context Voice { \music }
+    \set instrumentName = #"italian"
+    \italianChords \scm
+  }
+  \new ChordNames {
+    \set instrumentName = #"french"
+    \frenchChords \scm
+  }
+  \context Voice { \scm }
 >>
diff --git a/Documentation/snippets/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
index 0fff98a94f..e5608cf69e 100644
--- a/Documentation/snippets/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/changing-the-default-text-font-family.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 bb52c169ff..9e5b0c7ef0 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches"
@@ -19,7 +19,6 @@ 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 38764d36f3..422a855169 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,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
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 c4c53e5c32..08a8d99202 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "specific-notation, staff-notation"
@@ -20,7 +20,6 @@ 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 7c7bafcbb1..7a6f6fb5bb 100644
--- a/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
+++ b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords"
@@ -18,7 +18,6 @@ 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 589ce235fa..548544273e 100644
--- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
+++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index ed30920b49..e605413ea2 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
@@ -19,7 +19,6 @@ 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 66879b4f68..5ee5d34f28 100644
--- a/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
+++ b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "midi, rhythms, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 6f6871ef37..5345cd9242 100644
--- a/Documentation/snippets/changing-the-text-for-sustain-markings.ly
+++ b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
@@ -19,7 +19,6 @@ 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-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly
index e0257869b7..d20801bedb 100644
--- a/Documentation/snippets/changing-the-tuplet-number.ly
+++ b/Documentation/snippets/changing-the-tuplet-number.ly
@@ -1,26 +1,26 @@
-% 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.17.30
-\version "2.17.30"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "rhythms"
 
   texidoc = "
 By default, only the numerator of the tuplet number is printed over the
-tuplet bracket. Alternatively, num:den of the tuplet number may
-be printed, or the tuplet number may be suppressed altogether.
+tuplet bracket, i.e., the denominator of the argument to the
+@code{\\times} command.
+
+Alternatively, num:den of the tuplet number may be printed, or the
+tuplet number may be suppressed altogether.
 
 "
   doctitle = "Changing the tuplet number"
 } % begin verbatim
 
-
-
 \relative c'' {
   \tuplet 3/2 { c8 c c }
   \tuplet 3/2 { 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 74a6d43c10..6b37d262db 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
@@ -1,20 +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.17.11
-\version "2.17.11"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
-  lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms"
+  lsrtags = "contemporary-notation, contexts-and-engravers, rhythms, workaround"
 
+  texidoc = "
+The @code{measureLength} property, together with
+@code{measurePosition}, determines when a bar line is needed.  However,
+when using @code{\\scaleDurations}, the scaling of durations makes it
+difficult to change time signatures.  In this case,
+@code{measureLength} should be set manually, using the
+@code{ly:make-moment} callback.  The second argument must be the same
+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/chant-or-psalms-notation.ly b/Documentation/snippets/chant-or-psalms-notation.ly
index 864374ec3f..643e25c95a 100644
--- a/Documentation/snippets/chant-or-psalms-notation.ly
+++ b/Documentation/snippets/chant-or-psalms-notation.ly
@@ -1,24 +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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
-  lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers, specific-notation"
+  lsrtags = "ancient-notation, contexts-and-engravers, rhythms, specific-notation, vocal-music"
 
   texidoc = "
-This form of notation is used for the chant of the Psalms, where verses
-aren't always the same length.
+This form of notation is used for Psalm chant, where verses aren't
+always the same length.
 
 "
   doctitle = "Chant or psalms notation"
 } % begin verbatim
 
-
 stemOff = \hide Staff.Stem
 stemOn  = \undo \stemOff
 
diff --git a/Documentation/snippets/chord-glissando-in-tablature.ly b/Documentation/snippets/chord-glissando-in-tablature.ly
index a5b221cf28..540c6e8a75 100644
--- a/Documentation/snippets/chord-glissando-in-tablature.ly
+++ b/Documentation/snippets/chord-glissando-in-tablature.ly
@@ -1,16 +1,16 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
 
   texidoc = "
-Slides for chords can be indicated in both @code{Staff} and
+Slides for chords are indicated by default 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.
@@ -18,9 +18,10 @@ single notes.
 "
   doctitle = "Chord glissando in tablature"
 } % begin verbatim
+%=> http://lilypond.1069038.n5.nabble.com/LSR-chord-glissando-in-tablature-obsolete-tc159863.html
 
 myMusic = \relative c' {
-  <c\3 e\2 g\1>1 \glissando <f\3 a\2 c\1>
+  <c e g>1 \glissando <f a c>
 }
 
 \score {
@@ -29,7 +30,17 @@ myMusic = \relative c' {
       \clef "treble_8"
       \myMusic
     }
-    \new TabStaff {
+    \new TabStaff \myMusic
+  >>
+}
+
+\score {
+  <<
+    \new Staff {
+      \clef "treble_8"
+      \myMusic
+    }
+    \new TabStaff \with { \override Glissando.style = #'none } {
       \myMusic
     }
   >>
diff --git a/Documentation/snippets/chord-name-exceptions.ly b/Documentation/snippets/chord-name-exceptions.ly
index 759c02140d..914c06f1e6 100644
--- a/Documentation/snippets/chord-name-exceptions.ly
+++ b/Documentation/snippets/chord-name-exceptions.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, specific-notation"
@@ -17,7 +17,6 @@ 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 b4a345d464..832dda877d 100644
--- a/Documentation/snippets/chord-name-major7.ly
+++ b/Documentation/snippets/chord-name-major7.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, specific-notation"
@@ -16,7 +16,6 @@ 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 ffac03d80b..89b2ea95e6 100644
--- a/Documentation/snippets/chordchanges-for-fretboards.ly
+++ b/Documentation/snippets/chordchanges-for-fretboards.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly
index c335944a5a..db4e80b032 100644
--- a/Documentation/snippets/chords-headword.ly
+++ b/Documentation/snippets/chords-headword.ly
@@ -1,19 +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.17.6
-\version "2.17.6"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "headword"
-  texidoc = ""
-  doctitle = "headword"
-} % begin verbatim
 
+  texidoc = "
+.
 
+"
+  doctitle = "Chords headword"
+} % begin verbatim
 
 theChords = \chordmode {
   \time 2/2
@@ -100,4 +101,3 @@ Bass = {
     }
   }
 }
-\paper {  }
diff --git a/Documentation/snippets/chords.snippet-list b/Documentation/snippets/chords.snippet-list
index 86bdaefd0e..c774f57f8b 100644
--- a/Documentation/snippets/chords.snippet-list
+++ b/Documentation/snippets/chords.snippet-list
@@ -1,7 +1,7 @@
 adding-a-figured-bass-above-or-below-the-notes.ly
 adding-bar-lines-to-chordnames-context.ly
 avoiding-collisions-with-chord-fingerings.ly
-bar-chords-notation-for-guitar--with-text-spanner.ly
+bar-chords-notation-for-guitar-with-text-spanner.ly
 changing-chord-separator.ly
 changing-the-chord-names-to-german-or-semi-german-notation.ly
 changing-the-positions-of-figured-bass-alterations.ly
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 e7155b5355..541c2d67ba 100644
--- a/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
+++ b/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches"
@@ -16,7 +16,6 @@ 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 ee58d574b6..b7be958297 100644
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout"
@@ -33,7 +33,6 @@ are generated.
   doctitle = "Clip systems"
 } % begin verbatim
 
-
 #(ly:set-option 'clip-systems)
 #(define output-suffix "1")
 
diff --git a/Documentation/snippets/clusters.ly b/Documentation/snippets/clusters.ly
index 50bc544ad0..82974911e1 100644
--- a/Documentation/snippets/clusters.ly
+++ b/Documentation/snippets/clusters.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, contemporary-notation, keyboards, really-cool, simultaneous-notes, specific-notation"
@@ -17,7 +17,6 @@ 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 16ed079f6e..23b25a5523 100644
--- a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
+++ b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, pitches, really-cool"
diff --git a/Documentation/snippets/combining-dynamics-with-markup-texts.ly b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
index b778e8b394..14fc861c1c 100644
--- a/Documentation/snippets/combining-dynamics-with-markup-texts.ly
+++ b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, really-simple, text"
@@ -18,9 +18,10 @@ block.
   doctitle = "Combining dynamics with markup texts"
 } % begin verbatim
 
-
 piuF = \markup { \italic più \dynamic f }
+
 \layout { ragged-right = ##f }
+
 \relative c'' {
   c2\f c-\piuF
 }
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 0a8477adc5..643dacbe86 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes, syntax-and-expressions, text"
@@ -30,6 +30,7 @@ staff: standard polyphony, @code{\\partcombine} without texts, and
   doctitle = "Combining two parts on the same staff"
 } % begin verbatim
 
+%% Combining pedal notes with clef changes
 
 musicUp = \relative c'' {
   \time 4/4
diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index 9b1a047a5b..4734934723 100644
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,27 +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.17.15
-\version "2.17.15"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.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.
+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
 
-
 \relative c' {
   \compoundMeter #'((2 8) (3 8))
   c8 d e fis gis
diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index b30f7e7393..514718f9bd 100644
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,42 +1,39 @@
-% 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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "rhythms"
+
   texidoc = "
 Beat grouping within a measure is controlled by the context property
-@code{beatStructure}.  Values of @code{beatStructure} are
-established for many time signatures in
-@file{scm/time-signature-settings.scm}.  Values of @code{beatStructure}
-can be changed or set with @code{\\set}.
-Alternatively, @code{\\time} can be used to both
-set the time signature and establish the beat structure.
-For this, you specify the internal grouping of beats in a measure
-as a list of numbers (in Scheme syntax) before the time signature.
+@code{beatStructure}.  Values of @code{beatStructure} are established
+for many time signatures in @@file@{scm/time-signature-settings.scm@}.
+Values of @code{beatStructure} can be changed or set with @code{\\set}.
+Alternatively, @code{\\time} can be used to both set the time signature
+and establish the beat structure. For this, you specify the internal
+grouping of beats in a measure as a list of numbers (in Scheme syntax)
+before the time signature.
 
 @code{\\time} applies to the @code{Timing} context, so it will not
 reset values of @code{beatStructure} or @code{baseMoment} that are set
 in other lower-level contexts, such as @code{Voice}.
 
-If the @code{Measure_grouping_engraver} is included
-in one of the display contexts, measure grouping signs will be
-created.  Such signs ease reading rhythmically complex modern music.
-In the example, the 9/8 measure is grouped in two different
-patterns using the two different methods, while the 5/8 measure
-is grouped according to the default setting in
-@file{scm/time-signature-settings.scm}:
+If the @code{Measure_grouping_engraver} is included in one of the
+display contexts, measure grouping signs will be created.  Such signs
+ease reading rhythmically complex modern music. In the example, the 9/8
+measure is grouped in two different patterns using the two different
+methods, while the 5/8 measure is grouped according to the default
+setting in @@file@{scm/time-signature-settings.scm@}:
+
 "
   doctitle = "Conducting signs measure grouping signs"
 } % begin verbatim
 
-
-
 \score {
   \new Voice \relative c'' {
     \time 9/8
diff --git a/Documentation/snippets/consistently-left-aligned-bar-numbers.ly b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
index f2b61e8e8d..c37bc7240e 100644
--- a/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
+++ b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
@@ -1,17 +1,17 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
 
   texidoc = "
 When left aligning bar numbers, overlapping problems may occur with
-Staves brackets. The snippet solves this by keeping right aligned the
+Staves brackets.  The snippet solves this by keeping right aligned the
 first bar number following line breaks.
 
 "
diff --git a/Documentation/snippets/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
index 7d9d563318..1585518199 100644
--- a/Documentation/snippets/contemporary-glissando.ly
+++ b/Documentation/snippets/contemporary-glissando.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, expressive-marks, specific-notation"
@@ -17,7 +17,6 @@ hidden note and cadenza timing.
   doctitle = "Contemporary glissando"
 } % begin verbatim
 
-
 \relative c'' {
   \time 3/4
   \override Glissando.style = #'zigzag
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 4df07c679e..a434f35d75 100644
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
index 4e264c604e..9c29cba1eb 100644
--- a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
+++ b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, editorial-annotations, fretted-strings, keyboards, specific-notation"
@@ -18,7 +18,6 @@ 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 d4091b033d..9c03616528 100644
--- a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
+++ b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -23,7 +23,6 @@ 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 9c74de6b45..37def33224 100644
--- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
+++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -21,7 +21,6 @@ bracket), @code{#f} (never print a bracket) or @code{#'if-no-beam}
   doctitle = "Controlling tuplet bracket visibility"
 } % begin verbatim
 
-
 music = \relative c'' {
   \tuplet 3/2 { c16[ d e } f8]
   \tuplet 3/2 { c8 d e }
@@ -37,5 +36,8 @@ music = \relative c'' {
     << \music s4^"#t" >>
     \override TupletBracket.bracket-visibility = ##f
     << \music s4^"#f" >>
+    %% v2.18 :
+    \omit TupletBracket
+    << \music s4^"omit" >>
   }
 }
diff --git a/Documentation/snippets/correction-wanted.snippet-list b/Documentation/snippets/correction-wanted.snippet-list
index b551d6eaca..ed1279b54c 100644
--- a/Documentation/snippets/correction-wanted.snippet-list
+++ b/Documentation/snippets/correction-wanted.snippet-list
@@ -1,2 +1 @@
-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 1e44aa49cf..0787bc8b0c 100644
--- a/Documentation/snippets/creating-a-delayed-turn.ly
+++ b/Documentation/snippets/creating-a-delayed-turn.ly
@@ -1,10 +1,9 @@
-% 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.18.0
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
@@ -14,14 +13,14 @@
 Creating a delayed turn, where the lower note of the turn uses the
 accidental, requires several overrides.  The
 @code{outside-staff-priority} property must be set to @code{#f}, as
-otherwise this would take precedence over the
-@code{avoid-slur property}.  Changing the fractions @code{2/3} and
-@code{1/3} adjusts the horizontal position.
+otherwise this would take precedence over the @code{avoid-slur
+property}.  Changing the fractions @code{2/3} and @code{1/3} adjusts
+the horizontal position.
+
 "
   doctitle = "Creating a delayed turn"
 } % begin verbatim
 
-
 \relative c'' {
   c2*2/3 ( s2*1/3\turn d4) r
   <<
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 52b16bbb59..bdf4cee328 100644
--- a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
+++ b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -18,7 +18,6 @@ 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 f264ed64f2..69d3626554 100644
--- a/Documentation/snippets/creating-blank-staves.ly
+++ b/Documentation/snippets/creating-blank-staves.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, editorial-annotations, paper-and-layout, specific-notation, staff-notation"
@@ -19,7 +19,6 @@ To create blank staves, generate empty measures then remove the
   doctitle = "Creating blank staves"
 } % begin verbatim
 
-
 #(set-global-staff-size 20)
 
 \score {
@@ -41,6 +40,8 @@ To create blank staves, generate empty measures then remove the
   }
 }
 
+% uncomment these lines for "letter" size
+%{
 \paper {
   #(set-paper-size "letter")
   ragged-last-bottom = ##f
@@ -49,3 +50,16 @@ To create blank staves, generate empty measures then remove the
   bottom-margin = 0.25\in
   top-margin = 0.25\in
 }
+%}
+
+% uncomment these lines for "A4" size
+%{
+\paper {
+  #(set-paper-size "a4")
+  ragged-last-bottom = ##f
+  line-width = 180
+  left-margin = 15
+  bottom-margin = 10
+  top-margin = 10
+}
+%}
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 a46b5a8dbc..d49f35abc7 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -18,7 +18,6 @@ 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 168043d7e9..87beb1f21f 100644
--- a/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
+++ b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -18,7 +18,6 @@ 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 aaf9962842..7949e5aec4 100644
--- a/Documentation/snippets/creating-double-digit-fingerings.ly
+++ b/Documentation/snippets/creating-double-digit-fingerings.ly
@@ -1,22 +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.17.15
-\version "2.17.15"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, scheme-language, staff-notation, tweaks-and-overrides"
 
   texidoc = "
 Creating fingerings larger than 5 is possible.
+
 "
   doctitle = "Creating double-digit fingerings"
 } % begin verbatim
 
-
 \relative c' {
   c1-10
   c1-50
diff --git a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
index a234b65082..62ebc5e726 100644
--- a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
+++ b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -17,7 +17,6 @@ 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 d6299a8ca8..8d6eec5122 100644
--- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly
+++ b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
@@ -1,11 +1,10 @@
-% 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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
   lsrtags = "expressive-marks, text, workaround"
@@ -27,7 +26,6 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}.
   doctitle = "Creating \"real\" parenthesized dynamics"
 } % begin verbatim
 
-
 paren =
 #(define-event-function (parser location dyn) (ly:event?)
    (make-dynamic-script
diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
index eefa6f5917..c93fc9ed82 100644
--- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
+++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
@@ -32,7 +32,7 @@ end of one system and the start of the following system.
   % the hidden measure and bar line
   % \cadenzaOn turns off automatic calculation of bar numbers
   \cadenzaOn
-  \once \omit Score.TimeSignature
+  \once \override Score.TimeSignature.stencil = ##f
   \time 1/16
   s16 \bar ""
   \cadenzaOff
diff --git a/Documentation/snippets/creating-slurs-across-voices.ly b/Documentation/snippets/creating-slurs-across-voices.ly
index 74e82c55e2..847de5949a 100644
--- a/Documentation/snippets/creating-slurs-across-voices.ly
+++ b/Documentation/snippets/creating-slurs-across-voices.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "connecting-notes, expressive-marks, keyboards, real-music, unfretted-strings"
@@ -23,7 +23,6 @@ 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 5e18e550e2..d0c209273e 100644
--- a/Documentation/snippets/creating-text-spanners.ly
+++ b/Documentation/snippets/creating-text-spanners.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
@@ -19,7 +19,6 @@ 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 cb4ec966af..f0929dc32c 100644
--- a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, keyboards, tweaks-and-overrides, workaround"
@@ -15,14 +15,13 @@ cross-staff chords, because no problems with automatic beam collision
 avoidance then arise.  If the stems from the lower staff were used in
 the following example, it would be necessary to change the automatic
 beam collision avoidance settings so that it doesn't detect collisions
-between staves using @code{\\override Staff.Beam.collision-voice-only
-= ##t}
+between staves using @code{\\override Staff.Beam.collision-voice-only =
+##t}
 
 "
   doctitle = "Cross-staff chords - beaming problems workaround"
 } % begin verbatim
 
-
 \new PianoStaff <<
   \new Staff = up
     \relative c' {
diff --git a/Documentation/snippets/cross-staff-stems.ly b/Documentation/snippets/cross-staff-stems.ly
index cfcc9ef0d0..448187f8ec 100644
--- a/Documentation/snippets/cross-staff-stems.ly
+++ b/Documentation/snippets/cross-staff-stems.ly
@@ -1,24 +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.16.0
-\version "2.16.0"
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, staff-notation, tweaks-and-overrides"
+
   texidoc = "
-This snippet shows the use of the @code{Span_stem_engraver}
-and @code{\\crossStaff} to connect stems across staves automatically.
-The stem length need not be specified, as the variable distance
-between noteheads and staves is calculated automatically.
+This snippet shows the use of the @code{Span_stem_engraver} and
+@code{\\crossStaff} to connect stems across staves automatically.
+
+The stem length need not be specified, as the variable distance between
+noteheads and staves is calculated automatically.
+
 "
   doctitle = "Cross staff stems"
 } % begin verbatim
 
-
 \layout {
   \context {
     \PianoStaff
diff --git a/Documentation/snippets/cross-staff-tremolos.ly b/Documentation/snippets/cross-staff-tremolos.ly
index 980feb5310..83808e2757 100644
--- a/Documentation/snippets/cross-staff-tremolos.ly
+++ b/Documentation/snippets/cross-staff-tremolos.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, real-music, repeats"
@@ -19,7 +19,6 @@ 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 b653e146ac..e22f5a69f3 100644
--- a/Documentation/snippets/custodes.ly
+++ b/Documentation/snippets/custodes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, specific-notation, symbols-and-glyphs, tweaks-and-overrides"
@@ -16,7 +16,6 @@ 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 f9d5816c37..f619e246a3 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -20,7 +20,6 @@ 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 57032ef0fd..b48ecb6058 100644
--- a/Documentation/snippets/customizing-markup-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-markup-fret-diagrams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -19,7 +19,6 @@ markup.
   doctitle = "Customizing markup fret diagrams"
 } % begin verbatim
 
-
 <<
   \chords { c1 | c | c | d }
 
diff --git a/Documentation/snippets/customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly b/Documentation/snippets/customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly
new file mode 100644
index 0000000000..8f733ad73e
--- /dev/null
+++ b/Documentation/snippets/customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly
@@ -0,0 +1,76 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "scheme-language, symbols-and-glyphs"
+
+  texidoc = "
+If you want to customize the position and/or number of dots in repeat
+sign bar lines, you can define new custom bar lines or redefine the way
+ default repeat signs are drawn.  This snippet shows how.  This may be
+particularly helpful when using a staff with custom line-positions, as
+shown in this snippet.
+
+"
+  doctitle = "Customizing the position and number of dots in repeat sign bar lines"
+} % begin verbatim
+
+% \version "2.18.0"
+
+#(define ((make-custom-dot-bar-line dot-positions) grob extent)
+
+   "Draw dots (repeat sign dots) at @var{dot-positions}. The
+coordinates of @var{dot-positions} are equivalent to the
+coordinates of @code{StaffSymbol.line-positions}, a dot-position
+of X and a line-position of X indicate the same vertical position."
+
+   (let* ((staff-space (ly:staff-symbol-staff-space grob))
+          (dot (ly:font-get-glyph (ly:grob-default-font grob) "dots.dot"))
+          (stencil empty-stencil))
+     (for-each
+      (lambda (dp)
+        (set! stencil (ly:stencil-add stencil
+                        (ly:stencil-translate-axis dot (* dp (/ staff-space 2)) Y))))
+      dot-positions)
+     stencil))
+
+% With the procedure above we can define custom bar-lines, for example,
+% one that resembles standard repeat sign bar lines except it has
+% three dots at staff positions -3, 0, and 3.
+
+#(add-bar-glyph-print-procedure "*" (make-custom-dot-bar-line '(-3 0 3)))
+\defineBarLine ".|*" #'("" "*" "")
+\defineBarLine "*|." #'("" "*" "")
+
+% We can also customize the dot positions used in all default repeat signs
+% by redefining the print procedure of the colon bar glyph (":"). On a staff
+% with line-positions of '(-4 -2 2 4) the default repeat sign dots appear
+% at '(-3 3), but we can put them at '(-1 1) instead.
+
+#(add-bar-glyph-print-procedure ":" (make-custom-dot-bar-line '(-1 1)))
+
+
+\new Staff \with {
+  \override StaffSymbol.line-positions = #'(-4 -2 2 4)
+  \override StaffSymbol.staff-space = #1.3
+} {
+  \relative f' {
+    g1
+    \bar ".|*"
+    g
+    \bar "*|."
+    g
+    \bar ".|:"
+    g
+    \bar ":|."
+    g
+    \repeat volta 2 {
+      g
+    }
+  }
+}
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 50ff9bc0cd..07471da72d 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -17,7 +17,6 @@ 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-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
index 6ba7858cca..6a3b029cd3 100644
--- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
+++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -27,7 +27,6 @@ information.  This is planned to be corrected in the future.
   doctitle = "Defining predefined fretboards for other instruments"
 } % begin verbatim
 
-
 % add FretBoards for the Cuatro
 %   Note: This section could be put into a separate file
 %      predefined-cuatro-fretboards.ly
@@ -108,7 +107,7 @@ primeros = {
   \layout {
     \context {
       \Score
-      \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16)
+      \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16)
     }
   }
   \midi { }
diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index 434587651f..44199d8fd9 100644
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "midi, real-music, specific-notation"
@@ -19,7 +19,6 @@ 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 38b3bc30a9..a99002b0bf 100644
--- a/Documentation/snippets/demonstrating-all-headers.ly
+++ b/Documentation/snippets/demonstrating-all-headers.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout, text, titles"
@@ -16,7 +16,6 @@ A demonstration of all headers.
   doctitle = "Demonstrating all headers"
 } % begin verbatim
 
-
 \header {
   copyright = "copyright"
   title = "title"
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 94d61a4be5..a7d99645bc 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly b/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
index bb20ae2d0e..60a68c3a13 100644
--- a/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
+++ b/Documentation/snippets/displaying-a-whole-grandstaff-system-if-only-one-of-its-staves-is-alive.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.15"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers"
@@ -35,8 +35,10 @@ the second violin is also displayed.
     <<
       \new Staff = "Staff_flute" \with {
         instrumentName = "Flute"
-        shortInstrumentName = "Fl"}
-        \relative c' { \repeat unfold 3 { c'4 c c c | c c c c | c c c c | \break }
+        shortInstrumentName = "Fl"
+      }
+      \relative c' {
+        \repeat unfold 3 { c'4 c c c | c c c c | c c c c | \break }
       }
     >>
     \new StaffGroup = "StaffGroup_Strings"
diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 902541ce0c..a433eb96d0 100644
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, simultaneous-notes, workaround"
@@ -18,14 +18,16 @@ with different accidentals.
 } % begin verbatim
 
 fixA = {
-  \once \override Stem.length = #9
+  \once \override Stem.length = #11
 }
+
 fixB = {
   \once \override NoteHead.X-offset = #1.7
+  \once \override Stem.length = #7
   \once \override Stem.rotation = #'(45 0 0)
-  \once \override Stem.extra-offset = #'(-0.2 . -0.2)
+  \once \override Stem.extra-offset = #'(-0.1 . -0.2)
   \once \override Flag.style = #'no-flag
-  \once \override Accidental.extra-offset = #'(4 . 0)
+  \once \override Accidental.extra-offset = #'(4 . -.1)
 }
 
 \relative c' {
diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index d6c8d46a2a..7a75bb1a33 100644
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "devel, scheme-language, tweaks-and-overrides"
@@ -39,7 +39,7 @@ When called this way
 
 
 @{
- \\once \\override NoteHead.before-line-breaking = #display-ancestry
+ \\once \\override NoteHead #'before-line-breaking = #display-ancestry
  c @}
 
 
@@ -65,6 +65,9 @@ NoteHead X,Y: NoteColumn
   doctitle = "Displaying grob ancestry"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=622
+%% see also http://www.lilypond.org/doc/v2.18/Documentation/snippets/tweaks-and-overrides#tweaks-and-overrides-displaying-grob-ancestry
+
 #(define (grob-name grob)
    (if (ly:grob? grob)
        (assoc-ref (ly:grob-property grob 'meta) 'name)
diff --git a/Documentation/snippets/dotted-harmonics.ly b/Documentation/snippets/dotted-harmonics.ly
index aa453021e4..8f2fb4946c 100644
--- a/Documentation/snippets/dotted-harmonics.ly
+++ b/Documentation/snippets/dotted-harmonics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "real-music, tweaks-and-overrides, unfretted-strings"
@@ -17,7 +17,6 @@ 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 316dc5fb00..289bee432f 100644
--- a/Documentation/snippets/double-glissando.ly
+++ b/Documentation/snippets/double-glissando.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, expressive-marks, simultaneous-notes, workaround"
@@ -17,7 +17,6 @@ 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 a95c7739b5..8059c2d011 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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)
@@ -30,7 +29,6 @@ arbitrary grob.
   b8
 
   \revert Stem.stencil
-
   \revert Flag.stencil
   c4. c4
   \mark "F"
diff --git a/Documentation/snippets/drawing-circles-around-note-heads.ly b/Documentation/snippets/drawing-circles-around-note-heads.ly
index 44cfe8c7a1..b178fa7f01 100644
--- a/Documentation/snippets/drawing-circles-around-note-heads.ly
+++ b/Documentation/snippets/drawing-circles-around-note-heads.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -26,4 +26,4 @@ circle =
             (ly:stencil-extent note X)
             (ly:stencil-extent note Y))))
 
-{ \circle c' }
+{ \circle c'' }
diff --git a/Documentation/snippets/drawing-circles-around-various-objects.ly b/Documentation/snippets/drawing-circles-around-various-objects.ly
index 196a3d8c81..a86e85f237 100644
--- a/Documentation/snippets/drawing-circles-around-various-objects.ly
+++ b/Documentation/snippets/drawing-circles-around-various-objects.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
index b673f2165f..f7264aa0f8 100644
--- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly
index 3a57f5a214..b7f84a1392 100644
--- a/Documentation/snippets/dynamics-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly
index e6b962a557..169e808c6c 100644
--- a/Documentation/snippets/editorial-headword.ly
+++ b/Documentation/snippets/editorial-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -21,8 +21,6 @@ Beethoven, Op. 31, No. 3 Piano sonata 18, Movt II, Scherzo Measures 9 -
 
 \include "english.ly"
 
-% NR 1.7 Editorial annotations
-
 % Beethoven, Op. 31, No. 3
 % Piano sonata 18, Movt II, Scherzo
 % Measures 9 - 14
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 77354ead09..6aa000eb5f 100644
--- a/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
+++ b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, specific-notation, text"
@@ -17,7 +17,6 @@ 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 68cadaf223..5d1bcf060c 100644
--- a/Documentation/snippets/engravers-one-by-one.ly
+++ b/Documentation/snippets/engravers-one-by-one.ly
@@ -1,5 +1,5 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
@@ -41,7 +41,6 @@ line, etc. form a @code{Staff} context.
   doctitle = "Engravers one-by-one"
 } % 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 76bf91d1ce..f2a49ce9c3 100644
--- a/Documentation/snippets/engraving-ties-manually.ly
+++ b/Documentation/snippets/engraving-ties-manually.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -19,7 +19,6 @@ 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 1338e8c175..48e2f42a0c 100644
--- a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
+++ b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats, rhythms"
@@ -25,7 +25,6 @@ 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/extending-a-trillspanner.ly b/Documentation/snippets/extending-a-trillspanner.ly
new file mode 100644
index 0000000000..9c1a2a4866
--- /dev/null
+++ b/Documentation/snippets/extending-a-trillspanner.ly
@@ -0,0 +1,37 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "staff-notation, syntax-and-expressions, tweaks-and-overrides"
+
+  texidoc = "
+For @code{TrillSpanner}, the @code{minimum-length} property becomes
+effective only if the @code{set-spacing-rods} procedure is called
+explicitly.  To do this, the @code{springs-and-rods} property should be
+set to @code{ly:spanner::set-spacing-rods}.
+
+"
+  doctitle = "Extending a TrillSpanner"
+} % begin verbatim
+
+%=> http://lilypond-french-users.1298960.n2.nabble.com/Allonger-un-trille-td7581110.html
+
+%by P.P.Schneider on April 2014
+
+\relative c' {
+\key c\minor
+  \time 2/4
+  c16( as') c,-. des-.
+  \once\override TrillSpanner.minimum-length = #15
+  \once\override TrillSpanner.springs-and-rods = #ly:spanner::set-spacing-rods
+  \afterGrace es4
+  \startTrillSpan { d16[( \stopTrillSpan es)] }
+  c( c' g es c g' es d
+  \hideNotes
+  c8)
+}
diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
index fff3fddafb..9a4a8fcc17 100644
--- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly
+++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, workaround"
@@ -16,7 +16,6 @@ A hammer in tablature can be faked with slurs.
   doctitle = "Faking a hammer in tablatures"
 } % begin verbatim
 
-
 \score {
   \new TabStaff {
     \relative c'' {
diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index 018a27b61c..190cec94a0 100644
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -78,7 +78,7 @@ extendOff = \bassFigureExtendersOff
       r16 d16 |
       d4 bes,4 a,4 f4 |
       g8 f16 g16 a8 a,8 d4 d'4 ~ |
-      8 c'8 b4 c'8 c'16 bes16 a4 |
+      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 |
diff --git a/Documentation/snippets/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
index b9cdf44f71..e10d870258 100644
--- a/Documentation/snippets/fine-tuning-pedal-brackets.ly
+++ b/Documentation/snippets/fine-tuning-pedal-brackets.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
@@ -16,7 +16,6 @@ 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 e4ea09092f..b5b45281fd 100644
--- a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
+++ b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "symbols-and-glyphs, winds"
@@ -26,15 +26,23 @@ centermarkup = {
       ,(ly:make-simple-closure (list
         ly:self-alignment-interface::x-aligned-on-self))))
 }
-\score
-{\relative c'
-  {
+
+\score {
+  \relative c'{
     g\open
-    \once \override TextScript.staff-padding = #-1.0 \centermarkup
-    g^\markup{\combine \musicglyph #"scripts.open" \musicglyph
-    #"scripts.tenuto"}
-    \centermarkup g^\markup{\combine \musicglyph #"scripts.open"
-    \musicglyph #"scripts.stopped"}
+    \once \override TextScript.staff-padding = #-1.0
+    \centermarkup
+    g^\markup {
+      \combine
+        \musicglyph #"scripts.open"
+        \musicglyph #"scripts.tenuto"
+    }
+    \centermarkup
+    g^\markup {
+      \combine
+        \musicglyph #"scripts.open"
+        \musicglyph #"scripts.stopped"
+    }
     g\stopped
   }
 }
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 f57ab20dee..0b5bc43a1a 100644
--- a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
+++ b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -17,7 +17,6 @@ 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 db142cd9d2..c3cfd54623 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific"
@@ -34,66 +34,34 @@ This snippet contains some header-like code that can be copied as
   doctitle = "Flamenco notation"
 } % begin verbatim
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%  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 } } }
+% Text indicators :
+abanico = ^\markup\small { \italic Abanico }
+rasgueado = ^\markup\small { \italic Ras. }
+alzapua = ^\markup\small { \italic Alzapua }
+
+% Finger stroke symbols :
+strokeUp = \markup\combine\override #'(thickness . 1.3) \draw-line #'(0 . 2)\raise #2 \arrow-head #Y #UP ##f
+strokeDown = \markup\combine\arrow-head #Y #DOWN ##f \override #'(thickness . 1.3) \draw-line #'(0 . 2)
+
+% Golpe symbol :
+golpe = \markup {
+  \filled-box #'(0 . 1) #'(0 . 1) #0
+  \hspace #-1.6
+  \with-color #white
+  \filled-box #'(0.15 . 0.85) #'(0.15 . 0.85) #0
+}
 
+% Strokes, fingers and golpe command :
+RHp = \rightHandFinger #1
+RHi = \rightHandFinger #2
+RHm = \rightHandFinger #3
+RHa = \rightHandFinger #4
+RHx = \rightHandFinger #5
+RHu = \rightHandFinger \strokeUp
+RHd = \rightHandFinger \strokeDown
+RHg = \rightHandFinger \golpe
 
 % Just handy :)
 tupletOff = {
@@ -127,105 +95,98 @@ headsOn = {
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 part = \relative c' {
-  <a, e' a cis e>8^\iUp
-  <a e' a cis e>8^\iDown
+  \set strokeFingerOrientations = #'(up)
+  \override StrokeFinger.add-stem-support = ##t
+  \key a\major
+  <a, e' a cis e\RHu\RHi>8
+  <a e' a cis e\RHd\RHi>8
   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^\markup\golpe
+  <a e' a cis e\RHu\RHi>8
+  <a e' a cis e\RHd\RHi>8
+  <a e' a cis e\RHu\RHi\RHg>8
+  <a e' a cis e\RHd\RHi>8
   r2
-
-  <a e' a cis e>16^\aUp
+  <a e' a cis e\RHu\RHa>16\rasgueado
   \headsOff
-  <a e' a cis e>^\mUp
-  <a e' a cis e>^\iUp
-  <a e' a cis e>^\iDown~
+  <a e' a cis e\RHu\RHm>
+  <a e' a cis e\RHu\RHi>
+  <a e' a cis e\RHd\RHi>~
   \headsOn
   <a e' a cis e>2
   r4
-
   \tupletOff
   \tuplet 5/4 {
-    <a e' a cis e>16^\xUp
+    <a e' a cis e\RHu\RHx>16\rasgueado
     \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~
+    <a e' a cis e\RHu\RHa>
+    <a e' a cis e\RHu\RHm>
+    <a e' a cis e\RHu\RHi>
+    <a e' a cis e\RHd\RHi>~
     \headsOn
   }
   <a e' a cis e>2
   r4
-
   \tupletsOff
   \tuplet 3/2 {
-    <a e' a cis e>8^\pDown
+    <a e' a cis e\RHd\RHp>8\abanico
     \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
+    <a e' a cis e\RHu\RHx>
+    <a e' a cis e\RHu\RHi>
     \headsOn
   }
-
   \tuplet 3/2 {
-    <a e' a cis e>8^\pDown
+    <a e' a cis e\RHd\RHp>8
     \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
+    <a e' a cis e\RHu\RHx>
+    <a e' a cis e\RHu\RHi>
     \headsOn
   }
-
   \tuplet 3/2 {
-    <a e' a cis e>8^\pDown
+    <a e' a cis e\RHd\RHp>8
     \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
+    <a e' a cis e\RHu\RHx>
+    <a e' a cis e\RHu\RHi>
     \headsOn
   }
   \tuplet 3/2 {
-    <a e' a cis e>8^\pDown
+    <a e' a cis e\RHd\RHp>8
     \headsOff
-    <a e' a cis e>^\xUp
-    <a e' a cis e>^\iUp
+    <a e' a cis e\RHu\RHx>
+    <a e' a cis e\RHu\RHi>
     \headsOn
   }
-
   \tupletsOff
   \override Beam.positions = #'(2 . 2)
   \tuplet 3/2 {
-    a8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
+    a8\RHp\alzapua
+    <e' a\RHu\RHg>
+    <e a\RHd>
   }
   \tuplet 3/2 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
+    a,8\RHp
+    <e' a\RHu\RHg>
+    <e a\RHd>
   }
   \tuplet 3/2 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
+    a,8\RHp
+    <e' a\RHu\RHg>
+    <e a\RHd>
   }
   \tuplet 3/2 {
-    a,8^\markup{ \small p }
-    <e' a>^\strokeUpGolpe
-    <e a>^\strokeDown
+    a,8\RHp
+    <e' a\RHu\RHg>
+    <e a\RHd>
   }
   \tupletsOn
-
-  \once \override TextScript.extra-offset = #'(0 . -1)
-  <g, b f'>1_\golpe^\mUp
+  <a, e' a\RHu\RHm>1
   \bar "|."
 }
 
 \score {
   \new StaffGroup <<
     \context Staff = "part" <<
-      \clef G
-      \transpose c c'
+      \clef "G_8"
       {
         \part
       }
diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index fb387f9b69..c9ee89ee72 100644
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, winds"
@@ -18,7 +18,6 @@ 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 2d02d9aa93..7f0dcb1686 100644
--- a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
+++ b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches"
@@ -20,7 +20,6 @@ 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 e2413c73b2..07554c25f0 100644
--- a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
+++ b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 6ab4f3706f..cf44f33171 100644
--- a/Documentation/snippets/forcing-hyphens-to-be-shown.ly
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "vocal-music"
@@ -18,7 +18,6 @@ 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 244eefef50..10a95c5417 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
@@ -1,26 +1,23 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation, workaround"
 
   texidoc = "
-By default, metronome marks do not influence horizontal spacing.  This
-has one downside: when using compressed rests, some metronome marks may
-be too close and therefore are printed vertically stacked, as
-demonstrated in the first part of this example.  This can be solved
-through a simple override, as shown in the second half of the example.
+By default, metronome marks do not influence horizontal spacing.   This
+can be solved 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
@@ -32,12 +29,9 @@ example = {
 
 {
   \compressFullBarRests
-
   \example
-
   R1
   R1
-
-  \override Score.MetronomeMark.extra-spacing-width = #'(0 . 0)
+  \override Score.MetronomeMark.extra-spacing-width = #'(-3 . 0)
   \example
 }
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 7304d1a9b3..fa1ea91899 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, preparing-parts, really-simple, rhythms"
@@ -17,7 +17,6 @@ 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 aa5df6fa83..983c0b98bc 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index 7ae4dead64..4f6ea0daf2 100644
--- a/Documentation/snippets/fret-diagrams-explained-and-developed.ly
+++ b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 68965a6ee5..8458350411 100644
--- a/Documentation/snippets/fretboards-alternate-tables.ly
+++ b/Documentation/snippets/fretboards-alternate-tables.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
diff --git a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
index a62c85dddd..ea58f737f6 100644
--- a/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/fretted-string-harmonics-in-tablature.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -67,7 +67,8 @@ frettedStrings = {
 
 \score {
   <<
-    \new Staff {
+    \new Staff
+    \with { \omit StringNumber } {
       \new Voice {
         \clef "treble_8"
         \harmonics
diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list
index 35ad8bda09..5f1f9f0cd6 100644
--- a/Documentation/snippets/fretted-strings.snippet-list
+++ b/Documentation/snippets/fretted-strings.snippet-list
@@ -1,7 +1,7 @@
 adding-fingerings-to-a-score.ly
 adding-fingerings-to-tablatures.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
-bar-chords-notation-for-guitar--with-text-spanner.ly
+bar-chords-notation-for-guitar-with-text-spanner.ly
 changing-fret-orientations.ly
 chord-glissando-in-tablature.ly
 chordchanges-for-fretboards.ly
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index cf2bfb23e9..d979660dfa 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, really-cool, scheme-language"
@@ -19,7 +19,6 @@ 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
index cc30a8b2bf..d08471155e 100644
--- a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
+++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, really-cool, scheme-language"
@@ -38,6 +38,7 @@ 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
diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
index 5233a96703..524a742b51 100644
--- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
+++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly
index 254a266304..561a346a3f 100644
--- a/Documentation/snippets/grid-lines--changing-their-appearance.ly
+++ b/Documentation/snippets/grid-lines--changing-their-appearance.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -17,7 +17,6 @@ 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 927ad32969..f6c1dc3593 100644
--- a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+++ b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -19,7 +19,6 @@ this snippet.
   doctitle = "Grid lines: emphasizing rhythms and notes synchronization"
 } % begin verbatim
 
-
 \score {
   \new ChoirStaff {
     \relative c'' <<
diff --git a/Documentation/snippets/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly
index 7de010c2b6..2e52aeb090 100644
--- a/Documentation/snippets/guitar-strum-rhythms.ly
+++ b/Documentation/snippets/guitar-strum-rhythms.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, rhythms"
@@ -17,7 +17,6 @@ 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 ebfcda0513..2de50e5d30 100644
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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/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 7cb8869e0a..98fa6bc099 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,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches"
@@ -19,7 +19,7 @@ system.
 
 \relative c'' {
   \override Accidental.hide-tied-accidental-after-break = ##t
-  cis1~ 1~
+  cis1~ cis~
   \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 682e2d5421..b92da64840 100644
--- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
+++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -18,7 +18,6 @@ following way:
   doctitle = "Hiding the extender line for text dynamics"
 } % begin verbatim
 
-
 \relative c'' {
   \override DynamicTextSpanner.style = #'none
   \crescTextCresc
diff --git a/Documentation/snippets/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
index da24c5a5dd..7556b0e9b3 100644
--- a/Documentation/snippets/how-to-change-fret-diagram-position.ly
+++ b/Documentation/snippets/how-to-change-fret-diagram-position.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, tweaks-and-overrides"
@@ -29,7 +29,6 @@ itself.
   doctitle = "How to change fret diagram position"
 } % begin verbatim
 
-
 harmonies = \chordmode
 {
   a8:13
@@ -51,7 +50,7 @@ harmonies = \chordmode
      b4.~^\markup { \fret-diagram  #"6-x;5-2;4-4;3-2;2-2;1-4;"  } b4. a8\break
 % HERE IS THE SECOND METHOD
      <<
-       { a8 b4.~ 4. a8}
+       { a8 b4.~ b4. a8}
        { s4 s4 s4^\markup { \fret-diagram  #"6-x;5-2;4-4;3-2;2-2;1-4;"  }
        }
      >>
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 12d760f3ff..4e22c3caf0 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, staff-notation, tweaks-and-overrides"
@@ -23,7 +23,6 @@ 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 c43b550c9d..0191bbba97 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "specific-notation, symbols-and-glyphs, text, vocal-music"
@@ -16,7 +16,6 @@ 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 a6b6004a43..d748938d09 100644
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "template, vocal-music"
@@ -18,7 +18,6 @@ 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 bbb2f9fbd6..19422b6c24 100644
--- a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, real-music"
@@ -23,7 +23,6 @@ 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 c8378a2f1d..2ba8a35fa7 100644
--- a/Documentation/snippets/inserting-a-caesura.ly
+++ b/Documentation/snippets/inserting-a-caesura.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -18,7 +18,6 @@ available.
   doctitle = "Inserting a caesura"
 } % begin verbatim
 
-
 \relative c'' {
   \override BreathingSign.text = \markup {
     \musicglyph #"scripts.caesura.straight"
diff --git a/Documentation/snippets/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly
index a3fc4d0bb0..c8fb9bc22f 100644
--- a/Documentation/snippets/isolated-percent-repeats.ly
+++ b/Documentation/snippets/isolated-percent-repeats.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats"
@@ -16,7 +16,6 @@ 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 1504747297..6d6ae87a8e 100644
--- a/Documentation/snippets/keep-change-clefs-full-sized.ly
+++ b/Documentation/snippets/keep-change-clefs-full-sized.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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/keyboards.snippet-list b/Documentation/snippets/keyboards.snippet-list
index f834227dfc..29aac3541e 100644
--- a/Documentation/snippets/keyboards.snippet-list
+++ b/Documentation/snippets/keyboards.snippet-list
@@ -1,5 +1,5 @@
 accordion-discant-symbols.ly
-accordion-registers.ly
+accordion-register-symbols.ly
 changing-the-text-for-sustain-markings.ly
 clusters.ly
 controlling-the-placement-of-chord-fingerings.ly
@@ -13,5 +13,6 @@ laissez-vibrer-ties.ly
 piano-template-simple.ly
 piano-template-with-centered-lyrics.ly
 piano-template-with-melody-and-lyrics.ly
+removing-brace-on-first-line-of-piano-score.ly
 using-autochange-with-more-than-one-voice.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 d125dc8038..63f92466b5 100644
--- a/Documentation/snippets/laissez-vibrer-ties.ly
+++ b/Documentation/snippets/laissez-vibrer-ties.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "connecting-notes, contemporary-notation, expressive-marks, fretted-strings, keyboards, specific-notation"
@@ -17,7 +17,6 @@ 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 d08607014d..c6e9215d72 100644
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings, staff-notation"
@@ -16,7 +16,6 @@ Tablature can be formatted using letters instead of numbers.
   doctitle = "Letter tablature formatting"
 } % begin verbatim
 
-
 music = \relative c {
   c4 d e f
   g4 a b c
diff --git a/Documentation/snippets/line-arrows.ly b/Documentation/snippets/line-arrows.ly
index 93086da94c..d3cbe37f38 100644
--- a/Documentation/snippets/line-arrows.ly
+++ b/Documentation/snippets/line-arrows.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 9167330fe6..48d2a94611 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, text, vocal-music"
diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly
index 0b0b6bba21..8d616e36c9 100644
--- a/Documentation/snippets/makam-example.ly
+++ b/Documentation/snippets/makam-example.ly
@@ -1,5 +1,5 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
@@ -18,7 +18,6 @@ details of pitch names and alterations.
   doctitle = "Makam example"
 } % begin verbatim
 
-
 % Initialize makam settings
 \include "makam.ly"
 
diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index b4d11b13d7..92a2d97c1f 100644
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms"
diff --git a/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly b/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
index 1cf8befaa0..1bacee8404 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, staff-notation, workaround"
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 f543c44a18..fe5e530109 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords"
@@ -20,7 +20,6 @@ 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 fe44415234..8fe39d8f22 100644
--- a/Documentation/snippets/manually-controlling-beam-positions.ly
+++ b/Documentation/snippets/manually-controlling-beam-positions.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "connecting-notes, rhythms, tweaks-and-overrides"
@@ -20,7 +20,6 @@ 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 a836fd38d1..31d0b8505b 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, editorial-annotations, vocal-music, workaround"
@@ -18,7 +18,6 @@ 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 474f13f19d..6ff040e986 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -1,22 +1,23 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
 
   texidoc = "
 Text that can spread over pages is entered with the
-@code{\\markuplist} command.
+@code{\\markuplines} command.
 
 "
   doctitle = "Markup lines"
 } % begin verbatim
 
+%% updated/modified by P.P.Schneider on Feb. 2014
 
 #(set-default-paper-size "a6")
 
@@ -31,7 +32,8 @@ Text that can spread over pages is entered with the
       Il y avait en Westphalie, dans le château de M. le baron de
       Thunder-ten-tronckh, un jeune garçon à qui la nature avait donné
       les mœurs les plus douces.  Sa physionomie annonçait son âme.
-      Il avait le jugement assez droit, avec l'esprit le plus simple ;
+      Il avait le jugement assez droit, avec l'esprit le plus
+      \concat { simple \hspace #.3 ; }
       c'est, je crois, pour cette raison qu'on le nommait Candide.  Les
       anciens domestiques de la maison soupçonnaient qu'il était fils
       de la sœur de monsieur le baron et d'un bon et honnête
@@ -40,12 +42,16 @@ Text that can spread over pages is entered with the
       quartiers, et que le reste de son arbre généalogique avait été
       perdu par l'injure du temps.
     }
+    \vspace #.3
     \paragraph {
       Monsieur le baron était un des plus puissants seigneurs de la
       Westphalie, car son château avait une porte et des fenêtres.  Sa
       grande salle même était ornée d'une tapisserie.  Tous les chiens
-      de ses basses-cours composaient une meute dans le besoin ; ses
-      palefreniers étaient ses piqueurs; le vicaire du village était
+      de ses basses-cours composaient une meute dans le
+      \concat { besoin \hspace #.3 ; }
+      ses palefreniers étaient ses
+      \concat { piqueurs \hspace #.3 ; }
+      le vicaire du village était
       son grand-aumônier.  Ils l'appelaient tous monseigneur, et ils
       riaient quand il faisait des contes.
     }
diff --git a/Documentation/snippets/measure-counter.ly b/Documentation/snippets/measure-counter.ly
index 688ba96a07..93317e27d2 100644
--- a/Documentation/snippets/measure-counter.ly
+++ b/Documentation/snippets/measure-counter.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, repeats, staff-notation, workaround"
diff --git a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
index dfb597b9a7..0d19ecff49 100644
--- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, contexts-and-engravers, staff-notation, tweaks-and-overrides"
@@ -19,7 +19,6 @@ the @code{transparent} property.
   doctitle = "Mensurstriche layout (bar lines between the staves)"
 } % begin verbatim
 
-
 global = {
   \hide Staff.BarLine
   s1 s
@@ -27,6 +26,7 @@ global = {
   \undo \hide Staff.BarLine
   \bar "|."
 }
+
 \new StaffGroup \relative c'' {
   <<
     \new Staff { << \global { c1 c } >> }
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 1c1fcd1019..fe6be59c12 100644
--- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.25"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -12,20 +12,19 @@
   texidoc = "
 The shorthands are defined in @samp{ly/script-init.ly}, where the
 variables @code{dashHat}, @code{dashPlus}, @code{dashDash},
-@code{dashBang}, @code{dashLarger}, @code{dashDot}, and
+@code{dashBar}, @code{dashLarger}, @code{dashDot}, and
 @code{dashUnderscore} are assigned default values.  The default values
-for the shorthands can be modified. For example, to make the @code{-+}
-(@code{dashPlus}) shorthand create a trill instead of the default +
-(@code{stopped}), assign the value of @code{trill} to the variable
+for the shorthands can be modified. For example, to associate the
+@code{-+} (@code{dashPlus}) shorthand with the trill symbol instead of
+the default + symbol, assign the value @code{trill} to the variable
 @code{dashPlus}:
 
 "
   doctitle = "Modifying default values for articulation shorthand notation"
 } % begin verbatim
 
-
 \relative c'' { c1-+ }
 
-dashPlus = \trill
+dashPlus = "trill"
 
 \relative c'' { c1-+ }
diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
index 8a225d29ff..e2a2a00af6 100644
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
@@ -19,14 +19,14 @@ 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
+  {
+    f2. f4
     \override Staff.NoteCollision.prefer-dotted-right = ##f
     f2. f4
     \override Staff.NoteCollision.prefer-dotted-right = ##t
     f2. f4
   }
   \\
-  { e4 e e e e e e e e e e e}
+  { e4 e e e e e e e e e e e }
 >>
diff --git a/Documentation/snippets/moving-slur-positions-vertically.ly b/Documentation/snippets/moving-slur-positions-vertically.ly
index d2b93bb89c..efee38d890 100644
--- a/Documentation/snippets/moving-slur-positions-vertically.ly
+++ b/Documentation/snippets/moving-slur-positions-vertically.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -24,7 +24,6 @@ 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 e1d8deea44..752aca16ed 100644
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, text"
diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
index 3d05329e1c..9f03ad7882 100644
--- a/Documentation/snippets/nesting-staves.ly
+++ b/Documentation/snippets/nesting-staves.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, preparing-parts, staff-notation, tweaks-and-overrides"
@@ -25,7 +25,6 @@ staves. The possibilities are @code{SystemStartBar},
   doctitle = "Nesting staves"
 } % begin verbatim
 
-
 \new StaffGroup
 \relative c'' <<
   \set StaffGroup.systemStartDelimiterHierarchy
diff --git a/Documentation/snippets/new/accordion-discant-symbols.ly b/Documentation/snippets/new/accordion-discant-symbols.ly
deleted file mode 100644
index 7ec2129a63..0000000000
--- a/Documentation/snippets/new/accordion-discant-symbols.ly
+++ /dev/null
@@ -1,176 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "keyboards, specific-notation, symbols-and-glyphs, workaround"
-
-  texidoc = "
-This snippet has been obsoleted by predefined markup commands, see
-@ruser{Accordion Registers}.  It's still useful as a simple
-demonstration of how to combine symbols: the placement of the symbols
-added with @code{\\markup} can be tweaked by changing the
-@code{\\translate-scaled} arguments.  @code{\\translate-scaled} is
-used here rather than @code{\\translate} in order to let the
-positioning of the symbol parts adapt to changes of @code{font-size}.
-"
-  doctitle = "Accordion-discant symbols"
-}
-
-discant = \markup {
-  \musicglyph #"accordion.discant"
-}
-dot = \markup {
-  \musicglyph #"accordion.dot"
-}
-
-\layout { ragged-right = ##t }
-
-% 16 voets register
-accBasson = ^\markup {
-  \combine
-  \discant
-  \translate-scaled #'(0 . 0.5) \dot
-}
-
-% een korig 8 en 16 voets register
-accBandon = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \translate-scaled #'(0 . 1.5) \dot
-}
-
-accVCello = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \combine
-        \translate-scaled #'(0 . 1.5) \dot
-        \translate-scaled #'(1 . 1.5) \dot
-}
-
-% 4-8-16 voets register
-accHarmon = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \combine
-        \translate-scaled #'(0 . 1.5) \dot
-        \translate-scaled #'(0 . 2.5) \dot
-}
-
-accTrombon = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \combine
-        \translate-scaled #'(0 . 1.5) \dot
-        \combine
-          \translate-scaled #'(1 . 1.5) \dot
-          \translate-scaled #'(-1 . 1.5) \dot
-}
-
-% eenkorig 4 en 16 voets register
-accOrgan = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \translate-scaled #'(0 . 2.5) \dot
-}
-
-accMaster = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 0.5) \dot
-      \combine
-        \translate-scaled #'(0 . 1.5) \dot
-        \combine
-          \translate-scaled #'(1 . 1.5) \dot
-          \combine
-            \translate-scaled #'(-1 . 1.5) \dot
-            \translate-scaled #'(0 . 2.5) \dot
-}
-
-accAccord = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 1.5) \dot
-      \combine
-        \translate-scaled #'(1 . 1.5) \dot
-        \combine
-          \translate-scaled #'(-1 . 1.5) \dot
-          \translate-scaled #'(0 . 2.5) \dot
-}
-
-accMusette = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 1.5) \dot
-      \combine
-        \translate-scaled #'(1 . 1.5) \dot
-        \translate-scaled #'(-1 . 1.5) \dot
-}
-
-accCeleste = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 1.5) \dot
-      \translate-scaled #'(-1 . 1.5) \dot
-}
-
-accOboe = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 1.5) \dot
-      \translate-scaled #'(0 . 2.5) \dot
-}
-
-accClarin = ^\markup {
-  \combine
-    \discant
-    \translate-scaled #'(0 . 1.5) \dot
-}
-
-accPiccolo = ^\markup {
-    \combine
-       \discant
-       \translate-scaled #'(0 . 2.5) \dot
-}
-
-accViolin = ^\markup {
-  \combine
-    \discant
-    \combine
-      \translate-scaled #'(0 . 1.5) \dot
-      \combine
-        \translate-scaled #'(1 . 1.5) \dot
-        \translate-scaled #'(0 . 2.5) \dot
-}
-
-\relative c'' {
-  c4 d\accBasson e f
-  c4 d\accBandon e f
-  c4 d\accVCello e f
-  c4 d\accHarmon e f
-  c4 d\accTrombon e f
-  \break
-  c4 d\accOrgan e f
-  c4 d\accMaster e f
-  c4 d\accAccord e f
-  c4 d\accMusette e f
-  c4 d\accCeleste e f
-  \break
-  c4 d\accOboe e f
-  c4 d\accClarin e f
-  c4 d\accPiccolo e f
-  c4 d\accViolin e f
-}
diff --git a/Documentation/snippets/new/accordion-registers.ly b/Documentation/snippets/new/accordion-registers.ly
deleted file mode 100644
index 26a6e9df52..0000000000
--- a/Documentation/snippets/new/accordion-registers.ly
+++ /dev/null
@@ -1,32 +0,0 @@
-\version "2.17.23"
-
-\header {
-  lsrtags = "keyboards, specific-notation, symbols-and-glyphs"
-
-  texidoc = "Accordion register symbols are available as
-@code{\\markup} as well as as standalone music events (as register
-changes tend to occur between actual music events.  Bass registers are
-not overly standardized.  The available commands can be found in
-@ruser{Accordion Registers}."
-
-  doctitle = "Accordion register symbols"
-}
-
-\layout { ragged-right = ##t }
-
-#(use-modules (scm accreg))
-
-\new PianoStaff
-<<
-  \new Staff \relative
-  { \clef treble \discant "10" r8 s32 f'[ bes f] s e[ a e] s d[ g d] s16 e32[ a]
-    << { r16 <f bes> r <e a> r <d g> } \\ { d r a r bes r } >> | <cis e a>1 }    
-  \new Staff \relative
-  { \clef treble \freeBass "1" r8 d'32 s16. c32 s16. bes32 s16. a32[ cis] s16
-    \clef bass \stdBass "Master"
-    << { r16 <f, bes d>^"b" r <e a c>^"am" r <d g bes>^"gm" |
-	 <e a cis>1^"a" } \\
-       { d8_"D" c_"C" bes_"B" | a1_"A" }
-     >>
-  }
->>
diff --git a/Documentation/snippets/new/adding-a-figured-bass-above-or-below-the-notes.ly b/Documentation/snippets/new/adding-a-figured-bass-above-or-below-the-notes.ly
deleted file mode 100644
index 811df579ac..0000000000
--- a/Documentation/snippets/new/adding-a-figured-bass-above-or-below-the-notes.ly
+++ /dev/null
@@ -1,42 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "ancient-notation, chords, contexts-and-engravers"
-
-  texidoc = "
-When writing a figured bass, you can place the figures above or below
-the bass notes, by defining the
-@code{BassFigureAlignmentPositioning.direction} property (exclusively
-in a @code{Staff} context).  Choices are @code{#UP} (or @code{#1}),
-@code{#CENTER} (or @code{#0}) and @code{#DOWN} (or @code{#-1}).
-
-This property can be changed as many times as you wish.  Use
-@code{\\once \\override} if you don't want the override to apply to the
-whole score.
-
-"
-  doctitle = "Adding a figured bass above or below the notes"
-}
-
-
-bass = {
-  \clef bass
-  g4 b, c d
-  e d8 c d2
-}
-continuo = \figuremode {
-  <_>4 <6>4 <5/>4
-  \override Staff.BassFigureAlignmentPositioning.direction = #UP
-  %\bassFigureStaffAlignmentUp
-  < _+ >4 <6>
-  \set Staff.useBassFigureExtenders = ##t
-  \override Staff.BassFigureAlignmentPositioning.direction = #DOWN
-  %\bassFigureStaffAlignmentDown
-  <4>4. <4>8 <_+>4
-}
-\score {
-  <<
-    \new Staff = bassStaff \bass
-    \context Staff = bassStaff \continuo
-  >>
-}
diff --git a/Documentation/snippets/new/adding-extra-fingering-with-scheme.ly b/Documentation/snippets/new/adding-extra-fingering-with-scheme.ly
deleted file mode 100644
index b4d32ff1ea..0000000000
--- a/Documentation/snippets/new/adding-extra-fingering-with-scheme.ly
+++ /dev/null
@@ -1,39 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "scheme-language"
-
-  texidoc = "
-You can add additional elements to notes using @code{map-some-music}. In this
-example, an extra script is attached to a note.
-
-In general, first do a @code{\\displayMusic} of the music you want to
-create, then write a function that will work on the appropriate parts
-of the music for you.
-"
-  doctitle = "Adding extra fingering with scheme"
-}
-
-addScript =
-#(define-music-function (parser location script music)
-   (ly:event? ly:music?)
-   (map-some-music
-    (lambda (mus)
-      (define (append-script-at! prop)
-        (set! (ly:music-property mus prop)
-              (append (ly:music-property mus prop)
-                      (list (ly:music-deep-copy script))))
-        mus)
-      (case (ly:music-property mus 'name)
-        ((EventChord)
-         (append-script-at! 'elements))
-        ((NoteEvent)
-         (append-script-at! 'articulations))
-        (else #f)))
-    music))
-
-\score {
-  {
-    \addScript _6 { c'4-3 <c' e' g'> }
-  }
-}
diff --git a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly
deleted file mode 100644
index fcc5778c84..0000000000
--- a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly
+++ /dev/null
@@ -1,80 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "staff-notation, vocal-music"
-
-  texidoc = "
-This shows one approach to simplify adding many orchestral cues to the
-piano reduction in a vocal score.  The music function @code{\\cueWhile}
-takes four arguments: the music from which the cue is to be taken, as
-defined by @code{\\addQuote}, the name to be inserted before the cue
-notes, then either @code{#UP} or @code{#DOWN} to specify either
-@code{\\voiceOne} with the name above the staff or @code{\\voiceTwo}
-with the name below the staff, and finally the piano music in parallel
-with which the cue notes are to appear.  The name of the cued
-instrument is positioned to the left of the cued notes. Many passages
-can be cued, but they cannot overlap each other in time.
-
-"
-  doctitle = "Adding orchestral cues to a vocal score"
-}
-
-cueWhile =
-#(define-music-function
-   (parser location instrument name dir music)
-   (string? string? ly:dir? ly:music?)
-   #{
-     \cueDuring $instrument #dir {
-       \once \override TextScript.self-alignment-X = #RIGHT
-       \once \override TextScript.direction = $dir
-       <>-\markup { \tiny #name }
-       $music
-     }
-   #})
-
-flute = \relative c'' {
-  \transposition c'
-  s4 s4 e g
-}
-\addQuote "flute" { \flute }
-
-clarinet = \relative c' {
-  \transposition bes
-  fis4 d d c
-}
-\addQuote "clarinet" { \clarinet }
-
-singer = \relative c'' { c4. g8 g4 bes4 }
-words = \lyricmode { here's the lyr -- ics }
-
-pianoRH = \relative c'' {
-  \transposition c'
-  \cueWhile "clarinet" "Clar." #DOWN { c4. g8 }
-  \cueWhile "flute" "Flute" #UP { g4 bes4 }
-}
-pianoLH = \relative c { c4 <c' e> e, <g c> }
-
-\score {
-  <<
-    \new Staff {
-      \new Voice = "singer" {
-        \singer
-      }
-    }
-    \new Lyrics {
-      \lyricsto "singer"
-      \words
-    }
-    \new PianoStaff <<
-      \new Staff {
-        \new Voice {
-          \pianoRH
-        }
-      }
-      \new Staff {
-        \clef "bass"
-        \pianoLH
-      }
-    >>
-  >>
-}
diff --git a/Documentation/snippets/new/adding-timing-marks-to-long-glissandi.ly b/Documentation/snippets/new/adding-timing-marks-to-long-glissandi.ly
deleted file mode 100644
index 3bb2d02119..0000000000
--- a/Documentation/snippets/new/adding-timing-marks-to-long-glissandi.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\version "2.17.30"
-
-\header {
-  lsrtags = "expressive-marks, staff-notation, tweaks-and-overrides"
-
-  texidoc = "
-Skipped beats in very long glissandi are sometimes indicated by
-timing marks, often consisting of stems without noteheads.  Such
-stems can also be used to carry intermediate expression markings.
-
-If the stems do not align well with the glissando, they may need to
-be repositioned slightly.
-"
-
-  doctitle = "Adding timing marks to long glissandi"
-}
-
-glissandoSkipOn = {
-  \override NoteColumn.glissando-skip = ##t
-  \hide NoteHead
-  \override NoteHead.no-ledgers = ##t
-}
-
-glissandoSkipOff = {
-  \revert NoteColumn.glissando-skip
-  \undo \hide NoteHead
-  \revert NoteHead.no-ledgers
-}
-
-\relative c'' {
-  r8 f8\glissando
-  \glissandoSkipOn
-  f4 g a a8\noBeam
-  \glissandoSkipOff
-  a8
-
-  r8 f8\glissando
-  \glissandoSkipOn
-  g4 a8
-  \glissandoSkipOff
-  a8 |
-
-  r4 f\glissando \<
-  \glissandoSkipOn
-  a4\f \>
-  \glissandoSkipOff
-  b8\! r |
-}
diff --git a/Documentation/snippets/new/alternative-bar-numbering.ly b/Documentation/snippets/new/alternative-bar-numbering.ly
deleted file mode 100644
index 78903e3095..0000000000
--- a/Documentation/snippets/new/alternative-bar-numbering.ly
+++ /dev/null
@@ -1,27 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides"
-  texidoc = "Two alternative methods for bar numbering can be set,
-  especially for when using repeated music."
-  doctitle = "Alternative bar numbering"
-}
-
-\relative c'{
-  \set Score.alternativeNumberingStyle = #'numbers
-  \repeat volta 3 { c4 d e f | }
-    \alternative {
-      { c4 d e f | c2 d \break }
-      { f4 g a b | f4 g a b | f2 a | \break }
-      { c4 d e f | c2 d }
-    }
-  c1 \break
-  \set Score.alternativeNumberingStyle = #'numbers-with-letters
-  \repeat volta 3 { c,4 d e f | }
-    \alternative {
-      { c4 d e f | c2 d \break }
-      { f4 g a b | f4 g a b | f2 a | \break }
-      { c4 d e f | c2 d }
-    }
-  c1
-}
diff --git a/Documentation/snippets/new/ancient-fonts.ly b/Documentation/snippets/new/ancient-fonts.ly
deleted file mode 100644
index 159bed3fae..0000000000
--- a/Documentation/snippets/new/ancient-fonts.ly
+++ /dev/null
@@ -1,225 +0,0 @@
-%% This file is in the public domain.
-\version "2.17.6"
-
-\header {
-  lsrtags = "ancient-notation, symbols-and-glyphs"
-
-  texidoc = "
-Shown here are many (all?) of the symbols that are included in
-LilyPond's support for ancient notation.
-"
-  doctitle = "Ancient fonts"
-}
-
-upperStaff = \new VaticanaStaff = "upperStaff" <<
-  \context VaticanaVoice <<
-    \transpose c c {
-
-      \override NoteHead.style = #'vaticana.punctum
-      \key es \major
-      \clef "vaticana-fa2"
-      c1 des e f ges
-
-      \override NoteHead.style = #'vaticana.inclinatum
-      a! b ces'
-      \bar "|"
-      % \break % 1 (8*1)
-
-      \override NoteHead.style = #'vaticana.quilisma
-      b! des'! ges! fes!
-      \breathe
-      \clef "vaticana-fa1"
-      \override NoteHead.style = #'vaticana.plica
-      es d
-      \override NoteHead.style = #'vaticana.reverse.plica
-      c d
-      \bar "|"
-      % \break %2 (8*1)
-
-      \override NoteHead.style = #'vaticana.punctum.cavum
-      es f
-      \override NoteHead.style = #'vaticana.lpes
-      g as
-      \override NoteHead.style = #'vaticana.upes
-      bes as
-      \override NoteHead.style = #'vaticana.vupes
-      g f
-      \override NoteHead.style = #'vaticana.linea.punctum
-      \once \override Staff.BarLine.bar-extent = #'(-1 . 1) \bar "|"
-      % \break % 3 (8*1)
-
-      es d
-      \override NoteHead.style = #'vaticana.epiphonus
-      c d
-      \override NoteHead.style = #'vaticana.cephalicus
-      es f
-
-      \override Staff.KeySignature.glyph-name-alist = #alteration-medicaea-glyph-name-alist
-      \override Staff.Accidental.glyph-name-alist = #alteration-medicaea-glyph-name-alist
-      \override Staff.Custos.style = #'medicaea
-      \override NoteHead.style = #'medicaea.punctum
-      \clef "medicaea-fa2"
-      ces des
-      \bar "|"
-      % \break % 4 (8*1)
-
-      e! f! ges
-      \clef "medicaea-do2"
-      \override NoteHead.style = #'medicaea.inclinatum
-      a! b! ces'
-      \override NoteHead.style = #'medicaea.virga
-      b! a!
-      \bar "|"
-      % \break % 5 (8*1)
-
-      ges fes
-      \clef "medicaea-fa1"
-      \override NoteHead.style = #'medicaea.rvirga
-      e des ces
-
-      \override Staff.KeySignature.glyph-name-alist = #alteration-hufnagel-glyph-name-alist
-      \override Staff.Accidental.glyph-name-alist = #alteration-hufnagel-glyph-name-alist
-      \override Staff.Custos.style = #'hufnagel
-      \override NoteHead.style = #'hufnagel.punctum
-      \clef "hufnagel-fa2"
-      ces des es
-      \bar "|"
-      % \break % 6 (8*1)
-
-      fes ges
-      \clef "hufnagel-do2"
-      \override NoteHead.style = #'hufnagel.lpes
-      as! bes! ces'
-      \override NoteHead.style = #'hufnagel.virga
-      bes! as!
-      \bar "|"
-      % \break % 7 (8*1)
-
-      ges! fes!
-      \clef "hufnagel-do-fa"
-      \override NoteHead.style = #'hufnagel.punctum
-      es! des ces des! es! fes!
-      \bar "||"
-      % \break % 8 (8*1)
-
-      s32*1
-      % \break % 12 (32*1)
-    }
-  >>
->>
-
-lowerStaff = \new MensuralStaff = "lowerStaff" <<
-  \context MensuralVoice <<
-    \transpose c c {
-
-      \key a \major
-      cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \]
-      \set Staff.forceClef = ##t
-      \clef "neomensural-c2"
-      cis1
-      \bar "|"
-      % \break % 2 (16*1)
-
-      \[ g\breve dis''\longa \]
-      b\breve \[ a\longa d\longa \]
-      \clef "petrucci-c2"
-      % \break % 4 (16*1)
-
-      fis1 ces1
-      \clef "petrucci-c2"
-      r\longa
-      \set Staff.forceClef = ##t
-      \clef "mensural-c2"
-      r\breve
-      \bar "|"
-      % \break % 5 (8*1)
-
-      r2
-      \clef "mensural-g"
-      r4 r8 r16 r16
-      \override NoteHead.style = #'mensural
-      \override Rest.style = #'mensural
-      \clef "petrucci-f"
-      c8 b, c16 b, c32 b, c64 b, c64 b,
-      d8 e d16 e d32 e d64 e d64 e
-      r\longa
-      \set Staff.forceClef = ##t
-      \clef "petrucci-f"
-      r\breve
-      \bar "|"
-      % \break % 6 (8*1)
-
-      r\breve
-      \clef "mensural-f"
-      r2 r4 r8 r16 r16
-
-      \set Staff.forceClef = ##t
-      \clef "mensural-f"
-      e\breve f g a1
-      \clef "mensural-g"
-      % \break % 7 (8*1)
-
-      \[ bes'!\longa a'!\longa c''!\longa \]
-      e'1 d' c' d' \bar "|"
-      \bar "|"
-      % \break % 9 (16*1)
-
-      bes'!\longa fis'!1 as'!1 ges'!\longa % lig
-      \set Staff.forceClef = ##t
-      \clef "mensural-g"
-      e'2 d' c' \bar "|"
-      % \break % 11 (16*1)
-
-      \set Staff.forceClef = ##t
-      \clef "petrucci-g"
-      c'2 d' e' f'
-      \clef "petrucci-g"
-      g' as'! bes'! cis''!
-      bes'! as'! gis'! fis'!
-      \set Staff.forceClef = ##t
-      \clef "mensural-g"
-      es'! des'! cis'!1 \bar "||"
-      % \break % 12 (8*1)
-    }
-  >>
->>
-
-\paper {
-  line-thickness = #(/ staff-space 5.0)
-}
-
-\score {
-  <<
-    \upperStaff
-    \lowerStaff
-  >>
-  \layout {
-    indent = 0.0
-    line-width = 17.25\cm
-    \context {
-      \Score
-      timing = ##f
-    }
-    \context {
-      \MensuralVoice
-      \override NoteHead.style = #'neomensural
-      \override Rest.style = #'neomensural
-      \override Flag.style = #'mensural
-      \override Stem.thickness = #1.0
-    }
-    \context {
-      \MensuralStaff
-      \revert  BarLine.transparent
-      \override KeySignature.glyph-name-alist = #alteration-mensural-glyph-name-alist
-      clefGlyph = #"clefs.petrucci.c2"
-    }
-    \context {
-      \VaticanaStaff
-      \revert  BarLine.transparent
-      \override StaffSymbol.thickness = #2.0
-      \override KeySignature.glyph-name-alist = #alteration-vaticana-glyph-name-alist
-      \override Custos.neutral-position = #4
-    }
-  }
-}
-
diff --git a/Documentation/snippets/new/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/new/ancient-notation-template----modern-transcription-of-gregorian-music.ly
deleted file mode 100644
index 2fe51d97a2..0000000000
--- a/Documentation/snippets/new/ancient-notation-template----modern-transcription-of-gregorian-music.ly
+++ /dev/null
@@ -1,51 +0,0 @@
-\version "2.17.30"
-
-\header {
-  lsrtags = "vocal-music, ancient-notation, template"
-
-  texidoc = "
-This example demonstrates how to do modern transcription of Gregorian
-music. Gregorian music has no measure, no stems; it uses only half and
-quarter note heads, and special marks, indicating rests of different
-length.
-
-"
-  doctitle = "Ancient notation template -- modern transcription of gregorian music"
-}
-
-\include "gregorian.ly"
-
-chant = \relative c' {
-  \set Score.timing = ##f
-  f4 a2 \divisioMinima
-  g4 b a2 f2 \divisioMaior
-  g4( f) f( g) a2 \finalis
-}
-
-verba = \lyricmode {
-  Lo -- rem ip -- sum do -- lor sit a -- met
-}
-
-\score {
-  \new Staff <<
-    \new Voice = "melody" \chant
-    \new Lyrics = "one" \lyricsto melody \verba
-  >>
-  \layout {
-    \context {
-      \Staff
-      \remove "Time_signature_engraver"
-      \remove "Bar_engraver"
-      \hide Stem
-    }
-    \context {
-      \Voice
-      \override Stem.length = #0
-    }
-    \context {
-      \Score
-      barAlways = ##t
-    }
-  }
-}
-
diff --git a/Documentation/snippets/new/bar-chords-notation-for-guitar--with-text-spanner.ly b/Documentation/snippets/new/bar-chords-notation-for-guitar--with-text-spanner.ly
deleted file mode 100644
index c74d392002..0000000000
--- a/Documentation/snippets/new/bar-chords-notation-for-guitar--with-text-spanner.ly
+++ /dev/null
@@ -1,63 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "chords, fretted-strings"
-
-  texidoc = "
-Here is how to print bar chords, or half-bar chords (just uncomment the
-appropriate line for to select either one).
-
-The syntax is @code{\\bbarre #\"@var{fret number}\" @{ notes @} }.
-"
-  doctitle = "Bar chords notation for Guitar (with Text Spanner)"
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% %%%%%%%  Cut here ----- Start 'bbarred.ly'
-
-%% C with slash -------------------------------
-cWithSlash = \markup {
-  \combine \roman C \translate #'(0.6 . -0.4) \draw-line #'(0 . 2.0)
-}
-%% Span -----------------------------------
-%% Syntax: \bbarre #"text" { notes } - text = any number of box
-bbarre =
-#(define-music-function (barre location str music) (string? ly:music?)
-   (let ((elts (extract-named-music music '(NoteEvent EventChord))))
-     (if (pair? elts)
-         (let ((first-element (first elts))
-               (last-element (last elts)))
-           (set! (ly:music-property first-element 'articulations)
-                 (cons (make-music 'TextSpanEvent 'span-direction -1)
-                       (ly:music-property first-element 'articulations)))
-           (set! (ly:music-property last-element 'articulations)
-                 (cons (make-music 'TextSpanEvent 'span-direction 1)
-                       (ly:music-property last-element 'articulations))))))
-   #{
-       \once \override TextSpanner.font-size = #-2
-       \once \override TextSpanner.font-shape = #'upright
-       \once \override TextSpanner.staff-padding = #3
-       \once \override TextSpanner.style = #'line
-       \once \override TextSpanner.to-barline = ##f
-       \once \override TextSpanner.bound-details =
-            #`((left
-                (text . ,#{ \markup { \draw-line #'( 0 . -.5) } #})
-                (Y . 0)
-                (padding . 0.25)
-                (attach-dir . -2))
-               (right
-                (text . ,#{ \markup { \cWithSlash #str } #})
-                (Y . 0)
-                (padding . 0.25)
-                (attach-dir . 2)))
-%% uncomment this line for make full barred
-       % \once  \override TextSpanner.bound-details.left.text =  \markup { "B" #str }
-       $music
-   #})
-
-%% %%%%%%%  Cut here ----- End 'bbarred.ly'
-%% Copy and change the last line for full barred. Rename in 'fbarred.ly'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Syntaxe: \bbarre #"text" { notes } - text = any number of box
-\relative c'{ \clef "G_8" \stemUp \bbarre #"III" { <f a'>16[  c' d c d8] } }
diff --git a/Documentation/snippets/new/broken-crescendo-hairpin.ly b/Documentation/snippets/new/broken-crescendo-hairpin.ly
deleted file mode 100644
index f14c983eea..0000000000
--- a/Documentation/snippets/new/broken-crescendo-hairpin.ly
+++ /dev/null
@@ -1,42 +0,0 @@
-\version "2.19.2"
-
-\header {
-  lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
-
-  texidoc = "
-In order to make parts of a crescendo hairpin invisible, the following
-method is used: A white rectangle is drawn on top of the respective
-part of the crescendo hairpin, making it invisible.
-
-The markup command @code{with-dimensions} tells LilyPond to consider only
-the bottom edge of the rectangle when spacing it against the hairpin.
-The property @code{staff-padding} prevents the rectangle from fitting
-between the hairpin and staff.
-
-Make sure to put the hairpin in a lower layer than the text markup to
-draw the rectangle over the hairpin.
-
-"
-  doctitle = "Broken Crescendo Hairpin"
-}
-
-\relative c' {
-  <<
-    {
-      \dynamicUp
-      r2 r16 c'8.\pp r4
-    }
-    \\
-    {
-      \override DynamicLineSpanner.layer = #0
-      des,2\mf\< ~
-      \override TextScript.layer = #2
-      \once\override TextScript.staff-padding = #6
-      \once\override TextScript.vertical-skylines = #'()
-      des16_\markup \with-dimensions #'(2 . 7) #'(0 . 0)
-                    \with-color #white
-                    \filled-box #'(2 . 7) #'(0 . 2) #0
-      r8. des4 ~ 16->\sff
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/centered-measure-numbers.ly b/Documentation/snippets/new/centered-measure-numbers.ly
deleted file mode 100644
index 6fa6ee9e3b..0000000000
--- a/Documentation/snippets/new/centered-measure-numbers.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\version "2.17.7"
-
-\header {
-  lsrtags = "contexts-and-engravers, repeats, staff-notation"
-
-  texidoc = "
-Scores of large ensemble works often have bar numbers placed beneath the
-system, centered horizontally on the measure's extent.  This snippet shows
-how the @code{Measure_counter_engraver} may be used to simulate this
-notational practice.  Here, the engraver has been added to a @code{Dynamics}
-context.
-
-"
-
-  doctitle = "Centered measure numbers"
-}
-
-\layout {
-  \context {
-    \Dynamics
-    \consists #Measure_counter_engraver
-    \override MeasureCounter.direction = #DOWN
-    \override MeasureCounter.font-encoding = #'latin1
-    \override MeasureCounter.font-shape = #'italic
-    % to control the distance of the Dynamics context from the staff:
-    \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.padding = #2
-  }
-  \context {
-    \Score
-    \remove "Bar_number_engraver"
-  }
-}
-
-pattern = \repeat unfold 7 { c'4 d' e' f' }
-
-\new StaffGroup <<
-  \new Staff {
-    \pattern
-  }
-  \new Staff {
-    \pattern
-  }
-  \new Dynamics {
-    \startMeasureCount
-    s1*7
-    \stopMeasureCount
-  }
->>
diff --git a/Documentation/snippets/new/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/new/centering-markup-on-note-heads-automatically.ly
deleted file mode 100644
index 641f2861c7..0000000000
--- a/Documentation/snippets/new/centering-markup-on-note-heads-automatically.ly
+++ /dev/null
@@ -1,57 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "text, tweaks-and-overrides, contexts-and-engravers"
-  texidoc = "
-For technical reasons, text scripts attached to note heads cannot
-easily be centered on a note head's width, unlike articulations.
-
-Instead of using trial-and-error offset tweaks, this snippet uses a
-Scheme engraver to reset the horizontal parent of each markup to a
-@code{NoteColumn}.  This also allows text to follow note heads which have
-been shifted via @code{force-hshift}.
-"
-  doctitle = "Centering markup on note heads automatically"
-}
-
-#(define (Text_align_engraver ctx)
-  (let ((scripts '())
-        (note-column #f))
-    (make-engraver
-     (acknowledgers
-      ((note-column-interface trans grob source)
-       ;; cache NoteColumn in this Voice context
-       (set! note-column grob))
-      ((text-script-interface trans grob source)
-       ;; whenever a TextScript is acknowledged,
-       ;; add it to `scripts' list
-       (set! scripts (cons grob scripts))))
-     ((stop-translation-timestep trans)
-      ;; if any TextScript grobs exist,
-      ;; set NoteColumn as X-parent
-      (for-each (lambda (script)
-		  (set! (ly:grob-parent script X) note-column))
-		scripts)
-      ;; clear scripts ready for next timestep
-      (set! scripts '())))))
-
-\layout {
-  \context {
-    \Voice
-    \consists #Text_align_engraver
-    \override TextScript.X-offset =
-      #ly:self-alignment-interface::aligned-on-x-parent
-    \override TextScript.self-alignment-X = #CENTER
-  }
-}
-
-\new Staff <<
-  \relative c'' {
-    \override NoteColumn.force-hshift = #3
-    c1-\markup { \arrow-head #Y #DOWN ##t }
-  }
-  \\
-  \relative c' {
-    a4 a-\markup { \huge ^ } a a
-  }
->>
diff --git a/Documentation/snippets/new/changing-the-tuplet-number.ly b/Documentation/snippets/new/changing-the-tuplet-number.ly
deleted file mode 100644
index 346d12e0e6..0000000000
--- a/Documentation/snippets/new/changing-the-tuplet-number.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.17.30"
-
-\header {
-  lsrtags = "rhythms"
-
-  texidoc = "
-By default, only the numerator of the tuplet number is printed over the
-tuplet bracket. Alternatively, num:den of the tuplet number may
-be printed, or the tuplet number may be suppressed altogether.
-
-"
-  doctitle = "Changing the tuplet number"
-}
-
-
-\relative c'' {
-  \tuplet 3/2 { c8 c c }
-  \tuplet 3/2 { c8 c c }
-  \override TupletNumber.text = #tuplet-number::calc-fraction-text
-  \tuplet 3/2 { c8 c c }
-  \omit TupletNumber
-  \tuplet 3/2 { c8 c c }
-}
diff --git a/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
deleted file mode 100644
index cedf58cd32..0000000000
--- a/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+++ /dev/null
@@ -1,39 +0,0 @@
-\version "2.17.11"
-
-\header {
-  lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms"
-
-  doctitle = "Changing time signatures inside a polymetric section using \\scaleDurations"
-}
-
-
-\layout {
-  \context {
-    \Score
-    \remove "Timing_translator"
-    \remove "Default_bar_line_engraver"
-  }
-  \context {
-    \Staff
-    \consists "Timing_translator"
-    \consists "Default_bar_line_engraver"
-  }
-}
-
-<<
-  \new Staff {
-    \scaleDurations 8/5 {
-      \time 6/8
-      \set Timing.measureLength = #(ly:make-moment 6/5)
-      b8 b b b b b
-      \time 2/4
-      \set Timing.measureLength = #(ly:make-moment 4/5)
-      b4 b
-    }
-  }
-  \new Staff {
-    \clef bass
-    \time 2/4
-    c2 d e f
-  }
->>
diff --git a/Documentation/snippets/new/chant-or-psalms-notation.ly b/Documentation/snippets/new/chant-or-psalms-notation.ly
deleted file mode 100644
index 8edb405b0d..0000000000
--- a/Documentation/snippets/new/chant-or-psalms-notation.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers, specific-notation"
-
-  texidoc = "
-This form of notation is used for the chant of the Psalms, where verses
-aren't always the same length.
-
-"
-  doctitle = "Chant or psalms notation"
-}
-
-stemOff = \hide Staff.Stem
-stemOn  = \undo \stemOff
-
-\score {
-  \new Staff \with { \remove "Time_signature_engraver" }
-  {
-    \key g \minor
-    \cadenzaOn
-    \stemOff a'\breve bes'4 g'4
-    \stemOn a'2 \bar "||"
-    \stemOff a'\breve g'4 a'4
-    \stemOn f'2 \bar "||"
-    \stemOff a'\breve^\markup { \italic flexe }
-    \stemOn g'2 \bar "||"
-  }
-}
-
diff --git a/Documentation/snippets/new/chords-headword.ly b/Documentation/snippets/new/chords-headword.ly
deleted file mode 100644
index 4f625ddbc8..0000000000
--- a/Documentation/snippets/new/chords-headword.ly
+++ /dev/null
@@ -1,95 +0,0 @@
-\version "2.17.6"
-
-\header {
-  lsrtags = "headword"
-  texidoc = ""
-  doctitle = "headword"
-}
-
-
-theChords = \chordmode {
-  \time 2/2
-  f1 | c2 f2 | f1 | c2 f2| %\break
-  f2 bes2 | f1 | c2:7 f | c1 | \break
-}
-
-verseOne = \lyricmode {
-  \set stanza = #"1."
-  Fair is the sun - shine,
-  Fair - er the moon - light
-  And all the stars __ _  in heav'n a -- bove;
-}
-
-verseTwo = \lyricmode {
-  \set stanza = #"2."
-  Fair are the mead - ows,
-  Fair - er the wood - land,
-  Robed in the flow -- ers of bloom -- ing spring;
-}
-
-Soprano = {
-  \time 2/2
-  \key f \major
-  \stemUp
-  f'2 f'4 f' | g'4 e' f'2 | a'4. a'8 a'4 a' | bes'4 g' a'2 |
-  c''2 f''4 d'' |  c''2  bes'4  a' | bes'2 a' | g'1 |
-}
-
-Alto = {
-  \key f \major
-  c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 fis' | g'4 e' f'2 |
-  f'2 f'4 f' |  f'2  g'4  f' | e'2 f' | e'1 |
-}
-
-Tenor = {
-  \key f \major
-  \stemDown
-  a2 a4 a | bes4 g a2  | c'4. c'8 d'4 d' | d'4 c' c'2 |
-  a2 d'4 bes | a2 c'4 c' | c'2 c'  | c'1 |
-}
-
-Bass = {
-  \key f \major
-  f2 f4 f | bes,4 c  f2 | f4. e8 d4 c | bes,4 c f2 |
-  f2 bes,4 d | f2 e4 f | g2 f | c1 |
-}
-
-
-\score {
-  <<
-    \new ChordNames { \theChords }
-    \context Staff = upper {
-      \context Voice = sop {
-        <<
-          \Soprano
-          \Alto
-        >>
-      }
-    }
-    \context Lyrics = "LyrOne" \lyricsto "sop" { \verseOne }
-    \context Lyrics = "LyrTwo" \lyricsto "sop" { \verseTwo }
-    \context Staff = lower {
-      \new Voice {
-        \clef bass
-        \accidentalStyle modern-cautionary
-        <<
-          \Tenor
-          \Bass
-        >>
-      }
-    }
-  >>
-
-  \layout {
-    indent = 0
-    \context {
-      \Score
-      \remove "Bar_number_engraver"
-    }
-    \context {
-      \Voice
-      \override StanzaNumber.padding = #1.8
-    }
-  }
-}
-\paper {  }
diff --git a/Documentation/snippets/new/compound-time-signatures.ly b/Documentation/snippets/new/compound-time-signatures.ly
deleted file mode 100644
index 693ed00469..0000000000
--- a/Documentation/snippets/new/compound-time-signatures.ly
+++ /dev/null
@@ -1,22 +0,0 @@
-\version "2.17.15"
-
-\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.
-
-"
-  doctitle = "Compound time signatures"
-}
-
-\relative c' {
-  \compoundMeter #'((2 8) (3 8))
-  c8 d e fis gis
-  c8 fis, gis e d
-  c8 d e4 gis8
-}
diff --git a/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
deleted file mode 100644
index c833826109..0000000000
--- a/Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly
+++ /dev/null
@@ -1,49 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "rhythms"
-  texidoc = "
-Beat grouping within a measure is controlled by the context property
-@code{beatStructure}.  Values of @code{beatStructure} are
-established for many time signatures in
-@file{scm/time-signature-settings.scm}.  Values of @code{beatStructure}
-can be changed or set with @code{\set}.
-Alternatively, @code{\time} can be used to both
-set the time signature and establish the beat structure.
-For this, you specify the internal grouping of beats in a measure
-as a list of numbers (in Scheme syntax) before the time signature.
-
-@code{\time} applies to the @code{Timing} context, so it will not
-reset values of @code{beatStructure} or @code{baseMoment} that are set
-in other lower-level contexts, such as @code{Voice}.
-
-If the @code{Measure_grouping_engraver} is included
-in one of the display contexts, measure grouping signs will be
-created.  Such signs ease reading rhythmically complex modern music.
-In the example, the 9/8 measure is grouped in two different
-patterns using the two different methods, while the 5/8 measure
-is grouped according to the default setting in
-@file{scm/time-signature-settings.scm}:
-"
-  doctitle = "Conducting signs, measure grouping signs"
-}
-
-
-\score {
-  \new Voice \relative c'' {
-    \time 9/8
-    g8 g d d g g a( bes g) |
-    \set Timing.beatStructure = #'(2 2 2 3)
-    g8 g d d g g a( bes g) |
-    \time #'(4 5) 9/8
-    g8 g d d g g a( bes g) |
-    \time 5/8
-    a4. g4 |
-  }
-  \layout {
-    \context {
-      \Staff
-      \consists "Measure_grouping_engraver"
-    }
-  }
-}
diff --git a/Documentation/snippets/new/creating-a-delayed-turn.ly b/Documentation/snippets/new/creating-a-delayed-turn.ly
deleted file mode 100644
index 6df9883bfa..0000000000
--- a/Documentation/snippets/new/creating-a-delayed-turn.ly
+++ /dev/null
@@ -1,37 +0,0 @@
-\version "2.18.0"
-
-\header {
-  lsrtags = "editorial-annotations, expressive-marks, tweaks-and-overrides"
-
-  texidoc = "
-Creating a delayed turn, where the lower note of the turn uses the
-accidental, requires several overrides.  The
-@code{outside-staff-priority} property must be set to @code{#f}, as
-otherwise this would take precedence over the
-@code{avoid-slur property}.  Changing the fractions @code{2/3} and
-@code{1/3} adjusts the horizontal position.
-"
-  doctitle = "Creating a delayed turn"
-}
-
-\relative c'' {
-  c2*2/3 ( s2*1/3\turn d4) r
-  <<
-    { c4.( d8) }
-    { s4 s\turn }
-  >>
-  \transpose c d \relative c'' <<
-    { c4.( d8) }
-    {
-      s4
-      \once \set suggestAccidentals = ##t
-      \once \override AccidentalSuggestion.outside-staff-priority = ##f
-      \once \override AccidentalSuggestion.avoid-slur = #'inside
-      \once \override AccidentalSuggestion.font-size = -3
-      \once \override AccidentalSuggestion.script-priority = -1
-      \single \hideNotes
-      b8-\turn \noBeam
-      s8
-    }
-  >>
-}
diff --git a/Documentation/snippets/new/creating-double-digit-fingerings.ly b/Documentation/snippets/new/creating-double-digit-fingerings.ly
deleted file mode 100644
index f9bf74b8d5..0000000000
--- a/Documentation/snippets/new/creating-double-digit-fingerings.ly
+++ /dev/null
@@ -1,17 +0,0 @@
-\version "2.17.15"
-
-\header {
-  lsrtags = "editorial-annotations, expressive-marks, scheme-language, staff-notation, tweaks-and-overrides"
-
-  texidoc = "
-Creating fingerings larger than 5 is possible.
-"
-  doctitle = "Creating double-digit fingerings"
-}
-
-\relative c' {
-  c1-10
-  c1-50
-  c1-36
-  c1-29
-}
diff --git a/Documentation/snippets/new/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/new/creating-real-parenthesized-dynamics.ly
deleted file mode 100644
index bfdd1bdfbe..0000000000
--- a/Documentation/snippets/new/creating-real-parenthesized-dynamics.ly
+++ /dev/null
@@ -1,35 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "expressive-marks, text, workaround"
-
-  texidoc = "
-Although the easiest way to add parentheses to a dynamic mark is to use
-a @code{\\markup} block, this method has a downside: the created
-objects will behave like text markups, and not like dynamics.
-
-However, it is possible to create a similar object using the equivalent
-Scheme code (as described in the Notation Reference), combined with the
-@code{make-dynamic-script} function. This way, the markup will be
-regarded as a dynamic, and therefore will remain compatible with
-commands such as @code{\\dynamicUp} or @code{\\dynamicDown}.
-
-
-
-"
-  doctitle = "Creating \"real\" parenthesized dynamics"
-}
-
-paren =
-#(define-event-function (parser location dyn) (ly:event?)
-   (make-dynamic-script
-    #{ \markup \concat {
-         \normal-text \italic \fontsize #2 (
-	 \pad-x #0.2 #(ly:music-property dyn 'text)
-	 \normal-text \italic \fontsize #2 )
-       }
-    #}))
-
-\relative c'' {
-  c4\paren\f c c \dynamicUp c\paren\p
-}
diff --git a/Documentation/snippets/new/cross-staff-stems.ly b/Documentation/snippets/new/cross-staff-stems.ly
deleted file mode 100644
index ed3650496a..0000000000
--- a/Documentation/snippets/new/cross-staff-stems.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-\version "2.16.0"
-
-\header {
-  lsrtags = "staff-notation, tweaks-and-overrides, contexts-and-engravers"
-  texidoc = "
-This snippet shows the use of the @code{Span_stem_engraver}
-and @code{\crossStaff} to connect stems across staves automatically.
-The stem length need not be specified, as the variable distance
-between noteheads and staves is calculated automatically.
-"
-  doctitle = "Cross staff stems"
-}
-
-\layout {
-  \context {
-    \PianoStaff
-    \consists #Span_stem_engraver
-  }
-}
-
-{
-  \new PianoStaff <<
-    \new Staff {
-      <b d'>4 r d'16\> e'8. g8 r\!
-      e'8 f' g'4 e'2
-    }
-    \new Staff {
-      \clef bass
-      \voiceOne
-      \autoBeamOff
-      \crossStaff { <e g>4 e, g16 a8. c8} d
-      \autoBeamOn
-      g8 f g4 c2
-    }
-  >>
-}
diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
index 65030025a3..059e9241d0 100644
--- a/Documentation/snippets/non-default-tuplet-numbers.ly
+++ b/Documentation/snippets/non-default-tuplet-numbers.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -29,7 +29,6 @@ to the tuplet number or tuplet fraction.
     #(tuplet-number::append-note-wrapper
       (tuplet-number::non-default-tuplet-fraction-text 12 7) "8")
   \tuplet 3/2  { c4. c4. c4. c4. }
-
   \once \override TupletNumber.text =
     #(tuplet-number::append-note-wrapper
       tuplet-number::calc-denominator-text "4")
@@ -38,7 +37,6 @@ to the tuplet number or tuplet fraction.
     #(tuplet-number::append-note-wrapper
       tuplet-number::calc-fraction-text "4")
   \tuplet 3/2  { c8 c8 c8 c8 c8 c8 }
-
   \once \override TupletNumber.text =
     #(tuplet-number::fraction-with-notes "4." "8")
   \tuplet 3/2  { c4. c4. c4. c4. }
diff --git a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
index 2ec7ebf8d9..1b294569e3 100644
--- a/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
+++ b/Documentation/snippets/obtaining-2.12-lyrics-spacing-in-newer-versions.ly
@@ -1,19 +1,21 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "vocal-music"
 
   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 since 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"
diff --git a/Documentation/snippets/open-string-harmonics-in-tablature.ly b/Documentation/snippets/open-string-harmonics-in-tablature.ly
index 1b1692a02b..019a68bcca 100644
--- a/Documentation/snippets/open-string-harmonics-in-tablature.ly
+++ b/Documentation/snippets/open-string-harmonics-in-tablature.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -17,47 +17,68 @@ This snippet demonstrates open-string harmonics
 } % begin verbatim
 
 openStringHarmonics = {
+  \textSpannerDown
+  \override TextSpanner.staff-padding = #3
+  \override TextSpanner.dash-fraction = #0.3
+  \override TextSpanner.dash-period = #1
+
   %first harmonic
-  \harmonicByFret #12 e,2\6_\markup{"1st harm."}
-  \harmonicByRatio #1/2 e,\6
+  \override TextSpanner.bound-details.left.text = \markup\small "1st harm. "
+  \harmonicByFret #12 e,2\6\startTextSpan
+  \harmonicByRatio #1/2 e,\6\stopTextSpan
+
   %second harmonic
-  \harmonicByFret #7 e,\6_\markup{"2nd harm. - - - -"}
+  \override TextSpanner.bound-details.left.text = \markup\small "2nd harm. "
+  \harmonicByFret #7 e,\6\startTextSpan
   \harmonicByRatio #1/3 e,\6
   \harmonicByFret #19 e,\6
-  \harmonicByRatio #2/3 e,\6
+  \harmonicByRatio #2/3 e,\6\stopTextSpan
   %\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. - - - -"}
+  \override TextSpanner.bound-details.left.text = \markup\small "3rd harm. "
+  \harmonicByFret #5 e,\6\startTextSpan
   \harmonicByRatio #1/4 e,\6
   \harmonicByFret #24 e,\6
-  \harmonicByRatio #3/4 e,\6
+  \harmonicByRatio #3/4 e,\6\stopTextSpan
   \break
+
   %fourth harmonic
-  \harmonicByFret #4 e,\6_\markup{"4th harm. - - - - - - - - - - - - -"}
+  \override TextSpanner.bound-details.left.text = \markup\small "4th harm. "
+  \harmonicByFret #4 e,\6\startTextSpan
   \harmonicByRatio #1/5 e,\6
   \harmonicByFret #9 e,\6
   \harmonicByRatio #2/5 e,\6
   \harmonicByFret #16 e,\6
-  \harmonicByRatio #3/5 e,\6
+  \harmonicByRatio #3/5 e,\6\stopTextSpan
+
   %fifth harmonic
-  \harmonicByFret #3 e,\6_\markup{"5th harm."}
-  \harmonicByRatio #1/6 e,\6
+  \override TextSpanner.bound-details.left.text = \markup\small "5th harm. "
+  \harmonicByFret #3 e,\6\startTextSpan
+  \harmonicByRatio #1/6 e,\6\stopTextSpan
   \break
+
   %sixth harmonic
-  \harmonicByFret #2.7 e,\6_\markup{"6th harm."}
-  \harmonicByRatio #1/7 e,\6
+  \override TextSpanner.bound-details.left.text = \markup\small "6th harm. "
+  \harmonicByFret #2.7 e,\6\startTextSpan
+  \harmonicByRatio #1/7 e,\6\stopTextSpan
+
   %seventh harmonic
-  \harmonicByFret #2.3 e,\6_\markup{"7th harm."}
-  \harmonicByRatio #1/8 e,\6
+  \override TextSpanner.bound-details.left.text = \markup\small "7th harm. "
+  \harmonicByFret #2.3 e,\6\startTextSpan
+  \harmonicByRatio #1/8 e,\6\stopTextSpan
+
   %eighth harmonic
-  \harmonicByFret #2 e,\6_\markup{"8th harm."}
-  \harmonicByRatio #1/9 e,\6
+  \override TextSpanner.bound-details.left.text = \markup\small "8th harm. "
+  \harmonicByFret #2 e,\6\startTextSpan
+  \harmonicByRatio #1/9 e,\6\stopTextSpan
 }
 
 \score {
   <<
-    \new Staff {
+    \new Staff
+    \with { \omit StringNumber } {
       \new Voice {
         \clef "treble_8"
         \openStringHarmonics
diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index 61fed7dc46..6bc546d353 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, staff-notation, template, vocal-music"
@@ -19,7 +19,6 @@ 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 6729c113af..1cd8bdfe14 100644
--- a/Documentation/snippets/ottava-text.ly
+++ b/Documentation/snippets/ottava-text.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, text"
@@ -19,7 +19,6 @@ 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 742e687c93..5e99a2ad33 100644
--- a/Documentation/snippets/outputting-the-version-number.ly
+++ b/Documentation/snippets/outputting-the-version-number.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, scheme-language, text, titles"
@@ -20,7 +20,6 @@ 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/overriding-articulations-of-destinct-type.ly b/Documentation/snippets/overriding-articulations-of-destinct-type.ly
index e13154f9a0..2d8707ca91 100644
--- a/Documentation/snippets/overriding-articulations-of-destinct-type.ly
+++ b/Documentation/snippets/overriding-articulations-of-destinct-type.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.25"
+\version "2.18.0"
 
 \header {
   lsrtags = "scheme-language, tweaks-and-overrides"
diff --git a/Documentation/snippets/page-label.ly b/Documentation/snippets/page-label.ly
index 727f9d4191..1f7db440ef 100644
--- a/Documentation/snippets/page-label.ly
+++ b/Documentation/snippets/page-label.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "spacing"
@@ -17,7 +17,6 @@ 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 691c47f775..38e1386f78 100644
--- a/Documentation/snippets/partcombine-and-autobeamoff.ly
+++ b/Documentation/snippets/partcombine-and-autobeamoff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -44,7 +44,6 @@ 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 aa6bcadb37..8692564ebf 100644
--- a/Documentation/snippets/percent-repeat-count-visibility.ly
+++ b/Documentation/snippets/percent-repeat-count-visibility.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 508bad7462..36180e5b7e 100644
--- a/Documentation/snippets/percent-repeat-counter.ly
+++ b/Documentation/snippets/percent-repeat-counter.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats"
@@ -17,7 +17,6 @@ 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 fdea45c4dc..e7d22ebef2 100644
--- a/Documentation/snippets/percussion-beaters.ly
+++ b/Documentation/snippets/percussion-beaters.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "percussion"
@@ -19,7 +19,6 @@ 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 c67206c3aa..9046dfd7c0 100644
--- a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
+++ b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, version-specific"
@@ -18,7 +18,6 @@ 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 0b58a54b46..b2728932e4 100644
--- a/Documentation/snippets/piano-template-simple.ly
+++ b/Documentation/snippets/piano-template-simple.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, really-simple, template"
@@ -16,7 +16,6 @@ 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-lyrics.ly b/Documentation/snippets/piano-template-with-centered-lyrics.ly
index ccf50e699b..d1f05af6dc 100644
--- a/Documentation/snippets/piano-template-with-centered-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-centered-lyrics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, really-simple, template, text"
@@ -17,7 +17,6 @@ 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 c44b64ba22..57466a0a3e 100644
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, really-simple, template, vocal-music"
@@ -17,7 +17,6 @@ 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/placement-of-right-hand-fingerings.ly b/Documentation/snippets/placement-of-right-hand-fingerings.ly
index 51ac129a33..bea1e6510e 100644
--- a/Documentation/snippets/placement-of-right-hand-fingerings.ly
+++ b/Documentation/snippets/placement-of-right-hand-fingerings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -18,7 +18,6 @@ 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 1aa24cb2bb..5a9c845a9b 100644
--- a/Documentation/snippets/polyphony-in-tablature.ly
+++ b/Documentation/snippets/polyphony-in-tablature.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -17,7 +17,6 @@ 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 68861a1dc3..6f3d878fad 100644
--- a/Documentation/snippets/positioning-arpeggios.ly
+++ b/Documentation/snippets/positioning-arpeggios.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 253b05ec03..8812a067af 100644
--- a/Documentation/snippets/positioning-fingering-indications-precisely.ly
+++ b/Documentation/snippets/positioning-fingering-indications-precisely.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations"
@@ -20,18 +20,17 @@ involved.
   doctitle = "Positioning fingering indications precisely"
 } % begin verbatim
 
-
 \relative c' {
   \set fingeringOrientations = #'(left)
   <c-1 d-2 a'-5>4
-  <c-1 d-\tweak extra-offset #'(0 . 0.7)-2 a'-5>4
+  <c-1 d-\tweak extra-offset #'(0 . 0.2)-2 a'-5>4
   \set fingeringOrientations = #'(down)
   <c-1 d-2 a'-5>4
-  <c-1 d-\tweak extra-offset #'(-1.2 . 0)-2 a'-5>4
+  <c-\tweak extra-offset #'(0 . -1.1)-1 d-\tweak extra-offset #'(-1.2 . -1.8)-2 a'-5>4
   \set fingeringOrientations = #'(down right up)
-  <c-1 d-2 a'-5>4
+  <c-1 d-\tweak extra-offset #'(-0.3 . 0)-2 a'-5>4
   <c-1 d-\tweak extra-offset #'(-1 . 1.2)-2 a'-5>4
   \set fingeringOrientations = #'(up)
-  <c-1 d-2 a'-5>4
-  <c-1 d-\tweak extra-offset #'(-1.2 . 0)-2 a'-5>4
+  <c-1 d-\tweak extra-offset #'(0 . 1.1)-2 a'-\tweak extra-offset #'(0 . 1)-5>4
+  <c-1 d-\tweak extra-offset #'(-1.2 . 1.5)-2 a'-\tweak extra-offset #'(0 . 1.4)-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 d3c6e90dc9..c05f2592a6 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -19,7 +19,6 @@ 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 0bbbdf1624..ab8bc4eef1 100644
--- a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
+++ b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.28"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -19,7 +19,6 @@ 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 b03aa21b89..9444c97a14 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "breaks, repeats, symbols-and-glyphs, workaround"
@@ -58,7 +58,7 @@ line.
     % Here begins the trickery!
     % \cadenzaOn will suppress the bar count and \stopStaff removes the staff lines.
     \cadenzaOn
-      \stopStaff
+    \stopStaff
         % Some examples of possible text-displays
 
         % text line-aligned
@@ -90,33 +90,33 @@ line.
           \bar ""
         }
         % Resume bar count and show staff lines again
-     \startStaff
-   \cadenzaOff
+    \startStaff
+    \cadenzaOff
 
-   % Should Coda be on new line?
-   % Coda NOT on new line: DON'T use \break
-   % Coda on new line: use \break
-   \break
+    % Should Coda be on new line?
+    % Coda NOT on new line: DON'T use \break
+    % Coda on new line: use \break
+    \break
 
-   % Show up, you clef and key!
-   \once \override Staff.KeySignature.break-visibility = #end-of-line-invisible
-   \once \override Staff.Clef.break-visibility = #end-of-line-invisible
+    % Show up, you clef and key!
+    \once \override Staff.KeySignature.break-visibility = #end-of-line-invisible
+    \once \override Staff.Clef.break-visibility = #end-of-line-invisible
 
-   % Set coda sign as rehearsal mark and adjust size and position
+    % Set coda sign as rehearsal mark and adjust size and position
 
-   % Put the coda sign ontop of the (treble-)clef dependend on coda's line-position
+    % Put the coda sign ontop of the (treble-)clef dependend on coda's line-position
 
-   % Coda NOT on new line, use this:
-   % \once \override Score.RehearsalMark.extra-offset = #'( -2 . 1.75 )
+    % Coda NOT on new line, use this:
+    % \once \override Score.RehearsalMark.extra-offset = #'( -2 . 1.75 )
 
-   % Coda on new line, use this:
-   \once \override Score.RehearsalMark.extra-offset = #'( -4.5 . 0 )
+    % Coda on new line, use this:
+    \once \override Score.RehearsalMark.extra-offset = #'( -5 . .5 )
 
-   \once \override Score.RehearsalMark.font-size = #5
-   \mark \markup { \musicglyph #"scripts.coda" }
+    \once \override Score.RehearsalMark.font-size = #5
+    \mark \markup { \musicglyph #"scripts.coda" }
 
-   % The coda
-   \repeat unfold 5 {
+    % The coda
+    \repeat unfold 6 {
       c4 c c c
     }
     \bar"|."
diff --git a/Documentation/snippets/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
index 8348981a4e..8be61a74e2 100644
--- a/Documentation/snippets/positioning-text-markups-inside-slurs.ly
+++ b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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/preventing-extra-naturals-from-being-automatically-added.ly b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
index b788c3cd10..1ff350eec5 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, pitches"
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 db86ab6d76..d39af579da 100644
--- a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
+++ b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -18,8 +18,6 @@ tuplet marking.  This can be overcome by setting @code{TupletBracket
   doctitle = "Preventing final mark from removing final tuplet"
 } % begin verbatim
 
-\markup \vspace #1 %% workaround for LSR-problem
-
 \new Staff {
    \set tupletFullLength = ##t
    \time 1/8
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 1d3f050457..ab32f9212f 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, pitches"
@@ -19,7 +19,6 @@ 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
new file mode 100644
index 0000000000..7a4bce37a0
--- /dev/null
+++ b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
@@ -0,0 +1,26 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "repeats, tweaks-and-overrides"
+
+  texidoc = "
+A @code{|:} bar line can be printed at the beginning of a piece.
+
+"
+  doctitle = "Printing a repeat sign at the beginning of a piece"
+} % begin verbatim
+
+\relative c'' {
+  \bar ".|:"
+  \repeat volta 2 {
+    c1
+    d1
+    d4 e f g
+  }
+}
diff --git a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
index 75c335bdea..085ca0037a 100644
--- a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
+++ b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -18,7 +18,6 @@ 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 63b65a8372..19b7ee80bc 100644
--- a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
+++ b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -16,7 +16,6 @@ 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 634017285c..91d1e1b6c0 100644
--- a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
+++ b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -18,7 +18,6 @@ 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 89e2fbf87a..385a7234b9 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
@@ -18,7 +18,6 @@ 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 556eea0996..1d4a800d1d 100644
--- a/Documentation/snippets/printing-marks-on-every-staff.ly
+++ b/Documentation/snippets/printing-marks-on-every-staff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
@@ -17,7 +17,6 @@ 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 4c563872b4..afaa08b59f 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, rhythms, tweaks-and-overrides"
@@ -18,8 +18,10 @@ of @code{MetronomeMark} or @code{RehearsalMark} appropriately.
   doctitle = "Printing metronome and rehearsal marks below the staff"
 } % begin verbatim
 
-
-\layout { ragged-right = ##f }
+\layout {
+  indent = 0
+  ragged-right = ##f
+}
 
 {
   % Metronome marks below the staff
diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index 8d52ffd405..c00d974026 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, percussion, real-music, really-cool, rhythms"
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 96b4d051ad..9e59ce5382 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 49c10706a0..bd7ef3e689 100644
--- a/Documentation/snippets/printing-text-from-right-to-left.ly
+++ b/Documentation/snippets/printing-text-from-right-to-left.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, text, workaround, world-music"
@@ -17,7 +17,6 @@ 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 ae6321a6e2..7280abfdf7 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -20,6 +20,10 @@ must be inserted before the first note for this to work.
   doctitle = "Printing the bar number for the first measure"
 } % begin verbatim
 
+\layout {
+  indent = 0
+  ragged-right = ##t
+}
 
 \relative c' {
   \set Score.barNumberVisibility = #all-bar-numbers-visible
diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
index b5d489208d..5f9744918d 100644
--- a/Documentation/snippets/proportional-strict-notespacing.ly
+++ b/Documentation/snippets/proportional-strict-notespacing.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.28"
+\version "2.18.0"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides"
@@ -18,13 +18,12 @@ 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)
   \new Staff {
     c8[ c \clef alto c c \grace { d16 } c8 c] c4
-    c2 \grace { c16 c16 } c2
+    c2 \grace { c16[ c16] } c2
   }
   \new Staff {
     c2 \tuplet 3/2 { c8 \clef bass cis,, c } c4
diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
index 4edd6a59e5..d1676ce318 100644
--- a/Documentation/snippets/putting-lyrics-inside-the-staff.ly
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -1,19 +1,19 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation, text, vocal-music"
 
   texidoc = "
 Lyrics can be moved vertically to place them inside the staff.  The
-lyrics are moved with @code{\\override LyricText.extra-offset = #'(0
-. dy)} and there are similar commands to move the extenders and
-hyphens.  The offset needed is established with trial and error.
+lyrics are moved with @code{\\override LyricText.extra-offset = #'(0 .
+dy)} and there are similar commands to move the extenders and hyphens.
+The offset needed is established with trial and error.
 
 "
   doctitle = "Putting lyrics inside the staff"
diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
index b834961374..cbc1ce7534 100644
--- a/Documentation/snippets/quoting-another-voice.ly
+++ b/Documentation/snippets/quoting-another-voice.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation"
@@ -25,7 +25,6 @@ the Internals Reference.
   doctitle = "Quoting another voice"
 } % begin verbatim
 
-
 quoteMe = \relative c' {
   fis4 r16 a8.-> b4\ff c
 }
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index a5cb083c2e..85a038f55f 100644
--- a/Documentation/snippets/recorder-fingering-chart.ly
+++ b/Documentation/snippets/recorder-fingering-chart.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \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 10ff50af8a..55e6503334 100644
--- a/Documentation/snippets/removing-bar-numbers-from-a-score.ly
+++ b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, rhythms"
@@ -17,11 +17,12 @@ Bar numbers can be removed entirely by removing the
   doctitle = "Removing bar numbers from a score"
 } % begin verbatim
 
-
 \layout {
   \context {
     \Score
-    \remove "Bar_number_engraver"
+    \omit BarNumber
+    % or:
+    %\remove "Bar_number_engraver"
   }
 }
 
diff --git a/Documentation/snippets/removing-brace-on-first-line-of-piano-score.ly b/Documentation/snippets/removing-brace-on-first-line-of-piano-score.ly
new file mode 100644
index 0000000000..0d8327313b
--- /dev/null
+++ b/Documentation/snippets/removing-brace-on-first-line-of-piano-score.ly
@@ -0,0 +1,44 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "keyboards, staff-notation, tweaks-and-overrides"
+
+  texidoc = "
+This snippet removes the first brace from a @code{PianoStaff} or a
+@code{GrandStaff}. It may be useful when cutting and pasting the
+engraved image into existing music.
+
+It uses @code{\\alterBroken}.
+
+"
+  doctitle = "Removing brace on first line of piano score"
+} % begin verbatim
+% => http://lilypond.1069038.n5.nabble.com/Getting-rid-of-initial-brace-on-piano-score-td161158.html
+someMusic =  {
+  \once \override Staff.Clef.stencil = ##f
+  \once \override Staff.TimeSignature.stencil = ##f
+  \repeat unfold 3 c1 \break
+  \repeat unfold 5 c1 \break
+  \repeat unfold 5 c1
+}
+
+\score {
+  \new PianoStaff
+  <<
+    \new Staff = "right" \relative c'' \someMusic
+    \new Staff = "left" \relative c' { \clef F \someMusic }
+  >>
+  \layout {
+    indent=75
+    \context {
+      \PianoStaff
+      \alterBroken transparent #'(#t) SystemStartBrace
+    }
+  }
+}
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 fd0fdce662..07982c9ba4 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 6cad882e87..ed8e432f8b 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "breaks, staff-notation, tweaks-and-overrides"
@@ -25,7 +25,6 @@ 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 fa562f980a..b4f73273e7 100644
--- a/Documentation/snippets/repeats-headword.ly
+++ b/Documentation/snippets/repeats-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.5"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Repeats headword
   doctitle = "Repeats headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=821
+%% see also http://www.lilypond.org/doc/v2.18/Documentation/notation/repeats
+
 % Beethoven, Op. 57
 % Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet
 % Movt II, Andante con moto
diff --git a/Documentation/snippets/repeats.snippet-list b/Documentation/snippets/repeats.snippet-list
index d3fa46c992..3b55be22a8 100644
--- a/Documentation/snippets/repeats.snippet-list
+++ b/Documentation/snippets/repeats.snippet-list
@@ -8,6 +8,7 @@ numbering-groups-of-measures.ly
 percent-repeat-count-visibility.ly
 percent-repeat-counter.ly
 positioning-segno-and-coda-with-line-break.ly
+printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
 setting-the-double-repeat-default-for-volte.ly
 shortening-volta-brackets.ly
 volta-below-chords.ly
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index 789f0b6d34..9da37cb60a 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, rhythms, symbols-and-glyphs, tweaks-and-overrides"
@@ -19,7 +19,6 @@ 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 f8581769ed..bf28390f9f 100644
--- a/Documentation/snippets/reverting-default-beam-endings.ly
+++ b/Documentation/snippets/reverting-default-beam-endings.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, version-specific"
@@ -18,7 +18,6 @@ new beaming endings:
   doctitle = "Reverting default beam endings"
 } % begin verbatim
 
-
 \relative c'' {
   \time 12/8
 
diff --git a/Documentation/snippets/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly
index 6d47071c79..4e140b330d 100644
--- a/Documentation/snippets/rhythmic-slashes.ly
+++ b/Documentation/snippets/rhythmic-slashes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -26,7 +26,6 @@ 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 5bf703a5d0..5a53ef2ed5 100644
--- a/Documentation/snippets/rhythms-headword.ly
+++ b/Documentation/snippets/rhythms-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Rhythms headword
   doctitle = "Rhythms headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=822
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/rhythms
+
 % Beethoven, Op. 81a
 % Piano sonata 26 - Das Lebewohl
 % Movt II - Abwesenheit
@@ -82,7 +85,7 @@ Rhythms headword
       c'''32 ) \!
       g''8 (
       ~
-      32 [
+      g''32 [
       a''64
       g''64 ) ]
 
@@ -215,5 +218,4 @@ Rhythms headword
       <g e>32
       c'32
    }
-
 >>
diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list
index 99c7a93f80..358e8accfb 100644
--- a/Documentation/snippets/rhythms.snippet-list
+++ b/Documentation/snippets/rhythms.snippet-list
@@ -60,6 +60,8 @@ stemlets.ly
 strict-beat-beaming.ly
 subdividing-beams.ly
 three-sided-box.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
 tweaking-grace-layout-within-music.ly
 using-alternative-flag-styles.ly
diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly
index 8df4962101..001e5ed587 100644
--- a/Documentation/snippets/satb-choir-template---four-staves.ly
+++ b/Documentation/snippets/satb-choir-template---four-staves.ly
@@ -1,5 +1,5 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
@@ -16,7 +16,6 @@ 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
index a7bc17c61b..848256fe66 100644
--- a/Documentation/snippets/scheme-language.snippet-list
+++ b/Documentation/snippets/scheme-language.snippet-list
@@ -6,6 +6,7 @@ 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
+customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly
 displaying-grob-ancestry.ly
 drawing-boxes-around-grobs.ly
 drawing-circles-around-various-objects.ly
diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly
index 86b9fba5e5..36d3fc1771 100644
--- a/Documentation/snippets/screech-and-boink.ly
+++ b/Documentation/snippets/screech-and-boink.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
diff --git a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
index be7a8967d8..044bd68e61 100644
--- a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
+++ b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \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 067fbbfd2c..b0f930c87c 100644
--- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
+++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 d7d4d2cda2..cbe0712c61 100644
--- a/Documentation/snippets/setting-system-separators.ly
+++ b/Documentation/snippets/setting-system-separators.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 c469c52e64..40ce83508c 100644
--- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
+++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.5"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats"
diff --git a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
index dea361c49c..56430babee 100644
--- a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
+++ b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -17,9 +17,9 @@ 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\!
+  << f1 { s4 s\< s\> s\! } >>
   \override Hairpin.minimum-length = #5
   << f1 { s4 s\< s\> s\! } >>
 }
diff --git a/Documentation/snippets/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly
index 611057d4cb..f1aa919411 100644
--- a/Documentation/snippets/shortening-volta-brackets.ly
+++ b/Documentation/snippets/shortening-volta-brackets.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats"
@@ -19,7 +19,6 @@ 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 cc3542bd4f..e946df6b6d 100644
--- a/Documentation/snippets/showing-chords-at-changes.ly
+++ b/Documentation/snippets/showing-chords-at-changes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords"
@@ -17,10 +17,10 @@ chord changes.
   doctitle = "Showing chords at changes"
 } % begin verbatim
 
-
 harmonies = \chordmode {
   c1:m c:m \break c:m c:m d
 }
+
 <<
   \new ChordNames {
     \set chordChanges = ##t
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 ec67a11657..2277eb5f36 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,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides, version-specific"
@@ -28,7 +28,6 @@ The direction will always be above, but one can tweak this via a
   doctitle = "Showing the same articulation above and below a note or chord"
 } % begin verbatim
 
-
 % The same as \flageolet, just a little smaller
 smallFlageolet =
 #(let ((m (make-articulation "flageolet")))
diff --git a/Documentation/snippets/simple-lead-sheet.ly b/Documentation/snippets/simple-lead-sheet.ly
index b6f3b443c8..5a3c190a95 100644
--- a/Documentation/snippets/simple-lead-sheet.ly
+++ b/Documentation/snippets/simple-lead-sheet.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords"
@@ -16,7 +16,6 @@ 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 3afcc2a30f..b8462ffaba 100644
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Simultaneous notes
   doctitle = "Simultaneous headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=825
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/simultaneous-notes
+
 \include "english.ly"
 
 % NR 1.5 Simultaneous notes
@@ -67,10 +70,10 @@ trillFlat =
       \trillFlat
       af''4.~ \startTrillSpan
       af''8.~ |
-      4.~ 8.~ |
+      af''4.~ af''8.~ |
       \oneVoice
       <af'' d''>8.[ a''8. \p \< bf''8.]~ |
-      8.[ b''8. c'''8.]~
+      bf''8.[ b''8. c'''8.]~
       \bar "||"
       \key ef \major
       c'''8.[ cs'''8.] \f \stopTrillSpan
@@ -83,17 +86,17 @@ trillFlat =
       \override Voice.TrillSpanner.direction = #DOWN
       d''4.~ \f \startTrillSpan
       d''8.~ |
-      4.~ 8.~ |
-      8. \stopTrillSpan
+      d''4.~ d''8.~ |
+      d''8. \stopTrillSpan
       \trillFlat
       d''4.~ \startTrillSpan |
-      d''4.~ 8.~ |
-      4.~ 8.~ |
-      4.~ 8.~ \stopTrillSpan |
+      d''4.~ d''8.~ |
+      d''4.~ d''8.~ |
+      d''4.~ d''8.~ \stopTrillSpan |
       \trillFlat
       d''4.~ \startTrillSpan
       d''8. ~ |
-      4.~ 8.~ |
+      d''4.~ d''8.~ |
       \once \override NoteColumn.ignore-collision = ##t
       \hideNotes
       d''8. \stopTrillSpan
@@ -126,8 +129,8 @@ trillFlat =
         \override Voice.TrillSpanner.direction = #UP
         f'4.~ \startTrillSpan
         f'8.~ |
-        4.~ 8.~ |
-        8. \stopTrillSpan
+        f'4.~ f'8.~ |
+        f'8. \stopTrillSpan
       }
       \new Voice {
         \voiceTwo
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 f4b72259b9..3cdf85b1de 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, really-simple, template, vocal-music"
@@ -17,7 +17,6 @@ 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 4cd409c667..64357e06b9 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, template, vocal-music"
@@ -17,7 +17,6 @@ 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 4ba723b516..d63414442e 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, really-simple, template"
@@ -17,14 +17,13 @@ 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
   \time 4/4
 
   f4 e8[ c] d4 g
-  a2 ~ 2
+  a2 ~ a
 }
 
 harmonies = \chordmode {
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 244baef401..8750bbc794 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, template, vocal-music"
@@ -19,7 +19,6 @@ 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 40bbd12cb0..9eed6bf220 100644
--- a/Documentation/snippets/single-staff-template-with-only-notes.ly
+++ b/Documentation/snippets/single-staff-template-with-only-notes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, template"
@@ -18,7 +18,6 @@ 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 e9e25e9756..90e03b195c 100644
--- a/Documentation/snippets/skips-in-lyric-mode-2.ly
+++ b/Documentation/snippets/skips-in-lyric-mode-2.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, rhythms, vocal-music"
@@ -18,7 +18,6 @@ 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 6cea02f255..eb74ba39c0 100644
--- a/Documentation/snippets/skips-in-lyric-mode.ly
+++ b/Documentation/snippets/skips-in-lyric-mode.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, rhythms, vocal-music"
@@ -18,7 +18,6 @@ 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 760135cda9..d1068720a8 100644
--- a/Documentation/snippets/slides-in-tablature.ly
+++ b/Documentation/snippets/slides-in-tablature.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -42,6 +42,9 @@ slides = {
       \override Glissando.springs-and-rods =
                           #ly:spanner::set-spacing-rods
       \override Glissando.thickness = #2
+      \omit StringNumber
+      % or:
+      %\override StringNumber.stencil = ##f
     }
   }
 }
diff --git a/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
index 9e3e51fd1a..82694c9b53 100644
--- a/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
+++ b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, unfretted-strings"
diff --git a/Documentation/snippets/specific-notation.snippet-list b/Documentation/snippets/specific-notation.snippet-list
index 995a013b67..dd4195d73b 100644
--- a/Documentation/snippets/specific-notation.snippet-list
+++ b/Documentation/snippets/specific-notation.snippet-list
@@ -1,5 +1,5 @@
 accordion-discant-symbols.ly
-accordion-registers.ly
+accordion-register-symbols.ly
 adding-bar-lines-to-chordnames-context.ly
 adding-drum-parts.ly
 adding-fingerings-to-tablatures.ly
diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
index 0a2df88f19..40af5a2ff7 100644
--- a/Documentation/snippets/staff-notation.snippet-list
+++ b/Documentation/snippets/staff-notation.snippet-list
@@ -12,6 +12,7 @@ creating-blank-staves.ly
 creating-double-digit-fingerings.ly
 cross-staff-stems.ly
 display-bracket-with-only-one-staff-in-a-system.ly
+extending-a-trillspanner.ly
 extending-glissandi-across-repeats.ly
 forcing-measure-width-to-adapt-to-metronomemarks-width.ly
 glissandi-can-skip-grobs.ly
@@ -31,6 +32,7 @@ orchestra,-choir-and-piano-template.ly
 putting-lyrics-inside-the-staff.ly
 quoting-another-voice-with-transposition.ly
 quoting-another-voice.ly
+removing-brace-on-first-line-of-piano-score.ly
 removing-the-first-empty-line.ly
 setting-system-separators.ly
 tick-bar-lines.ly
diff --git a/Documentation/snippets/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly
index dd0005c432..a5371fab3f 100644
--- a/Documentation/snippets/stand-alone-two-column-markup.ly
+++ b/Documentation/snippets/stand-alone-two-column-markup.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
index b5960df497..d8636cf383 100644
--- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
+++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "fretted-strings"
@@ -18,7 +18,6 @@ example.
   doctitle = "Stem and beam behavior in tablature"
 } % begin verbatim
 
-
 \new TabStaff {
   \relative c {
     \tabFullNotation
diff --git a/Documentation/snippets/stemlets.ly b/Documentation/snippets/stemlets.ly
index 0f1ea5e818..da3b382032 100644
--- a/Documentation/snippets/stemlets.ly
+++ b/Documentation/snippets/stemlets.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "contemporary-notation, rhythms"
@@ -30,7 +30,6 @@ 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 af78c3895d..e435da4877 100644
--- a/Documentation/snippets/string-quartet-template-simple.ly
+++ b/Documentation/snippets/string-quartet-template-simple.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, template, unfretted-strings"
@@ -17,7 +17,6 @@ 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 66dc41a866..7efde9f3a7 100644
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "preparing-parts, template, unfretted-strings"
@@ -28,7 +28,6 @@ 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/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index e7080e65a5..9b94dd3619 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 0ecae8edd5..726b2978d3 100644
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -24,7 +24,6 @@ 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
index 920987ba49..e8b00227c8 100644
--- a/Documentation/snippets/symbols-and-glyphs.snippet-list
+++ b/Documentation/snippets/symbols-and-glyphs.snippet-list
@@ -1,5 +1,5 @@
 accordion-discant-symbols.ly
-accordion-registers.ly
+accordion-register-symbols.ly
 adding-indicators-to-staves-which-get-split-after-a-break.ly
 ancient-fonts.ly
 breathing-signs.ly
@@ -7,6 +7,7 @@ broken-crescendo-hairpin.ly
 caesura-railtracks-with-fermata.ly
 changing--flageolet-mark-size.ly
 custodes.ly
+customizing-the-position-and-number-of-dots-in-repeat-sign-bar-lines.ly
 fingering-symbols-for-wind-instruments.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
 positioning-segno-and-coda-with-line-break.ly
diff --git a/Documentation/snippets/syntax-and-expressions.snippet-list b/Documentation/snippets/syntax-and-expressions.snippet-list
index f0e653afb0..6cef9e842f 100644
--- a/Documentation/snippets/syntax-and-expressions.snippet-list
+++ b/Documentation/snippets/syntax-and-expressions.snippet-list
@@ -1,3 +1,4 @@
 combining-two-parts-on-the-same-staff.ly
 entering-several-tuplets-using-only-one--times-command.ly
+extending-a-trillspanner.ly
 vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 51542ae679..d96f34540f 100644
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -1,16 +1,16 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout"
 
   texidoc = "
-A table of contents is included using @code{\\markuplist
+A table of contents is included using @code{\\markuplines
 \\table-of-contents}.  The TOC items are added with the
 @code{\\tocItem} command.
 
@@ -18,7 +18,6 @@ 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/text-headword.ly b/Documentation/snippets/text-headword.ly
index 0bcd3763ef..29849eb3a3 100644
--- a/Documentation/snippets/text-headword.ly
+++ b/Documentation/snippets/text-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.28"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Text headword
   doctitle = "Text headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=829
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/text
+
 \include "english.ly"
 
 % NR 1.8 Text
@@ -96,7 +99,7 @@ Text headword
     c''32
     df''32
     ef''32
-    \acciaccatura { df'' ef''  }
+    \acciaccatura { df''[ ef'' ] }
     f''8
     ef''16
     df''16
diff --git a/Documentation/snippets/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly
index 2bde359a6c..3e1080dcb7 100644
--- a/Documentation/snippets/three-sided-box.ly
+++ b/Documentation/snippets/three-sided-box.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, scheme-language, text"
@@ -17,7 +17,6 @@ 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 661ee65ee2..decd0f64ad 100644
--- a/Documentation/snippets/tick-bar-lines.ly
+++ b/Documentation/snippets/tick-bar-lines.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "staff-notation"
@@ -17,7 +17,6 @@ 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
index 5eebaacc09..32d888be0e 100644
--- a/Documentation/snippets/time-signature-in-parentheses---method-3.ly
+++ b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
@@ -1,13 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
-  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
+  lsrtags = "rhythms, specific-notation, staff-notation, tweaks-and-overrides"
 
   texidoc = "
 Another way to put the time signature in parenthesis
@@ -16,7 +16,6 @@ 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 ))
diff --git a/Documentation/snippets/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
index 257034d959..3461b568e4 100644
--- a/Documentation/snippets/time-signature-in-parentheses.ly
+++ b/Documentation/snippets/time-signature-in-parentheses.ly
@@ -1,13 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
-  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
+  lsrtags = "rhythms, specific-notation, staff-notation, tweaks-and-overrides"
 
   texidoc = "
 The time signature can be enclosed within parentheses.
@@ -16,7 +16,6 @@ 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 bee629dc69..f7173e35a8 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -14,15 +14,14 @@ Sometimes, a time signature should not print the whole fraction (e.g.
 7/4), but only the numerator (7 in this case). This can be easily done
 by using @code{\\override Staff.TimeSignature.style = #'single-digit}
 to change the style permanently. By using @code{\\revert
-Staff.TimeSignature.style}, this setting can be reversed. To apply
-the single-digit style to only one time signature, use the
+Staff.TimeSignature.style}, this setting can be reversed. To apply the
+single-digit style to only one time signature, use the
 @code{\\override} command and prefix it with a @code{\\once}.
 
 "
   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 cebe3d2876..28ae9b4451 100644
--- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
+++ b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, specific-notation, tweaks-and-overrides, workaround"
@@ -20,29 +20,80 @@ main lyrics.
   doctitle = "Transcription of Ancient music with incipit"
 } % begin verbatim
 
+incipit =
+#(define-music-function (parser location incipit-music) (ly:music?)
+  #{
+    \once \override Staff.InstrumentName.self-alignment-X = #RIGHT
+    \once \override Staff.InstrumentName.self-alignment-Y = ##f
+    \once \override Staff.InstrumentName.padding = #0.3
+    \once \override Staff.InstrumentName.stencil =
+      #(lambda (grob)
+         (let* ((instrument-name (ly:grob-property grob 'long-text)))
+          (set! (ly:grob-property grob 'long-text)
+           #{ \markup
+              \score
+              {
+                { \context MensuralStaff \with {
+                  instrumentName = #instrument-name
+                } $incipit-music
+              }
+              \layout { $(ly:grob-layout grob)
+                line-width = \indent
+                indent =
+                 % primitive-eval is probably easiest for
+                 % escaping lexical closure and evaluating
+                 % everything respective to (current-module).
+                   #(primitive-eval
+                     '(or (false-if-exception (- indent incipit-width))
+                        (* 0.5 indent)))
+                ragged-right = ##f
+                ragged-last = ##f
+                system-count = #1 }
+              }
+	   #})
+           (system-start-text::print grob)))
+  #})
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
 
 global = {
   \set Score.skipBars = ##t
   \key g \major
   \time 4/4
-  %make the staff lines invisible on staves
-  \hide Staff.BarLine
-  \skip 1*8 % the actual music
+
+  % the actual music
+  \skip 1*8
+
   % let finis bar go through all staves
   \override Staff.BarLine.transparent = ##f
+
   % finis bar
   \bar "|."
 }
 
+discantusIncipit = <<
+  \new MensuralVoice = "discantusIncipit" <<
+    \repeat unfold 9 { s1 \noBreak }
+    {
+      \clef "neomensural-c1"
+      \key f \major
+      \time 2/2
+      c''1.
+    }
+  >>
+  \new Lyrics \lyricsto discantusIncipit { IV- }
+>>
+
 discantusNotes = {
   \transpose c' c'' {
-    \clef treble
+    \clef "treble"
     d'2. d'4 |
     b e' d'2 |
     c'4 e'4.( d'8 c' b |
     a4) b a2 |
     b4.( c'8 d'4) c'4 |
-    \once \hide NoteHead c'1 |
+    \once \hide NoteHead
+    c'1 |
     b\breve |
   }
 }
@@ -57,53 +108,103 @@ discantusLyrics = \lyricmode {
   -us. |
 }
 
+altusIncipit = <<
+  \new MensuralVoice = "altusIncipit" <<
+    \repeat unfold 9 { s1 \noBreak }
+    {
+      \clef "neomensural-c3"
+      \key f \major
+      \time 2/2
+      r1 f'1.
+    }
+  >>
+  \new Lyrics \lyricsto altusIncipit { IV- }
+>>
+
 altusNotes = {
   \transpose c' c'' {
-    \clef treble
-    r2 g2. e4 fis g | % two bars
+    \clef "treble"
+    % two measures
+    r2 g2. e4 fis g |
     a2 g4 e |
     fis g4.( fis16 e fis4) |
     g1 |
-    \once \hide NoteHead g1 |
+    \once \hide NoteHead
+    g1 |
     g\breve |
   }
 }
 
 altusLyrics = \lyricmode {
-  Ju -- bi -- la -- te | % two bars
+  % two measures
+  Ju -- bi -- la -- te |
   De -- o, om -- |
   nis ter -- ra, |
   "..." |
   -us. |
 }
 
+tenorIncipit = <<
+  \new MensuralVoice = "tenorIncipit" <<
+    \repeat unfold 9 { s1 \noBreak }
+    {
+      \clef "neomensural-c4"
+      \key f \major
+      \time 2/2
+      r\longa
+      r\breve
+      r1 c'1.
+    }
+  >>
+  \new Lyrics \lyricsto tenorIncipit { IV- }
+>>
+
 tenorNotes = {
   \transpose c' c' {
     \clef "treble_8"
     R1 |
     R1 |
     R1 |
-    r2 d'2. d'4 b e' | % two bars
-    \once \hide NoteHead e'1 |
+    % two measures
+    r2 d'2. d'4 b e' |
+    \once \hide NoteHead
+    e'1 |
     d'\breve |
   }
 }
 
 tenorLyrics = \lyricmode {
-  Ju -- bi -- la -- te | % two bars
+  % two measures
+  Ju -- bi -- la -- te |
   "..." |
   -us.
 }
 
+bassusIncipit = <<
+  \new MensuralVoice = "bassusIncipit" <<
+    \repeat unfold 9 { s1 \noBreak }
+    {
+      \clef "bass"
+      \key f \major
+      \time 2/2
+      %% incipit
+      r\maxima
+      f1.
+    }
+  >>
+  \new Lyrics \lyricsto bassusIncipit { IV- }
+>>
+
 bassusNotes = {
   \transpose c' c' {
-    \clef bass
+    \clef "bass"
     R1 |
     R1 |
     R1 |
     R1 |
     g2. e4 |
-    \once \hide NoteHead e1 |
+    \once \hide NoteHead
+    e1 |
     g\breve |
   }
 }
@@ -114,175 +215,64 @@ bassusLyrics = \lyricmode {
   -us.
 }
 
-incipitDiscantus = \markup {
-  \score {
-    {
-      \set Staff.instrumentName = #"Discantus "
-      \override NoteHead.style = #'neomensural
-      \override Rest.style = #'neomensural
-      \override Staff.TimeSignature.style = #'neomensural
-      \cadenzaOn
-      \clef "neomensural-c1"
-      \key f \major
-      \time 2/2
-      c''1._"IV-" s2  %two bars
-      \skip 1*8 % eight bars
-    }
-    \layout {
-      \context {
-        \Voice
-        \remove "Ligature_bracket_engraver"
-        \consists "Mensural_ligature_engraver"
-      }
-      line-width = 4.5\cm
-    }
-  }
-}
-
-incipitAltus = \markup {
-  \score {
-    {
-      \set Staff.instrumentName = #"Altus "
-      \override NoteHead.style = #'neomensural
-      \override Rest.style = #'neomensural
-      \override Staff.TimeSignature.style = #'neomensural
-      \cadenzaOn
-      \clef "neomensural-c3"
-      \key f \major
-      \time 2/2
-      r1        % one bar
-      f'1._"IV-" s2   % two bars
-      \skip 1*7 % seven bars
-    }
-    \layout {
-      \context {
-        \Voice
-        \remove "Ligature_bracket_engraver"
-        \consists "Mensural_ligature_engraver"
-      }
-      line-width = 4.5\cm
-    }
-  }
-}
-
-incipitTenor = \markup {
-  \score {
-    {
-      \set Staff.instrumentName = #"Tenor  "
-      \override NoteHead.style = #'neomensural
-      \override Rest.style = #'neomensural
-      \override Staff.TimeSignature.style = #'neomensural
-      \cadenzaOn
-      \clef "neomensural-c4"
-      \key f \major
-      \time 2/2
-      r\longa   % four bars
-      r\breve   % two bars
-      r1        % one bar
-      c'1._"IV-" s2   % two bars
-      \skip 1   % one bar
-    }
-    \layout {
-      \context {
-        \Voice
-        \remove "Ligature_bracket_engraver"
-        \consists "Mensural_ligature_engraver"
-      }
-      line-width = 4.5\cm
-    }
-  }
-}
-
-incipitBassus = \markup {
-  \score {
-    {
-      \set Staff.instrumentName = #"Bassus  "
-      \override NoteHead.style = #'neomensural
-      \override Rest.style = #'neomensural
-      \override Staff.TimeSignature.style = #'neomensural
-      \cadenzaOn
-      \clef "bass"
-      \key f \major
-      \time 2/2
-      % incipit
-      r\maxima  % eight bars
-      f1._"IV-" s2    % two bars
-    }
-    \layout {
-      \context {
-        \Voice
-        \remove "Ligature_bracket_engraver"
-        \consists "Mensural_ligature_engraver"
-      }
-      line-width = 4.5\cm
-    }
-  }
-}
-
-%StaffGroup is used instead of ChoirStaff to get bar lines between systems
 \score {
   <<
     \new StaffGroup = choirStaff <<
       \new Voice = "discantusNotes" <<
         \global
-        \set Staff.instrumentName = \incipitDiscantus
+        \set Staff.instrumentName = #"Discantus "
+        \incipit \discantusIncipit
         \discantusNotes
       >>
       \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
-
       \new Voice = "altusNotes" <<
         \global
-        \set Staff.instrumentName = \incipitAltus
+        \set Staff.instrumentName = #"Altus "
+        \incipit \altusIncipit
         \altusNotes
       >>
       \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics }
-
       \new Voice = "tenorNotes" <<
         \global
-        \set Staff.instrumentName = \incipitTenor
+        \set Staff.instrumentName = #"Tenor "
+        \incipit \tenorIncipit
         \tenorNotes
       >>
       \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics }
-
       \new Voice = "bassusNotes" <<
         \global
-        \set Staff.instrumentName = \incipitBassus
+        \set Staff.instrumentName = #"Bassus "
+        \incipit \bassusIncipit
         \bassusNotes
       >>
+      \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
     >>
-    \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
-    %Keep the bass lyrics outside of the staff group to avoid bar lines
-    %between the lyrics.
   >>
-
   \layout {
     \context {
       \Score
-      % no bars in staves
+      %% no bar lines in staves or lyrics
       \hide BarLine
     }
-    % the next three instructions keep the lyrics between the bar lines
+    %% the next two instructions keep the lyrics between the bar lines
     \context {
       \Lyrics
       \consists "Bar_engraver"
-      \hide BarLine
-    }
-    \context {
-      \StaffGroup
       \consists "Separating_line_group_engraver"
     }
     \context {
       \Voice
-      % no slurs
+      %% no slurs
       \hide Slur
-      % Comment in the below "\remove" command to allow line
-      % breaking also at those barlines where a note overlaps
-      % into the next bar.  The command is commented out in this
-      % short example score, but especially for large scores, you
-      % will typically yield better line breaking and thus improve
-      % overall spacing if you comment in the following command.
-      %\remove "Forbid_line_break_engraver"
+      %% Comment in the below "\remove" command to allow line
+      %% breaking also at those bar lines where a note overlaps
+      %% into the next measure.  The command is commented out in this
+      %% short example score, but especially for large scores, you
+      %% will typically yield better line breaking and thus improve
+      %% overall spacing if you comment in the following command.
+      %%\remove "Forbid_line_break_engraver"
     }
-    indent = 5\cm
+    indent = 6\cm
+    incipit-width = 4\cm
   }
 }
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 2b647d0854..ca5b7f24f6 100644
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, scheme-language, workaround"
@@ -35,7 +35,6 @@ 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/tuplet-bracket-and-change-staff.ly b/Documentation/snippets/tuplet-bracket-and-change-staff.ly
new file mode 100644
index 0000000000..2a1d9cf7a5
--- /dev/null
+++ b/Documentation/snippets/tuplet-bracket-and-change-staff.ly
@@ -0,0 +1,54 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.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.18.0"
+
+\header {
+  lsrtags = "tweaks-and-overrides"
+
+  texidoc = "
+This snippet shows how to set a tuplet starting in a lower staff and
+finishing in the upper one.
+
+"
+  doctitle = "Tuplet bracket and change staff"
+} % begin verbatim
+
+%% http://lsr.di.unimi.it/LSR/Item?id=926
+%=> http://lilypond-french-users.1298960.n2.nabble.com/Crochet-de-nolet-tordu-tt7581491.html
+%=> http://lilypond.1069038.n5.nabble.com/Tuplet-bracket-amp-changeStff-td164063.html
+
+aigues = \relative c' {
+  \time 6/8
+  s4.
+  \stemDown
+  c16[ bes' e]
+  \stemUp
+  g c e
+  \stemDown
+  g8
+}
+
+basses = \relative c {
+  \time 3/4
+  \clef F
+  \tweak positions #'(4.5 . 9.5)
+  \tweak edge-height #'(1 . -1)
+  \tuplet 7/6 {
+    c16[ bes' e]
+    \change Staff = md
+    \stemUp
+    g[ c e g]
+  }
+  s4.s8
+}
+
+\new PianoStaff
+\with { \omit TimeSignature }
+<<
+  \new Staff = md \aigues
+  \new Staff = mg \basses
+>>
diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index a43faaca38..645530ea2b 100644
--- a/Documentation/snippets/tweaking-clef-properties.ly
+++ b/Documentation/snippets/tweaking-clef-properties.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.18"
+\version "2.18.0"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
@@ -13,7 +13,7 @@
 The command @code{\\clef \"treble_8\"} is equivalent to setting
 @code{clefGlyph}, @code{clefPosition} (which controls the vertical
 position of the clef), @code{middleCPosition} and
-@code{clefTransposition}. A clef is printed when any of the properties
+@code{clefOctavation}. A clef is printed when any of the properties
 except @code{middleCPosition} are changed.
 
 
@@ -24,7 +24,7 @@ this. In order to get key signatures on the correct staff lines,
 @code{middleCClefPosition} must also be set.  The positional parameters
 are relative to the staff center line, positive numbers displacing
 upwards, counting one for each line and space. The
-@code{clefTransposition} value would normally be set to 7, -7, 15 or -15,
+@code{clefOctavation} value would normally be set to 7, -7, 15 or -15,
 but other values are valid.
 
 
@@ -45,7 +45,10 @@ line, they do not.
   doctitle = "Tweaking clef properties"
 } % begin verbatim
 
-\layout { ragged-right = ##t }
+\layout {
+  indent = 0
+  ragged-right = ##t
+}
 {
   % The default treble clef
   \key f \major
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index b038e101b1..65c5449fda 100644
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.28"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
@@ -20,7 +20,6 @@ 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 872f35a91d..35cacb18c3 100644
--- a/Documentation/snippets/tweaks-and-overrides.snippet-list
+++ b/Documentation/snippets/tweaks-and-overrides.snippet-list
@@ -2,6 +2,7 @@ adding-an-ottava-marking-to-a-single-voice.ly
 adding-links-to-objects.ly
 adding-timing-marks-to-long-glissandi.ly
 adjusting-grace-note-spacing.ly
+adjusting-lyrics-vertical-spacing.ly
 altering-the-length-of-beamed-stems.ly
 alternative-bar-numbering.ly
 analysis-brackets-above-the-staff.ly
@@ -10,6 +11,7 @@ avoiding-collisions-with-chord-fingerings.ly
 caesura-railtracks-with-fermata.ly
 centering-markup-on-note-heads-automatically.ly
 changing-a-single-notes-size-in-a-chord.ly
+changing-beam-thickness-and-spacing.ly
 changing-form-of-multi-measure-rests.ly
 changing-properties-for-individual-grobs.ly
 changing-text-and-spanner-styles-for-text-dynamics.ly
@@ -36,6 +38,7 @@ drawing-boxes-around-grobs.ly
 drawing-circles-around-various-objects.ly
 dynamics-custom-text-spanner-postfix.ly
 dynamics-text-spanner-postfix.ly
+extending-a-trillspanner.ly
 extending-glissandi-across-repeats.ly
 fine-tuning-pedal-brackets.ly
 forcing-horizontal-shift-of-notes.ly
@@ -62,10 +65,12 @@ percent-repeat-count-visibility.ly
 positioning-arpeggios.ly
 positioning-multi-measure-rests.ly
 positioning-text-markups-inside-slurs.ly
+printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
 printing-bar-numbers-inside-boxes-or-circles.ly
 printing-metronome-and-rehearsal-marks-below-the-staff.ly
 printing-note-names-with-and-without-an-octave-marker.ly
 proportional-strict-notespacing.ly
+removing-brace-on-first-line-of-piano-score.ly
 removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
 removing-the-first-empty-line.ly
 rest-styles.ly
@@ -80,6 +85,7 @@ 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
+tuplet-bracket-and-change-staff.ly
 tweaking-clef-properties.ly
 tweaking-grace-layout-within-music.ly
 using-alternative-flag-styles.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 10d57393b7..e7ebc7a0e4 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, staff-notation"
@@ -18,7 +18,6 @@ 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 3eacc6132b..86cf689f3f 100644
--- a/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
+++ b/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, vocal-music"
@@ -18,7 +18,6 @@ often seen in choral music.
   doctitle = "Using arpeggioBracket to make divisi more visible"
 } % begin verbatim
 
-
 \include "english.ly"
 
 \score {
@@ -39,9 +38,9 @@ often seen in choral music.
       \new Voice = "lower"
       { \voiceTwo
         a1 ~
-        1
+        a
         a ~
-        4 \bar "|."
+        a4 \bar "|."
       }
     >>
   }
diff --git a/Documentation/snippets/using-autochange-with-more-than-one-voice.ly b/Documentation/snippets/using-autochange-with-more-than-one-voice.ly
index cd7f685099..8db1438e7d 100644
--- a/Documentation/snippets/using-autochange-with-more-than-one-voice.ly
+++ b/Documentation/snippets/using-autochange-with-more-than-one-voice.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "keyboards, pitches, staff-notation"
diff --git a/Documentation/snippets/using-double-slurs-for-legato-chords.ly b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
index 0844c8624e..4e1eaf7837 100644
--- a/Documentation/snippets/using-double-slurs-for-legato-chords.ly
+++ b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -17,7 +17,6 @@ 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 c2e4685015..d07271b46a 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,19 +1,19 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "devel, scheme-language, 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.
+Some grobs can be accessed “laterally” from within another grob’s
+callback. These are usually listed as “layout objects” in the “Internal
+properties” section of a grob-interface. The function ly:grob-object is
+used to access these grobs.
 
 
 Demonstrated below are some ways of accessing grobs from within a
@@ -30,7 +30,7 @@ accessed.
 Example console output:
 
 
--------------------- #-Grob Accidental - #-Grob Arpeggio - #-Grob Stem -
+@code{ #Grob Accidental () #Grob Stem}
 
 
 
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 976387a0d1..cc628a3b4a 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, really-cool, scheme-language, tweaks-and-overrides"
@@ -18,7 +18,6 @@ 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 f6bb8ed356..8d5349df02 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, tweaks-and-overrides"
@@ -17,7 +17,6 @@ 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 2e9f1a3243..c6c0721724 100644
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "editorial-annotations, expressive-marks"
diff --git a/Documentation/snippets/using-ties-with-arpeggios.ly b/Documentation/snippets/using-ties-with-arpeggios.ly
index b1e8bea6fe..dac63bf04c 100644
--- a/Documentation/snippets/using-ties-with-arpeggios.ly
+++ b/Documentation/snippets/using-ties-with-arpeggios.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
@@ -20,7 +20,6 @@ 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 c6e1a0536b..a1b51d2923 100644
--- a/Documentation/snippets/utf-8.ly
+++ b/Documentation/snippets/utf-8.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
index 6610200af5..adea0ef562 100644
--- a/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
+++ b/Documentation/snippets/vertical-aligned-staffgroups-without-connecting-systemstartbar.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.30"
+\version "2.18.0"
 
 \header {
   lsrtags = "paper-and-layout, staff-notation, syntax-and-expressions"
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 9dca248702..222c20f0a5 100644
--- a/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
+++ b/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "ancient-notation, expressive-marks"
@@ -19,7 +19,6 @@ 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-aligning-dynamics-across-multiple-notes.ly b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
index 0adb0dec41..4c057c0998 100644
--- a/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
+++ b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks"
@@ -19,7 +19,6 @@ 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 4a85d9d6a4..bf138f5f07 100644
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.11"
+\version "2.18.0"
 
 \header {
   lsrtags = "spacing, tweaks-and-overrides, vocal-music"
@@ -18,7 +18,6 @@ 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 7c59cd3b16..661b8fe208 100644
--- a/Documentation/snippets/vertically-centered-common-lyrics.ly
+++ b/Documentation/snippets/vertically-centered-common-lyrics.ly
@@ -1,59 +1,67 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "vocal-music"
 
   texidoc = "
-In a vocal piece where there are several (two,four or more) lines of
-lyrics, and common lyrics for all voices at some point, these common
-lyrics may be vertically centered regardingly, as shown in the
+In a vocal piece where there are several (two, four or more) lines of
+lyrics and common lyrics for all voices at some point, the common
+lyrics may be made to appear vertically centered, as shown in the
 following example:
 
 "
   doctitle = "Vertically centered common lyrics"
 } % begin verbatim
 
-\include "english.ly"
-leftbrace = \markup { \override #'(font-encoding . fetaBraces) \lookup #"brace240" }
-rightbrace = \markup { \rotate #180 \leftbrace }
-
-dropLyrics =
-{
-    \override LyricText.extra-offset = #'(0 . -5)
-    \override LyricHyphen.extra-offset = #'(0 . -5)
-    \override LyricExtender.extra-offset = #'(0 . -5)
+dropLyrics = {
+  \override LyricText.extra-offset = #'(0 . -4.5)
+  \override LyricHyphen.extra-offset = #'(0 . -4.5)
+  \override LyricExtender.extra-offset = #'(0 . -4.5)
+  \override StanzaNumber.extra-offset = #'(0 . -4.5)
 }
 
-raiseLyrics =
-{
-    \revert LyricText.extra-offset
-    \revert LyricHyphen.extra-offset
-    \revert LyricExtender.extra-offset
+raiseLyrics = {
+  \revert LyricText.extra-offset
+  \revert LyricHyphen.extra-offset
+  \revert LyricExtender.extra-offset
+  \revert StanzaNumber.extra-offset
 }
 
 skipFour = \repeat unfold 4 { \skip 8 }
 
-lyricsA = \lyricmode { The first verse has \dropLyrics the com -- mon
-__ words \raiseLyrics used in all four. }
-lyricsB = \lyricmode { In stan -- za two, \skipFour al -- so ap -- pear. }
-lyricsC = \lyricmode { By the third verse, \skipFour are get -- ting dull. }
+lyricsA = \lyricmode {
+  The first verse has
+  \dropLyrics
+  \set stanza = #"   All:"
+  the com -- mon __ words
+  \raiseLyrics
+  used in all four.
+}
+
+lyricsB = \lyricmode { In stan -- za two,   \skipFour al -- so ap -- pear. }
+
+lyricsC = \lyricmode { By the third verse,  \skipFour are get -- ting dull. }
+
 lyricsD = \lyricmode { Last stan -- za, and \skipFour get used once more. }
 
-melody = \relative c' { c4 d e f g f e8( e f) d4 c e d c }
-
-\score
-{
-        <<
-                \new Voice = m \melody
-                \new Lyrics \lyricsto m \lyricsA
-                \new Lyrics \lyricsto m \lyricsB
-                \new Lyrics \lyricsto m \lyricsC
-                \new Lyrics \lyricsto m \lyricsD
-        >>
+melody = \relative c' {
+  c4 d e f |
+  g f e8( e f) d |
+  c4 e d c |
+}
+
+\score {
+  <<
+    \new Voice = m \melody
+    \new Lyrics \lyricsto m \lyricsA
+    \new Lyrics \lyricsto m \lyricsB
+    \new Lyrics \lyricsto m \lyricsC
+    \new Lyrics \lyricsto m \lyricsD
+  >>
 }
diff --git a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
index a29298b9d9..4816346449 100644
--- a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
+++ b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, tweaks-and-overrides"
@@ -19,7 +19,6 @@ 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 8e1796fd47..8eba692deb 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "automatic-notation, keyboards, template, vocal-music"
@@ -21,7 +21,6 @@ reduction.
   doctitle = "Vocal ensemble template with automatic piano reduction"
 } % begin verbatim
 
-
 \paper {
   top-system-spacing #'basic-distance = #10
   score-system-spacing #'basic-distance = #20
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 c4c1f61ccb..a13de11a6c 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
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, template, text, vocal-music"
@@ -18,7 +18,6 @@ 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 51ffe694b2..fa80dbc076 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "contexts-and-engravers, template, vocal-music"
@@ -20,7 +20,6 @@ score.
   doctitle = "Vocal ensemble template with verse and refrain"
 } % begin verbatim
 
-
 global = {
   \key g \major
 
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index 100d57e098..e78416a106 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, template, vocal-music"
@@ -20,7 +20,6 @@ regrouped on only two staves.
   doctitle = "Vocal ensemble template"
 } % begin verbatim
 
-
 \paper {
   top-system-spacing #'basic-distance = #10
   score-system-spacing #'basic-distance = #20
diff --git a/Documentation/snippets/vocal-headword.ly b/Documentation/snippets/vocal-headword.ly
index 454daf765d..cc21ee8369 100644
--- a/Documentation/snippets/vocal-headword.ly
+++ b/Documentation/snippets/vocal-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,13 +16,8 @@ Vocal headword
   doctitle = "Vocal headword"
 } % begin verbatim
 
-\layout {
-  \context {
-    \Score
-    \override PaperColumn.keep-inside-line = ##t
-    \override NonMusicalPaperColumn.keep-inside-line = ##t
-  }
-}
+%% http://lsr.di.unimi.it/LSR/Item?id=832
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/vocal-music
 
 % L. van Beethoven. Symphony No. 9 in D minor, op.125; Finale
 % mm. 216 -- 236
@@ -39,7 +34,7 @@ Vocal headword
     \autoBeamOff
     r4^\markup { \small Baritono } r a
     \appoggiatura a8 e'2. ~
-    4 d8[ cis d e]
+    e4 d8[ cis d e]
     e4 g, r8 g
     bes2 a8 e
     g4 f r
diff --git a/Documentation/snippets/volta-below-chords.ly b/Documentation/snippets/volta-below-chords.ly
index 1c43944d60..def56665c5 100644
--- a/Documentation/snippets/volta-below-chords.ly
+++ b/Documentation/snippets/volta-below-chords.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "chords, repeats, staff-notation"
@@ -17,7 +17,6 @@ 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 a16d728f33..db17173d06 100644
--- a/Documentation/snippets/volta-multi-staff.ly
+++ b/Documentation/snippets/volta-multi-staff.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "really-simple, repeats, staff-notation"
@@ -17,7 +17,6 @@ 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 55ef3c14a2..73415a718c 100644
--- a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
+++ b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "repeats, symbols-and-glyphs, text"
@@ -25,7 +25,6 @@ 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 821403d192..4d115afc26 100644
--- a/Documentation/snippets/wind-headword.ly
+++ b/Documentation/snippets/wind-headword.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.unimi.it
 %% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Wind headword
   doctitle = "Wind headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=833
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/wind-instruments
+
 % NR 2.whatever  Wind
 % Tchaikovsky
 % Nutcracker Suite, VII Dance of the Merlitons
diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly
index db8661d843..034f709854 100644
--- a/Documentation/snippets/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/woodwind-diagrams-listing.ly
@@ -1,10 +1,10 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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.16.0"
+\version "2.18.0"
 
 \header {
   lsrtags = "specific-notation, winds"
@@ -17,6 +17,10 @@ defined in LilyPond.
   doctitle = "Woodwind diagrams listing"
 } % begin verbatim
 
+\layout {
+  indent = 0
+}
+
 \relative c' {
   \textLengthOn
   c1^
-- 
2.39.2