From 58933e3e40e9cfbdc70b846bc808c723e053f7b3 Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Tue, 26 Jun 2012 11:50:43 +0100
Subject: [PATCH] LSR updates from tarball

---
 .../snippets/accordion-discant-symbols.ly     |  21 ++--
 ...a-figured-bass-above-or-below-the-notes.ly |   2 +-
 .../snippets/adding-ambitus-per-voice.ly      |   2 +-
 .../adding-an-extra-staff-at-a-line-break.ly  |  25 ++--
 .../snippets/adding-an-extra-staff.ly         |  21 ++--
 ...hen-using-tuplet-and-non-tuplet-rhythms.ly |  31 +++--
 Documentation/snippets/adding-drum-parts.ly   |   4 +-
 .../adding-extra-fingering-with-scheme.ly     |   4 +-
 .../snippets/adding-fingerings-to-a-score.ly  |   4 +-
 ...to-staves-which-get-split-after-a-break.ly |   4 +-
 ...ound-an-expressive-mark-or-chordal-note.ly |  21 ++--
 .../adding-the-current-date-to-a-score.ly     |   2 +-
 .../snippets/adjusting-grace-note-spacing.ly  |  17 ++-
 .../adjusting-lyrics-vertical-spacing.ly      |   2 +-
 .../adjusting-the-shape-of-falls-and-doits.ly |   5 +-
 ...aligning-and-centering-instrument-names.ly |  25 ++--
 ...ing-marks-with-various-notation-objects.ly |   3 +-
 ...-objects-created-with-the--mark-command.ly |   4 +-
 .../aligning-syllables-with-melisma.ly        |  42 +++++++
 ...ngerings-to-be-printed-inside-the-staff.ly |   2 +-
 .../altering-the-length-of-beamed-stems.ly    |  29 +++--
 .../snippets/alternative-breve-note.ly        |   2 +-
 .../snippets/ambitus-with-multiple-voices.ly  |   2 +-
 Documentation/snippets/ambitus.ly             |   4 +-
 .../analysis-brackets-above-the-staff.ly      |  21 ++--
 ...-modern-transcription-of-mensural-music.ly |   2 +-
 .../snippets/ancient-time-signatures.ly       |  17 ++-
 .../snippets/anglican-psalm-template.ly       |   2 +-
 ...yles-depending-on-the-step-of-the-scale.ly |   2 +-
 .../snippets/arabic-improvisation.ly          |   2 +-
 Documentation/snippets/asymmetric-slurs.ly    |  19 ++-
 .../snippets/automatic-beam-subdivisions.ly   |  19 ++-
 .../automatically-change-durations.ly         |   6 +-
 ...oiding-collisions-with-chord-fingerings.ly |  23 ++--
 ...staff-lines-using-the--whiteout-command.ly |  23 ++--
 Documentation/snippets/book-parts.ly          |   4 +-
 Documentation/snippets/breathing-signs.ly     |   4 +-
 .../snippets/broken-crescendo-hairpin.ly      |  43 ++++---
 .../caesura-railtracks-with-fermata.ly        |  21 ++--
 .../center-text-below-hairpin-dynamics.ly     |  25 ++--
 .../snippets/changing--flageolet-mark-size.ly |   2 +-
 ...changing-a-single-notes-size-in-a-chord.ly |  29 +++--
 ...ng-midi-output-to-one-channel-per-voice.ly |   4 +-
 ...hanging-properties-for-individual-grobs.ly |   4 +-
 .../snippets/changing-stanza-fonts.ly         |   4 +-
 ...xt-and-spanner-styles-for-text-dynamics.ly |   2 +-
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly |  19 ++-
 ...names-to-german-or-semi-german-notation.ly |  25 ++--
 .../changing-the-default-text-font-family.ly  |   4 +-
 ...ging-the-interval-of-lines-on-the-stave.ly |   4 +-
 ...he-number-of-augmentation-dots-per-note.ly |   2 +-
 ...changing-the-number-of-lines-in-a-staff.ly |   4 +-
 .../changing-the-size-of-woodwind-diagrams.ly |  18 +--
 .../snippets/changing-the-staff-size.ly       |   4 +-
 .../changing-the-text-for-sustain-markings.ly |  21 ++--
 ...-can-be-transposed-by-arbitrary-amounts.ly |   4 +-
 Documentation/snippets/clip-systems.ly        |  51 ++++----
 Documentation/snippets/clusters.ly            |  19 ++-
 ...coloring-notes-depending-on-their-pitch.ly |   4 +-
 .../combining-dynamics-with-markup-texts.ly   |  21 ++--
 .../combining-two-parts-on-the-same-staff.ly  |   2 +-
 .../consistently-left-aligned-bar-numbers.ly  |  55 ++++++++
 .../snippets/contemporary-glissando.ly        |   2 +-
 .../contexts-and-engravers.snippet-list       |   1 +
 ...g-spanner-visibility-after-a-line-break.ly |  37 +++---
 ...lling-the-placement-of-chord-fingerings.ly |   2 +-
 ...olling-the-vertical-ordering-of-scripts.ly |   2 +-
 .../snippets/creating-a-delayed-turn.ly       |   2 +-
 .../snippets/creating-blank-staves.ly         |  25 ++--
 .../creating-double-digit-fingerings.ly       |   4 +-
 .../creating-real-parenthesized-dynamics.ly   |  37 +++---
 .../creating-simultaneous-rehearsal-marks.ly  |  31 +++--
 .../snippets/creating-slurs-across-voices.ly  |  31 +++--
 .../snippets/creating-text-spanners.ly        |  23 ++--
 ...ff-chords---beaming-problems-workaround.ly |   4 +-
 .../snippets/cross-staff-tremolos.ly          |   2 +-
 Documentation/snippets/custodes.ly            |  17 ++-
 .../customizing-fretboard-fret-diagrams.ly    |   2 +-
 .../customizing-markup-fret-diagrams.ly       |   2 +-
 ...f-stems-on-the-center-line-of-the-staff.ly |  19 ++-
 .../snippets/demo-midiinstruments.ly          |   4 +-
 .../snippets/demonstrating-all-headers.ly     |   4 +-
 ...bracket-with-only-one-staff-in-a-system.ly |   2 +-
 .../snippets/displaying-complex-chords.ly     |  21 ++--
 .../snippets/displaying-grob-ancestry.ly      | 119 +++++++++---------
 Documentation/snippets/dotted-harmonics.ly    |   4 +-
 Documentation/snippets/double-glissando.ly    |   4 +-
 .../snippets/drawing-boxes-around-grobs.ly    |   6 +-
 .../drawing-circles-around-note-heads.ly      |   4 +-
 .../drawing-circles-around-various-objects.ly |   4 +-
 .../dynamics-custom-text-spanner-postfix.ly   |   3 +-
 .../snippets/dynamics-text-spanner-postfix.ly |   3 +-
 ...ng-native-postscript-in-a--markup-block.ly |  19 ++-
 .../snippets/engravers-one-by-one.ly          |  55 ++++----
 .../engraving-tremolos-with-floating-beams.ly |   4 +-
 ...l-tuplets-using-only-one--times-command.ly |   2 +-
 .../snippets/faking-a-hammer-in-tablatures.ly |  17 ++-
 .../snippets/fine-tuning-pedal-brackets.ly    |   4 +-
 .../fingering-symbols-for-wind-instruments.ly |   2 +-
 Documentation/snippets/flamenco-notation.ly   |  69 +++++-----
 Documentation/snippets/flute-slap-notation.ly |   4 +-
 .../forcing-a-clef-symbol-to-be-displayed.ly  |   4 +-
 .../forcing-horizontal-shift-of-notes.ly      |   2 +-
 .../snippets/forcing-hyphens-to-be-shown.ly   |  19 ++-
 ...-width-to-adapt-to-metronomemarks-width.ly |   4 +-
 ...-to-start-from-a-given-letter-or-number.ly |   4 +-
 .../snippets/formatting-lyrics-syllables.ly   |   4 +-
 .../fret-diagrams-explained-and-developed.ly  |   4 +-
 .../snippets/generating-custom-flags.ly       |   9 ++
 .../snippets/generating-random-notes.ly       |  15 ++-
 ...arts-in-scheme-without-using-the-parser.ly |  38 +++++-
 .../graphical-and-text-woodwind-diagrams.ly   |  31 +----
 ...izing-rhythms-and-notes-synchronization.ly |  10 ++
 Documentation/snippets/guitar-slides.ly       |  10 ++
 .../snippets/guitar-strum-rhythms.ly          |   2 +-
 .../hairpins-with-different-line-styles.ly    |  11 +-
 ...y-customized-polymetric-time-signatures.ly |  14 ++-
 ...ynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly |  49 +++++++-
 .../how-to-change-fret-diagram-position.ly    |  21 +++-
 ...ove-and-below-the-same-barline-method-1.ly |  29 ++++-
 ...ove-and-below-the-same-barline-method-2.ly |  16 ++-
 ...to-put-ties-between-syllables-in-lyrics.ly |  10 +-
 Documentation/snippets/hymn-template.ly       |   3 +-
 Documentation/snippets/incipit.ly             |   9 ++
 ...ross-staff-chords-with-arpeggio-bracket.ly |  13 ++
 Documentation/snippets/inserting-a-caesura.ly |   2 +-
 ...ore-fragments-above-a-staff,-as-markups.ly |  10 +-
 .../snippets/isolated-percent-repeats.ly      |   4 +-
 Documentation/snippets/jazz-combo-template.ly |   4 +-
 .../snippets/keep-change-clefs-full-sized.ly  |  11 +-
 Documentation/snippets/laissez-vibrer-ties.ly |  11 +-
 .../snippets/letter-tablature-formatting.ly   |   9 +-
 Documentation/snippets/line-arrows.ly         |  10 +-
 Documentation/snippets/lyrics-alignment.ly    |   5 +-
 Documentation/snippets/makam-example.ly       |   2 +-
 ...invisible-with-the-transparent-property.ly |  18 +++
 ...aking-slurs-with-complex-dash-structure.ly |  10 +-
 ...ome-staff-lines-thicker-than-the-others.ly |   8 +-
 ...ed-bass-extenders-for-only-some-numbers.ly |  12 ++
 .../manually-controlling-beam-positions.ly    |  11 +-
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |  13 +-
 Documentation/snippets/markup-lines.ly        |  10 +-
 Documentation/snippets/measure-counter.ly     |  10 +-
 ...che-layout-bar-lines-between-the-staves.ly |   4 +-
 ...ulti-measure-rests-in-a-polyphonic-part.ly |  11 +-
 .../modifying-tuplet-bracket-length.ly        |  14 +++
 .../moving-dotted-notes-in-polyphony.ly       |  13 +-
 .../moving-slur-positions-vertically.ly       |  16 ++-
 .../snippets/multi-measure-rest-markup.ly     |  10 +-
 Documentation/snippets/nesting-staves.ly      |   2 +-
 .../non-traditional-key-signatures.ly         |  23 ++--
 ...g-2.12-lyrics-spacing-in-newer-versions.ly |  27 ++--
 .../orchestra,-choir-and-piano-template.ly    |   2 +-
 Documentation/snippets/ottava-text.ly         |   8 +-
 .../snippets/outputting-the-version-number.ly |  13 +-
 .../snippets/partcombine-and-autobeamoff.ly   |   2 +
 .../percent-repeat-count-visibility.ly        |   2 +-
 .../snippets/piano-template-simple.ly         |  19 ++-
 .../piano-template-with-centered-lyrics.ly    |   2 +-
 .../piano-template-with-melody-and-lyrics.ly  |   2 +-
 .../snippets/positioning-arpeggios.ly         |   2 +-
 ...itioning-segno-and-coda-with-line-break.ly |   2 +-
 .../positioning-text-markups-inside-slurs.ly  |   2 +-
 ...naturals-from-being-automatically-added.ly |   2 +-
 ...-printed-when-the-key-signature-changes.ly |   2 +-
 ...repeat-sign-at-the-beginning-of-a-piece.ly |   2 +-
 ...ome-and-rehearsal-marks-below-the-staff.ly |   2 +-
 ...ng-music-with-different-time-signatures.ly |   2 +-
 .../printing-text-from-right-to-left.ly       |   2 +-
 .../proportional-strict-notespacing.ly        |   2 +-
 .../putting-lyrics-inside-the-staff.ly        |   2 +-
 .../snippets/recorder-fingering-chart.ly      |   2 +-
 .../snippets/removing-the-first-empty-line.ly |   2 +-
 Documentation/snippets/rest-styles.ly         |   2 +-
 Documentation/snippets/rhythms.snippet-list   |   1 +
 .../satb-choir-template---four-staves.ly      |   2 +-
 Documentation/snippets/screech-and-boink.ly   |   2 +-
 ...ancellations-from-key-signature-changes.ly |   2 +-
 .../setting-hairpin-behavior-at-bar-lines.ly  |   2 +-
 .../snippets/setting-system-separators.ly     |   2 +-
 ...ulation-above-and-below-a-note-or-chord.ly |   2 +-
 ...template-with-notes,-lyrics,-and-chords.ly |   2 +-
 ...te-with-notes,-lyrics,-chords-and-frets.ly |   2 +-
 ...le-staff-template-with-notes-and-chords.ly |   2 +-
 ...le-staff-template-with-notes-and-lyrics.ly |   2 +-
 .../single-staff-template-with-only-notes.ly  |   2 +-
 .../snippets/skips-in-lyric-mode-2.ly         |   2 +-
 Documentation/snippets/skips-in-lyric-mode.ly |   2 +-
 Documentation/snippets/slides-in-tablature.ly |   2 +-
 .../snap-pizzicato-or-bartok-pizzicato.ly     |   2 +-
 .../snippets/staff-notation.snippet-list      |   1 +
 .../string-quartet-template-simple.ly         |   2 +-
 ...ng-quartet-template-with-separate-parts.ly |   2 +-
 ...sing-warnings-for-clashing-note-columns.ly |   2 +-
 Documentation/snippets/table-of-contents.ly   |   2 +-
 Documentation/snippets/text.snippet-list      |   1 +
 Documentation/snippets/three-sided-box.ly     |   2 +-
 ...ime-signature-in-parentheses---method-3.ly |   2 +-
 .../snippets/time-signature-in-parentheses.ly |   2 +-
 ...scription-of-ancient-music-with-incipit.ly |   2 +-
 .../snippets/tweaking-clef-properties.ly      |   2 +-
 .../tweaking-grace-layout-within-music.ly     |   2 +-
 .../tweaks-and-overrides.snippet-list         |   1 +
 Documentation/snippets/unfretted-headword.ly  |   2 +-
 ...ggiobracket-to-make-divisi-more-visible.ly |   2 +-
 ...pt-to-generate-special-note-head-shapes.ly |   2 +-
 ...tweak-command-to-tweak-individual-grobs.ly |   2 +-
 .../snippets/using-the-whiteout-property.ly   |   2 +-
 ...cal-line-as-a-baroque-articulation-mark.ly |   2 +-
 ...ically-aligned-dynamics-and-textscripts.ly |   2 +-
 .../vertically-aligning-ossias-and-lyrics.ly  |   2 +-
 ...centering-paired-figured-bass-extenders.ly |   2 +-
 ...template-with-automatic-piano-reduction.ly |   2 +-
 ...rics-aligned-below-and-above-the-staves.ly |   2 +-
 ...nsemble-template-with-verse-and-refrain.ly |   2 +-
 .../snippets/vocal-ensemble-template.ly       |   2 +-
 .../snippets/vocal-music.snippet-list         |   1 +
 Documentation/snippets/volta-below-chords.ly  |   2 +-
 Documentation/snippets/volta-multi-staff.ly   |   2 +-
 .../volta-text-markup-using-repeatcommands.ly |   2 +-
 .../snippets/woodwind-diagrams-listing.ly     |  26 +---
 221 files changed, 1303 insertions(+), 909 deletions(-)
 create mode 100644 Documentation/snippets/aligning-syllables-with-melisma.ly
 create mode 100644 Documentation/snippets/consistently-left-aligned-bar-numbers.ly

diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 4a7c988c18..dae241adb4 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Les symboles spécifiques au clavier main droite d'un accordéon
-s'indiquent à l'aide de @code{\\markup}.  Le positionnement de tels
-symboles s'ajuste grâce à des arguments @code{\\raise}.
-
-"
-  doctitlefr = "Symboles de chant pour accordéon"
-
-  lsrtags = "specific-notation, keyboards, workaround, symbols-and-glyphs"
-
+  lsrtags = "specific-notation, workaround, keyboards, symbols-and-glyphs"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -37,6 +27,15 @@ Die vertikale Position der einzelnen Elemente werden mit @code{\\raise}
 angepasst.
 "
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Les symboles spécifiques au clavier main droite d'un accordéon
+s'indiquent à l'aide de @code{\\markup}.  Le positionnement de tels
+symboles s'ajuste grâce à des arguments @code{\\raise}.
+
+"
+  doctitlefr = "Symboles de chant pour accordéon"
+
   texidoc = "
 Accordion discant-specific symbols are added using @code{\\markup}. The
 vertical placement of the symbols can be tweaked by changing the
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 bbb8fcbead..1563e2c552 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, contexts-and-engravers, chords"
+  lsrtags = "chords, contexts-and-engravers, ancient-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
index c9712adb06..750fd81f93 100644
--- a/Documentation/snippets/adding-ambitus-per-voice.ly
+++ b/Documentation/snippets/adding-ambitus-per-voice.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, pitches, staff-notation"
+  lsrtags = "pitches, staff-notation, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Añadir un ámbito por voz"
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 a57bced8eb..62c39fe7a8 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
@@ -7,19 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Lorsqu'une nouvelle portée vient s'ajouter après un saut de ligne,
-LilyPond préserve un espace juste avant le saut de ligne -- pour un
-éventuel changement d'armure qui, quoi qu'il en soit, ne sera pas
-imprimé.  L'astuce consiste alors, comme indiqué dans l'exemple suivant,
-à ajuster @code{Staff.explicitKeySignatureVisibility}.
-
-"
-  doctitlefr = "Ajout d'une portée supplémentaire après un saut de ligne"
-
-  lsrtags = "workaround, breaks, contexts-and-engravers, staff-notation"
-
+  lsrtags = "breaks, workaround, contexts-and-engravers, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -33,6 +21,17 @@ muestra en el ejemplo.
 "
   doctitlees = "Añadir un pentagrama adicional en un salto de línea"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Lorsqu'une nouvelle portée vient s'ajouter après un saut de ligne,
+LilyPond préserve un espace juste avant le saut de ligne -- pour un
+éventuel changement d'armure qui, quoi qu'il en soit, ne sera pas
+imprimé.  L'astuce consiste alors, comme indiqué dans l'exemple suivant,
+à ajuster @code{Staff.explicitKeySignatureVisibility}.
+
+"
+  doctitlefr = "Ajout d'une portée supplémentaire après un saut de ligne"
+
   texidoc = "
 When adding a new staff at a line break, some extra space is
 unfortunately added at the end of the line before the break (to fit in
diff --git a/Documentation/snippets/adding-an-extra-staff.ly b/Documentation/snippets/adding-an-extra-staff.ly
index d67e7bdea2..365940c263 100644
--- a/Documentation/snippets/adding-an-extra-staff.ly
+++ b/Documentation/snippets/adding-an-extra-staff.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Vous pouvez ajouter une nouvelle portée, éventuellement de manière
-temporaire, après le début d'un morceau.
-
-"
-  doctitlefr = "Ajout d'une portée supplémentaire"
-
-
-  lsrtags = "contexts-and-engravers, staff-notation, really-simple"
-
+  lsrtags = "really-simple, contexts-and-engravers, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -27,6 +17,15 @@ nuevo una vez que la pieza ha comenzado.
 "
   doctitlees = "Añadir un pentagrama nuevo"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Vous pouvez ajouter une nouvelle portée, éventuellement de manière
+temporaire, après le début d'un morceau.
+
+"
+  doctitlefr = "Ajout d'une portée supplémentaire"
+
+
   texidoc = "
 An extra staff can be added (possibly temporarily) after the start of a
 piece.
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 cc28d4e20c..7993ba5110 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
@@ -7,22 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La syntaxe de LilyPond demande parfois un positionnement inhabituel des
-parenthèses, crochets etc. qui peuvent s'entrelacer.  Par exemple, le
-crochet ouvrant une ligature manuelle se place à la suite de la note
-de départ et sa durée, non pas avant.  De même, le crochet fermant se
-place à la fin de la ligature, y compris lorsque la dernière note se
-trouve incluse dans un nolet.  Cet extrait illustre la manière de
-combiner ligatures manuelles, liaisons d'articulation, de prolongation
-ou de phrasé, avec des nolets bornés par des parenthèses.
-
-"
-  doctitlefr = "Coexistence de ligatures et liaisons avec des rythmes comprenant des nolets"
-
-  lsrtags = "rhythms, expressive-marks"
-
+  lsrtags = "expressive-marks, rhythms"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -41,6 +26,20 @@ valoración especial (encerradas entre llaves).
 "
   doctitlees = "Añadir barras ligaduras de expresión y de unión etc. cuando se usan ritmos con y sin grupos de valoración especial."
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+La syntaxe de LilyPond demande parfois un positionnement inhabituel des
+parenthèses, crochets etc. qui peuvent s'entrelacer.  Par exemple, le
+crochet ouvrant une ligature manuelle se place à la suite de la note
+de départ et sa durée, non pas avant.  De même, le crochet fermant se
+place à la fin de la ligature, y compris lorsque la dernière note se
+trouve incluse dans un nolet.  Cet extrait illustre la manière de
+combiner ligatures manuelles, liaisons d'articulation, de prolongation
+ou de phrasé, avec des nolets bornés par des parenthèses.
+
+"
+  doctitlefr = "Coexistence de ligatures et liaisons avec des rythmes comprenant des nolets"
+
   texidoc = "
 LilyPond syntax can involve many unusual placements for parentheses,
 brackets etc., which might sometimes have to be interleaved. For
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 1d515d5dad..a712032dbd 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-  lsrtags = "preparing-parts, specific-notation, percussion, really-simple, rhythms"
+  lsrtags = "really-simple, specific-notation, rhythms, preparing-parts, percussion"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/adding-extra-fingering-with-scheme.ly b/Documentation/snippets/adding-extra-fingering-with-scheme.ly
index b099b14db1..5fda87ea14 100644
--- a/Documentation/snippets/adding-extra-fingering-with-scheme.ly
+++ b/Documentation/snippets/adding-extra-fingering-with-scheme.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "scheme-language"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Il est possible, à l'aide de la fonction @code{make-music}, d'ajouter
@@ -20,8 +22,6 @@ chargée de structurer votre musique.
 "
   doctitlefr = "Ajout d'un doigté supplémentaire avec scheme"
 
-  lsrtags = "scheme-language"
-
   texidoc = "
 You can add various stuff to notes using @code{make-music}. In this
 example, an extra fingering is attached to a note.
diff --git a/Documentation/snippets/adding-fingerings-to-a-score.ly b/Documentation/snippets/adding-fingerings-to-a-score.ly
index 0a7f2250ea..e84830d74e 100644
--- a/Documentation/snippets/adding-fingerings-to-a-score.ly
+++ b/Documentation/snippets/adding-fingerings-to-a-score.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "really-simple, fretted-strings, editorial-annotations"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Les instructions de doigtés se saisissent selon une syntaxe très simple.
@@ -14,8 +16,6 @@ Les instructions de doigtés se saisissent selon une syntaxe très simple.
 "
   doctitlefr = "Ajout de doigtés à une partition"
 
-  lsrtags = "editorial-annotations, fretted-strings, really-simple"
-
   texidoc = "
 Fingering instructions can be entered using a simple syntax.
 
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 e63499cbda..c0874dc84f 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
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "staff-notation, vocal-music, symbols-and-glyphs"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Dans cet extrait est définie la commande @code{\\splitStaffBarLine} qui
@@ -17,8 +19,6 @@ portée à la ligne suivante.
 "
   doctitlefr = "Ajout d'indicateurs à une portée dédoublée après un saut de ligne"
 
-  lsrtags = "vocal-music, symbols-and-glyphs, staff-notation"
-
   texidoc = "
 This snippet defines the @code{\\splitStaffBarLine} command, which adds
 arrows in north-east and south-east directions at a bar line, to denote
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 a6acb4648c..f5bdd994e4 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
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-La fonction @code{\\parenthesize}, qui permet de mettre un objet entre
-parenthèses, a ceci de particulier qu'elle est associée à un objet
-graphique @code{ParenthesesItem}.
-
-"
-  doctitlefr = "Mise entre parenthèses d'un signe d'interprétation ou d'une note d'un accord"
-
-  lsrtags = "workaround, expressive-marks"
-
+  lsrtags = "expressive-marks, workaround"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -27,6 +17,15 @@ objetos entre paréntesis.  El grob asociado es @code{ParenthesesItem}.
 "
   doctitlees = "Encerrar entre paréntesis una marca expresiva o una nota de un acorde"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+La fonction @code{\\parenthesize}, qui permet de mettre un objet entre
+parenthèses, a ceci de particulier qu'elle est associée à un objet
+graphique @code{ParenthesesItem}.
+
+"
+  doctitlefr = "Mise entre parenthèses d'un signe d'interprétation ou d'une note d'un accord"
+
   texidoc = "
 The @code{\\parenthesize} function is a special tweak that encloses
 objects in parentheses.  The associated grob is @code{ParenthesesItem}.
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 bebd6097f7..e3533daefd 100644
--- a/Documentation/snippets/adding-the-current-date-to-a-score.ly
+++ b/Documentation/snippets/adding-the-current-date-to-a-score.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "text, really-cool, titles, scheme-language"
+  lsrtags = "text, titles, scheme-language, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/adjusting-grace-note-spacing.ly b/Documentation/snippets/adjusting-grace-note-spacing.ly
index a7e5054783..0bb1d175b6 100644
--- a/Documentation/snippets/adjusting-grace-note-spacing.ly
+++ b/Documentation/snippets/adjusting-grace-note-spacing.ly
@@ -7,17 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La propriété @code{spacing-increment} de @code{Score.GraceSpacing}
-permet d'ajuster l'espacement d'un groupe de notes d'ornement.
-
-"
-  doctitlefr = "Ajustement de l'espacement des notes d'ornement"
-
   lsrtags = "tweaks-and-overrides, rhythms"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 Se puede ajustar la separación entre las notas de adorno utilizando la
@@ -27,6 +18,14 @@ propiedad @code{spacing-increment} de @code{Score.GraceSpacing}.
 
   doctitlees = "Ajuste del espaciado de las notas de adorno"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+La propriété @code{spacing-increment} de @code{Score.GraceSpacing}
+permet d'ajuster l'espacement d'un groupe de notes d'ornement.
+
+"
+  doctitlefr = "Ajustement de l'espacement des notes d'ornement"
+
   texidoc = "
 The space given to grace notes can be adjusted using the
 @code{spacing-increment} property of @code{Score.GraceSpacing}.
diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index 71fb0be9b1..209dfebb56 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "correction-wanted, vocal-music, workaround, text, spacing"
+  lsrtags = "spacing, workaround, correction-wanted, text, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 227be37d85..114f5b5738 100644
--- a/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
+++ b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
@@ -37,14 +37,13 @@ pour ajuster l'apparence des chutes ou sauts.
 
 
   texidoc = "
-The @code{shortest-duration-space} property may have to be tweaked to
-adjust the shape of falls and doits.
+The @code{shortest-duration-space} property may be tweaked to adjust
+the shape of falls and doits.
 
 "
   doctitle = "Adjusting the shape of falls and doits"
 } % begin verbatim
 
-
 \relative c'' {
   \override Score.SpacingSpanner #'shortest-duration-space = #4.0
   c2-\bendAfter #5
diff --git a/Documentation/snippets/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
index 7172ce0157..3706adfbb2 100644
--- a/Documentation/snippets/aligning-and-centering-instrument-names.ly
+++ b/Documentation/snippets/aligning-and-centering-instrument-names.ly
@@ -7,19 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-L'alignement horizontal des noms d'instrument se gère à l'aide de la
-propriété @code{Staff.InstrumentName #'self-alignment-X}.  Les variables
-@code{indent} et @code{short-indent}, attachées au bloc @code{\\layout},
-déterminent l'espace alloué à l'alignement des noms d'instrument,
-respectivement dans leurs formes développée et abrégée.
-
-"
-  doctitlefr = "Alignement des noms d'instrument"
-
-  lsrtags = "text, paper-and-layout, titles"
-
+  lsrtags = "paper-and-layout, text, titles"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -33,6 +21,17 @@ los siguientes, respectivamente.
 "
   doctitlees = "Alinear y centrar los nombres de instrumento"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+L'alignement horizontal des noms d'instrument se gère à l'aide de la
+propriété @code{Staff.InstrumentName #'self-alignment-X}.  Les variables
+@code{indent} et @code{short-indent}, attachées au bloc @code{\\layout},
+déterminent l'espace alloué à l'alignement des noms d'instrument,
+respectivement dans leurs formes développée et abrégée.
+
+"
+  doctitlefr = "Alignement des noms d'instrument"
+
   texidoc = "
 The horizontal alignment of instrument names is tweaked by changing the
 @code{Staff.InstrumentName #'self-alignment-X} property. The
diff --git a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
index 23f0df6dd4..9ee7ccc555 100644
--- a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
+++ b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
@@ -81,7 +81,6 @@ be done for all the staves).
   doctitle = "Aligning marks with various notation objects"
 } % begin verbatim
 
-
 \relative c' {
   e1
 
@@ -89,7 +88,7 @@ be done for all the staves).
   \override Score.RehearsalMark #'break-align-symbols = #'(clef)
   \key a \major
   \clef treble
-  \mark "↓"
+  \mark \markup { \char ##x2193 }
   e1
 
   % the RehearsalMark will be centered above the TimeSignature
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 1c8a0b9d82..5e0e6f4a62 100644
--- a/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
+++ b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "text"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Par défaut, la commande @code{\\mark} centre les objets sur la barre de
@@ -16,8 +18,6 @@ gauche ou par la droite.
 "
   doctitlefr = "Alignement des objets créés par la commande @code{\\mark}"
 
-  lsrtags = "text"
-
   texidoc = "
 By default the @code{\\mark} command centers objects over a bar line.
 This behavior can be modified to align at right or left.
diff --git a/Documentation/snippets/aligning-syllables-with-melisma.ly b/Documentation/snippets/aligning-syllables-with-melisma.ly
new file mode 100644
index 0000000000..4aa1e27490
--- /dev/null
+++ b/Documentation/snippets/aligning-syllables-with-melisma.ly
@@ -0,0 +1,42 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "text, vocal-music"
+
+  texidoc = "
+By default, lyrics syllables that start a melisma are left aligned on
+their note.  The alignment can be altered using the
+@code{lyricMelismaAlignment} property.
+
+"
+  doctitle = "Aligning syllables with melisma"
+} % begin verbatim
+
+\score {
+  <<
+    \new Staff {
+      \relative c''
+      \new Voice = "vocal" {
+        c d~^\markup default  d e
+        c d~^\markup "right aligned" d e
+        c d~^\markup "center aligned" d e
+        c d~^\markup "reset to default" d e
+      }
+    }
+    \new Lyrics \lyricsto "vocal" \lyricmode {
+      word word word
+      \set lyricMelismaAlignment = #RIGHT
+      word word word
+      \set lyricMelismaAlignment = #CENTER
+      word word word
+      \unset lyricMelismaAlignment
+      word word word
+    }
+  >>
+}
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 9689f093e3..76727a4f8e 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, editorial-annotations, fretted-strings, spacing"
+  lsrtags = "specific-notation, spacing, fretted-strings, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
diff --git a/Documentation/snippets/altering-the-length-of-beamed-stems.ly b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
index 5361b6d187..2f55e259c5 100644
--- a/Documentation/snippets/altering-the-length-of-beamed-stems.ly
+++ b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
@@ -7,21 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
-  texidocfr = "
-La hauteur de hampe des notes ligaturées est gérée par la sous-propriété
-@code{beamed-lengths} des @code{details} de l'objet @code{Stem}.
-Lorsqu'elle ne comporte qu'une seule valeur, cette hauteur s'appliquera
-à toutes les hampes.  En présence de plusieurs arguments, le premier
-affectera les crochet, le second les doubles croches, et ainsi de suite.
-Le dernier argument s'appliquera aussi aux notes de plus courte durée.
-Les arguments peuvent être des valeurs décimales.
-
-"
-  doctitlefr = "Modification de la hauteur de hampes ligaturées"
-
-  lsrtags = "pitches, tweaks-and-overrides"
-
+  lsrtags = "tweaks-and-overrides, pitches"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -41,6 +27,19 @@ doctitlees = "Alterar la longitud de las plicas unidas por una barra"
 
 
 
+%% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
+  texidocfr = "
+La hauteur de hampe des notes ligaturées est gérée par la sous-propriété
+@code{beamed-lengths} des @code{details} de l'objet @code{Stem}.
+Lorsqu'elle ne comporte qu'une seule valeur, cette hauteur s'appliquera
+à toutes les hampes.  En présence de plusieurs arguments, le premier
+affectera les crochet, le second les doubles croches, et ainsi de suite.
+Le dernier argument s'appliquera aussi aux notes de plus courte durée.
+Les arguments peuvent être des valeurs décimales.
+
+"
+  doctitlefr = "Modification de la hauteur de hampes ligaturées"
+
   texidoc = "
 Stem lengths on beamed notes can be varied by overriding the
 @code{beamed-lengths} property of the @code{details} of the
diff --git a/Documentation/snippets/alternative-breve-note.ly b/Documentation/snippets/alternative-breve-note.ly
index 40c0a949e5..c15623739c 100644
--- a/Documentation/snippets/alternative-breve-note.ly
+++ b/Documentation/snippets/alternative-breve-note.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, expressive-marks"
+  lsrtags = "expressive-marks, rhythms"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/ambitus-with-multiple-voices.ly b/Documentation/snippets/ambitus-with-multiple-voices.ly
index e343539773..64ba9dd36d 100644
--- a/Documentation/snippets/ambitus-with-multiple-voices.ly
+++ b/Documentation/snippets/ambitus-with-multiple-voices.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, pitches"
+  lsrtags = "pitches, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Ámbitos con varias voces"
diff --git a/Documentation/snippets/ambitus.ly b/Documentation/snippets/ambitus.ly
index d9f6ad75b5..711f9478a2 100644
--- a/Documentation/snippets/ambitus.ly
+++ b/Documentation/snippets/ambitus.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "pitches, vocal-music"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Un @emph{ambitus} indique la tessiture, autrement dit les hauteurs
@@ -19,8 +21,6 @@ supplémentaires.
 "
   doctitlefr = "Ambitus"
 
-  lsrtags = "vocal-music, pitches"
-
   texidoc = "
 Ambitus indicate pitch ranges for voices.
 
diff --git a/Documentation/snippets/analysis-brackets-above-the-staff.ly b/Documentation/snippets/analysis-brackets-above-the-staff.ly
index 31eb743333..6a0488c108 100644
--- a/Documentation/snippets/analysis-brackets-above-the-staff.ly
+++ b/Documentation/snippets/analysis-brackets-above-the-staff.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Les crochets d'analyse viennent par défaut se positionner au-dessous de
-la portée.  L'exemple suivant vous indique comment les faire apparaître
-en surplomb de la portée.
-
-"
-  doctitlefr = "Crochets d'analyse au-dessus de la portée"
-
-  lsrtags = "editorial-annotations, tweaks-and-overrides, really-simple"
-
+  lsrtags = "really-simple, tweaks-and-overrides, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -28,6 +18,15 @@ colocarlos por encima.
 "
   doctitlees = "Corchetes de análisis encima del pentagrama"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Les crochets d'analyse viennent par défaut se positionner au-dessous de
+la portée.  L'exemple suivant vous indique comment les faire apparaître
+en surplomb de la portée.
+
+"
+  doctitlefr = "Crochets d'analyse au-dessus de la portée"
+
   texidoc = "
 Simple horizontal analysis brackets are added below the staff by
 default. The following example shows a way to place them above the
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 e8a3706f28..dcc4b57d36 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, ancient-notation, really-cool, real-music"
+  lsrtags = "ancient-notation, real-music, template, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/ancient-time-signatures.ly b/Documentation/snippets/ancient-time-signatures.ly
index c665cd8a53..7bdcf877e3 100644
--- a/Documentation/snippets/ancient-time-signatures.ly
+++ b/Documentation/snippets/ancient-time-signatures.ly
@@ -7,17 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-La métrique peut s'imprimer dans un style ancien.
-
-"
-  doctitlefr = "Métrique ancienne"
-
-
   lsrtags = "ancient-notation"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 Las indicaciones de compás también se pueden grabar en estilo antiguo.
@@ -25,6 +16,14 @@ Las indicaciones de compás también se pueden grabar en estilo antiguo.
 "
   doctitlees = "Indicaciones de compás antiguas"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+La métrique peut s'imprimer dans un style ancien.
+
+"
+  doctitlefr = "Métrique ancienne"
+
+
   texidoc = "
 Time signatures may also be engraved in an old style.
 
diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index 66e05cd1ef..434d9f8106 100644
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music"
+  lsrtags = "vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 9d95a149e6..cfb038dad8 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, pitches"
+  lsrtags = "pitches, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Aplicar estilos de cabeza según la nota de la escala"
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index fafa138c20..82ff221ad2 100644
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "world-music"
diff --git a/Documentation/snippets/asymmetric-slurs.ly b/Documentation/snippets/asymmetric-slurs.ly
index 46052714a4..5a8283a73c 100644
--- a/Documentation/snippets/asymmetric-slurs.ly
+++ b/Documentation/snippets/asymmetric-slurs.ly
@@ -7,16 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Une liaison peut adopter une courbe asymétrique afin de s'adapter au
-mieux à la ligne mélodique.
-
-"
-  doctitlefr = "Liaison asymétrique"
-
-  lsrtags = "tweaks-and-overrides, expressive-marks"
-
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -28,6 +19,14 @@ adaptarse mejor a un patrón asimétrico de notas.
 
 
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Une liaison peut adopter une courbe asymétrique afin de s'adapter au
+mieux à la ligne mélodique.
+
+"
+  doctitlefr = "Liaison asymétrique"
+
   texidoc = "
 Slurs can be made asymmetric to match an asymmetric pattern of notes
 better.
diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
index 6a00ecca19..ba0535903e 100644
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -7,16 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Dès lors que la propriété @code{subdivideBeams} aura été activée, une
-ligature sera subdivisée selon les préceptes de @code{beatLength}.
-
-"
-  doctitlefr = "Subdivision de ligatures automatiques"
-
-  lsrtags = "automatic-notation, connecting-notes, rhythms"
-
+  lsrtags = "automatic-notation, rhythms, connecting-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -27,6 +18,14 @@ posiciones de pulso (tal y como se especifica en @code{beatLength}).
 "
   doctitlees = "Subdivisiones de barra automáticas"
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Dès lors que la propriété @code{subdivideBeams} aura été activée, une
+ligature sera subdivisée selon les préceptes de @code{beatLength}.
+
+"
+  doctitlefr = "Subdivision de ligatures automatiques"
+
   texidoc = "
 Beams can be subdivided automatically.  By setting the property
 @code{subdivideBeams}, beams are subdivided at beat positions (as
diff --git a/Documentation/snippets/automatically-change-durations.ly b/Documentation/snippets/automatically-change-durations.ly
index eef6ddc6aa..36b35bf292 100644
--- a/Documentation/snippets/automatically-change-durations.ly
+++ b/Documentation/snippets/automatically-change-durations.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "rhythms"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 @code{shiftDurations} permet de modifier la longueur des notes d'un
@@ -17,10 +19,8 @@ d'augmentation (entier positif).
 "
   doctitlefr = "Changement automatique des durées"
 
-  lsrtags = "rhythms"
-
   texidoc = "
-@code{shiftDurations} can be used to change the note lengths of a
+<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.
 
diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index 41134cfbfe..ff1cc18004 100644
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -7,18 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
-  texidocfr = "
-Doigtés et numéros de corde, lorsque affectés à des notes individuelles,
-évitent les hampes et ligatures.  Cette fonctionnalité n'est pas activée
-par défaut en ce qui concernes les notes appartenant à un accord.  Voici
-comment mettre en place la dérogation appropriée en pareil cas.
-
-"
-  doctitlefr = "Évitement de collision des doigtés d'un accord"
-
-  lsrtags = "editorial-annotations, chords, tweaks-and-overrides, rhythms"
-
+  lsrtags = "tweaks-and-overrides, chords, rhythms, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -35,6 +24,16 @@ sobreescribir este comportamiento predeterminado.
   doctitlees = "Evitar colisiones con digitaciones de acordes"
 
 
+%% Translation of GIT committish: 85394d425536d267ed0cb71d17023849f1611180
+  texidocfr = "
+Doigtés et numéros de corde, lorsque affectés à des notes individuelles,
+évitent les hampes et ligatures.  Cette fonctionnalité n'est pas activée
+par défaut en ce qui concernes les notes appartenant à un accord.  Voici
+comment mettre en place la dérogation appropriée en pareil cas.
+
+"
+  doctitlefr = "Évitement de collision des doigtés d'un accord"
+
   texidoc = "
 Fingerings and string numbers applied to individual notes will
 automatically avoid beams and stems, but this is not true by default
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 4cf7fb147d..b367e229c6 100644
--- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
@@ -7,18 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-L'instruction @code{\\whiteout} intercale un rectangle blanc contenant
-un @emph{markup}.  Dans la mesure où les lignes de la portée sont à un
-niveau inférieur à la plupart des autres objets graphiques, ce cache ne
-devrait pas masquer d'autres éléments.
-
-"
-  doctitlefr = "Blanchiment de lignes de portée avec la commande \\whiteout"
-
-  lsrtags = "editorial-annotations, text, really-cool"
-
+  lsrtags = "text, really-cool, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -31,6 +20,16 @@ objetos.
 "
   doctitlees = "Poner en blanco las líneas del pentagrama utilizando la instrucción \\whiteout"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+L'instruction @code{\\whiteout} intercale un rectangle blanc contenant
+un @emph{markup}.  Dans la mesure où les lignes de la portée sont à un
+niveau inférieur à la plupart des autres objets graphiques, ce cache ne
+devrait pas masquer d'autres éléments.
+
+"
+  doctitlefr = "Blanchiment de lignes de portée avec la commande \\whiteout"
+
   texidoc = "
 The @code{\\whiteout} command underlays a markup with a white box.
 Since staff lines are in a lower layer than most other grobs, this
diff --git a/Documentation/snippets/book-parts.ly b/Documentation/snippets/book-parts.ly
index 1cdfe2e38c..0c7a26b124 100644
--- a/Documentation/snippets/book-parts.ly
+++ b/Documentation/snippets/book-parts.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "paper-and-layout"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 @code{\\bookpart} permet de découper un ouvrage en plusieurs parties.
@@ -18,8 +20,6 @@ qu'ils se rattachent à une partie ou bien à l'ouvrage entier.
 "
   doctitlefr = "Partitionnement d'un ouvrage"
 
-  lsrtags = "paper-and-layout"
-
   texidoc = "
 @code{\\bookpart} can be used to split a book into several parts. Each
 part last page can be affected by @code{ragged-last-bottom}. Header and
diff --git a/Documentation/snippets/breathing-signs.ly b/Documentation/snippets/breathing-signs.ly
index 2022bfb2d1..bb0a2c5bde 100644
--- a/Documentation/snippets/breathing-signs.ly
+++ b/Documentation/snippets/breathing-signs.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "expressive-marks, symbols-and-glyphs"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Les indications de respiration sont disponibles sous différentes
@@ -16,8 +18,6 @@ formes : virgule (par défaut), trait, en V et @qq{voie de chemin de fer}
 "
   doctitlefr = "Signes de respiration"
 
-  lsrtags = "symbols-and-glyphs, expressive-marks"
-
   texidoc = "
 Breathing signs are available in different tastes: commas (default),
 ticks, vees and @qq{railroad tracks} (caesura).
diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
index 451bd637e1..0282ffb731 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -7,28 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Une portion d'un soufflet de crescendo peut être rendue invisible.
-Il suffit pour cela de dessiner un rectangle par dessus cette partie, ce
-qui aura pour effet de la rendre invisible.  Le rectangle est défini par
-un @emph{markup} contenant du code PostScript.
-
-La taille et le positionnement de ce @emph{markup} sont ajustables grâce
-à certaiins composants du code PostScript@tie{}: le nombre précédant
-@code{setgray} donnera du gris s'il est inérieur à@tie{}1@tie{}; les
-deux nombres précédant @code{scale} définissent la largeur et la hauteur
-du rectangle@tie{}; les deux nombres précédant @code{translate}
-modifient le point d'ancrage (en abscisse et en ordonnée) du rectangle.
-
-Le soufflet doit se trouver à un niveau inférieur à celui du @emph{markup}
-afin que le dessin du rectangle puisse effectivement le recouvrir.
-
-"
-  doctitlefr = "Soufflet de crescendo partiellement interrompu"
-
-  lsrtags = "contemporary-notation, symbols-and-glyphs, expressive-marks"
-
+  lsrtags = "expressive-marks, contemporary-notation, symbols-and-glyphs"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -53,6 +32,26 @@ regulador.
 "
   doctitlees = "Regulador interrumpido"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Une portion d'un soufflet de crescendo peut être rendue invisible.
+Il suffit pour cela de dessiner un rectangle par dessus cette partie, ce
+qui aura pour effet de la rendre invisible.  Le rectangle est défini par
+un @emph{markup} contenant du code PostScript.
+
+La taille et le positionnement de ce @emph{markup} sont ajustables grâce
+à certaiins composants du code PostScript@tie{}: le nombre précédant
+@code{setgray} donnera du gris s'il est inérieur à@tie{}1@tie{}; les
+deux nombres précédant @code{scale} définissent la largeur et la hauteur
+du rectangle@tie{}; les deux nombres précédant @code{translate}
+modifient le point d'ancrage (en abscisse et en ordonnée) du rectangle.
+
+Le soufflet doit se trouver à un niveau inférieur à celui du @emph{markup}
+afin que le dessin du rectangle puisse effectivement le recouvrir.
+
+"
+  doctitlefr = "Soufflet de crescendo partiellement interrompu"
+
   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
diff --git a/Documentation/snippets/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
index 30a684bca8..c957423839 100644
--- a/Documentation/snippets/caesura-railtracks-with-fermata.ly
+++ b/Documentation/snippets/caesura-railtracks-with-fermata.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Une césure peut parfois s'indiquer par une double respiration surmontée
-d'un point d'orgue.  Le code ci-dessous permet d'obtenir la combinaison
-répondant à cette esthétique.
-
-"
-  doctitlefr = "Césure en forme de \"voie de chemin de fer\" avec point d'orgue"
-
-  lsrtags = "symbols-and-glyphs, tweaks-and-overrides, expressive-marks"
-
+  lsrtags = "expressive-marks, tweaks-and-overrides, symbols-and-glyphs"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -29,6 +19,15 @@ dos marcas.
 "
   doctitlees = "Cesura tipo \"vías del tren\" con calderón"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Une césure peut parfois s'indiquer par une double respiration surmontée
+d'un point d'orgue.  Le code ci-dessous permet d'obtenir la combinaison
+répondant à cette esthétique.
+
+"
+  doctitlefr = "Césure en forme de \"voie de chemin de fer\" avec point d'orgue"
+
   texidoc = "
 A caesura is sometimes denoted by a double @qq{railtracks} breath mark
 with a fermata sign positioned above. This snippet shows an optically
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index cd5d194063..d588c05b53 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,21 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La fonction comprise dans l'extrait suivant permet d'ajouter du texte
--- comme @qq{molto} o @qq{poco} -- en dessous d'un soufflet de
-(de)crescendo.  Cet exemple présente aussi comment, à l'aide de code
-Scheme, influencer la manière dont un objet est normalement imprimé.
-
-"
-  doctitlefr = "Texte centré sous un soufflet"
-
-  lsrtags = "text, really-cool, expressive-marks, scheme-language"
-
+  lsrtags = "expressive-marks, text, scheme-language, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -30,6 +19,16 @@ objeto, utilizando código de Scheme.
 "
   doctitlees = "Centrar texto debajo de un regulador"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+La fonction comprise dans l'extrait suivant permet d'ajouter du texte
+-- comme @qq{molto} o @qq{poco} -- en dessous d'un soufflet de
+(de)crescendo.  Cet exemple présente aussi comment, à l'aide de code
+Scheme, influencer la manière dont un objet est normalement imprimé.
+
+"
+  doctitlefr = "Texte centré sous un soufflet"
+
   texidoc = "
 This example provides a function to typeset a hairpin (de)crescendo
 with some additional text below it, such as @qq{molto} or @qq{poco}.
diff --git a/Documentation/snippets/changing--flageolet-mark-size.ly b/Documentation/snippets/changing--flageolet-mark-size.ly
index 2a8a6ba731..ebf9c2f0f9 100644
--- a/Documentation/snippets/changing--flageolet-mark-size.ly
+++ b/Documentation/snippets/changing--flageolet-mark-size.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, symbols-and-glyphs, unfretted-strings, expressive-marks, scheme-language"
+  lsrtags = "expressive-marks, specific-notation, unfretted-strings, symbols-and-glyphs, scheme-language"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 b137d97e15..8cfa461406 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
@@ -7,21 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La commande @code{\\tweak} permet de modifier la propriété
-@code{font-size} d'une note particulière d'un accord.
-
-Il s'agit de placer, à l'intérieur même de l'accord (dans la
-construction @code{<@tie{}>}) et avant la note considérée,
-l'instruction @code{\\tweak} suivie de @code{#'font-size} et de définir
-la taille voulue -- comme @code{#-2} pour une petite tête.
-
-"
-  doctitlefr = "Modification de la taille d'une note particulière d'un accord"
-
-  lsrtags = "specific-notation, editorial-annotations, simultaneous-notes, tweaks-and-overrides, really-simple"
-
+  lsrtags = "really-simple, specific-notation, tweaks-and-overrides, simultaneous-notes, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -36,6 +22,19 @@ seguida por @code{#'font-size} y definimos el tamaño adecuado como
 "
   doctitlees = "Modificar el tamaño de una nota suelta de un acorde"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+La commande @code{\\tweak} permet de modifier la propriété
+@code{font-size} d'une note particulière d'un accord.
+
+Il s'agit de placer, à l'intérieur même de l'accord (dans la
+construction @code{<@tie{}>}) et avant la note considérée,
+l'instruction @code{\\tweak} suivie de @code{#'font-size} et de définir
+la taille voulue -- comme @code{#-2} pour une petite tête.
+
+"
+  doctitlefr = "Modification de la taille d'une note particulière d'un accord"
+
   texidoc = "
 Individual note heads in a chord can be modified with the
 @code{\\tweak} command inside a chord, by altering the @code{font-size}
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 2900045cd1..c8179250cd 100644
--- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
+++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-  lsrtags = "real-music, contexts-and-engravers, midi"
+  lsrtags = "midi, contexts-and-engravers, real-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/changing-properties-for-individual-grobs.ly b/Documentation/snippets/changing-properties-for-individual-grobs.ly
index ca268435da..1a005c4f9c 100644
--- a/Documentation/snippets/changing-properties-for-individual-grobs.ly
+++ b/Documentation/snippets/changing-properties-for-individual-grobs.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, scheme-language, really-cool"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 La commande @code{\\applyOutput} permet de personnaliser n'importe quel
@@ -15,8 +17,6 @@ objet de rendu.  Elle requiert une fonction Scheme à trois arguments.
 "
   doctitlefr = "Modification des propriétés d'objets particuliers"
 
-  lsrtags = "really-cool, tweaks-and-overrides, scheme-language"
-
   texidoc = "
 The @code{\\applyOutput} command allows the tuning of any layout
 object, in any context. It requires a Scheme function with three
diff --git a/Documentation/snippets/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
index 233cef6e71..491132a667 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "really-simple, vocal-music"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Chaque couplet peut disposer de sa propre fonte, y compris son numéro.
@@ -14,8 +16,6 @@ Chaque couplet peut disposer de sa propre fonte, y compris son numéro.
 "
   doctitlefr = "Changement de fontes des couplets"
 
-  lsrtags = "vocal-music, really-simple"
-
   texidoc = "
 Fonts can be changed independently for each stanza, including the font
 used for printing the stanza number.
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 b7b85bebba..913d5f37b5 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 437648c4b9..a26759b477 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
@@ -7,16 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Une liaison d'articulation peut se présenter sous la forme d'un trait
-continu ou discontinu, voire en pointillé.
-
-"
-  doctitlefr = "Modification de l'aspect des liaisons d'articulation"
-
-  lsrtags = "editorial-annotations, really-simple, connecting-notes, expressive-marks"
-
+  lsrtags = "expressive-marks, really-simple, editorial-annotations, connecting-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -26,6 +17,14 @@ continuas a punteadas o intermitentes.
 "
   doctitlees = "Modificar el aspecto continuo de una ligadura de expresión a punteado o intermitente"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Une liaison d'articulation peut se présenter sous la forme d'un trait
+continu ou discontinu, voire en pointillé.
+
+"
+  doctitlefr = "Modification de l'aspect des liaisons d'articulation"
+
   texidoc = "
 The appearance of slurs may be changed from solid to dotted or dashed.
 
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 1a709fc958..50418675b6 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
@@ -7,19 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-LilyPond adpote par défaut la dénomination anglaise pour le nom et
-chiffrage des accords.  L'instruction @code{\\germanChords} permet
-d'afficher @code{H} et @code{B} en lieu et place de @code{B} et
-@code{Bes}.  L'instruction @code{\\semiGermanChords} leur substituera
-@code{H} et @code{Bb}.
-
-"
-  doctitlefr = "Adoption de la dénomination germanique ou semi-germanique des accords"
-
-  lsrtags = "chords, really-simple"
-
+  lsrtags = "really-simple, chords"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -31,6 +19,17 @@ sustituye B y Bes por H y B) o por la semi-alemana
 "
   doctitlees = "Cambiar la nomenclatura de los acordes del cifrado americano por la notación alemana o semi-alemana"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+LilyPond adpote par défaut la dénomination anglaise pour le nom et
+chiffrage des accords.  L'instruction @code{\\germanChords} permet
+d'afficher @code{H} et @code{B} en lieu et place de @code{B} et
+@code{Bes}.  L'instruction @code{\\semiGermanChords} leur substituera
+@code{H} et @code{Bb}.
+
+"
+  doctitlefr = "Adoption de la dénomination germanique ou semi-germanique des accords"
+
   texidoc = "
 The english naming of chords (default) can be changed to german
 (@code{\\germanChords} replaces B and Bes with H and B) or semi-german
diff --git a/Documentation/snippets/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
index 371c0fd9d6..1534b107b7 100644
--- a/Documentation/snippets/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/changing-the-default-text-font-family.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, text"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Les familles de fontes par défaut pour le texte peuvent être changées à
@@ -15,8 +17,6 @@ l'aide de la fonction @code{make-pango-font-tree}.
 "
   doctitlefr = "Changement des fontes textuelles par défaut"
 
-  lsrtags = "text, tweaks-and-overrides"
-
   texidoc = "
 The default font families for text can be overridden with
 @code{make-pango-font-tree}.
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 0043b9914b..a8ebc77299 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
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "pitches"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 @code{staffLineLayoutFunction} permet de changer le positionnement des
@@ -17,8 +19,6 @@ entre chaque ligne et interligne de la portée est ramené au demi ton.
 "
   doctitlefr = "Modification de l'intervalle des lignes de la portée"
 
-  lsrtags = "pitches"
-
   texidoc = "
 @code{staffLineLayoutFunction} is used to change the position of notes.
 This snippet shows setting its value to @code{ly:pitch-semitones} in
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 92ddc6b2cf..08acb0e72f 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, expressive-marks"
+  lsrtags = "expressive-marks, rhythms"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
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 80a6c72adc..f932516241 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
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, staff-notation"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Le nombre de lignes d'un portée se modifie par adaptation de la
@@ -15,8 +17,6 @@ propriété @code{line-count} du @code{StaffSymbol}.
 "
   doctitlefr = "Modification du nombre de lignes de la portée"
 
-  lsrtags = "specific-notation, staff-notation"
-
   texidoc = "
 The number of lines in a staff may changed by overriding the
 @code{StaffSymbol} property @code{line-count}.
diff --git a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
index 5df6e68e49..198a56144a 100644
--- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
+++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
@@ -19,24 +19,7 @@ posiciones para instrumentos de viento madera.
 "
 
   doctitlees = "Modificar el tamaño de los diagramas de viento madera"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-Die Größe und Dicke der Holzbläserdiagramme kann geändert werden.
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-Die Größe und Dicke der Holzbläserdiagramme kann geändert werden.
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
 
-  texidocde="
-Die Größe und Dicke der Holzbläserdiagramme kann geändert werden.
-"
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
 
@@ -46,6 +29,7 @@ Die Größe und Dicke der Holzbläserdiagramme kann geändert werden.
 
   doctitlede = "Größe von Holzbläserdiagrammen ändern"
 
+
 %% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 La taille et l'épaisseur des diagrammes de doigté pour bois est modifiable
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index 21a06e1d06..4f7a4ceea6 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, paper-and-layout, staff-notation"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Bien que le meilleur moyen de définir la taille des portées consiste à
@@ -17,8 +19,6 @@ peut se redimensionner en affectant d'un coefficient ses propriétés
 "
   doctitlefr = "Modification de la taille d'une portée"
 
-  lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
-
   texidoc = "
 Though the simplest way to resize staves is to use
 @code{#(set-global-staff-size xx)}, an individual staff's size can be
diff --git a/Documentation/snippets/changing-the-text-for-sustain-markings.ly b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
index a7520779f9..ac7a9b8c85 100644
--- a/Documentation/snippets/changing-the-text-for-sustain-markings.ly
+++ b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-@code{Staff.pedalSustainStrings} permet de définir le texte affiché pour
-les instructions de pédale.  Les seuls caractères autorisés sont les
-glyphes particuliers de pédale, comme vous pouvez le constater ici.
-
-"
-  doctitlefr = "Modification du texte des indications de pédale"
-
-  lsrtags = "keyboards, tweaks-and-overrides"
-
+  lsrtags = "tweaks-and-overrides, keyboards"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -32,6 +22,15 @@ relación exhaustiva.
 
 
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+@code{Staff.pedalSustainStrings} permet de définir le texte affiché pour
+les instructions de pédale.  Les seuls caractères autorisés sont les
+glyphes particuliers de pédale, comme vous pouvez le constater ici.
+
+"
+  doctitlefr = "Modification du texte des indications de pédale"
+
   texidoc = "
 @code{Staff.pedalSustainStrings} can be used to set the text used for
 pedal down and up.  Note that the only valid strings are those found in
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 322f7b9eb4..21af630ecd 100644
--- a/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
+++ b/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "pitches"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Les clefs peuvent être transposées d'un intervalle différent de l'octave.
@@ -14,8 +16,6 @@ Les clefs peuvent être transposées d'un intervalle différent de l'octave.
 "
   doctitlefr = "Transposition arbitraire d'une clef"
 
-  lsrtags = "pitches"
-
   texidoc = "
 Clefs can be transposed by arbitrary amounts, not just by octaves.
 
diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
index e039e4126e..9ac54a9ced 100644
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -7,34 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Le code ci-dessous permet de réaliser des découpes à l'emporte pièce,
-autrement dit d'extraire des fragments, au sein d'une partition.
-
-Dans la mesure où le rendu inclus dans ce manuel pourrait ne pas être
-des plus évidents, nous vous conseillons de traiter ce fichier
-individuellement, avec l'option @code{-dclip-systems}.
-
-Les fichiers résultants sont de la forme
-@samp{base-from-début-to-fin[-compteur].eps}.
-
-
-Lorsque sont inclus le début ou la fin d'un système, l'extraction
-comportera les objets rattachés au système, comme le nom d'instrument.
-
-Les notes d'ornement qui se trouveraient en fin de fragment ne sont pas
-incluses.
-
-La découpe peut couvrir plusieurs systèmes, auquel cas seront générés
-plusieurs fichiers EPS.
-
-"
-  doctitlefr = "Découpe de systèmes"
-
   lsrtags = "paper-and-layout"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 Este código muestra cómo recortar (extraer) fragmentos a partir de una
@@ -62,6 +36,31 @@ varios archivos EPS.
 "
   doctitlees = "Recorte de sistemas"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Le code ci-dessous permet de réaliser des découpes à l'emporte pièce,
+autrement dit d'extraire des fragments, au sein d'une partition.
+
+Dans la mesure où le rendu inclus dans ce manuel pourrait ne pas être
+des plus évidents, nous vous conseillons de traiter ce fichier
+individuellement, avec l'option @code{-dclip-systems}.
+
+Les fichiers résultants sont de la forme
+@samp{base-from-début-to-fin[-compteur].eps}.
+
+
+Lorsque sont inclus le début ou la fin d'un système, l'extraction
+comportera les objets rattachés au système, comme le nom d'instrument.
+
+Les notes d'ornement qui se trouveraient en fin de fragment ne sont pas
+incluses.
+
+La découpe peut couvrir plusieurs systèmes, auquel cas seront générés
+plusieurs fichiers EPS.
+
+"
+  doctitlefr = "Découpe de systèmes"
+
   texidoc = "
 This code shows how to clip (extract) snippets from a full score.
 
diff --git a/Documentation/snippets/clusters.ly b/Documentation/snippets/clusters.ly
index f4ec718d88..5f161562e1 100644
--- a/Documentation/snippets/clusters.ly
+++ b/Documentation/snippets/clusters.ly
@@ -7,16 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Un cluster indique à l'instrumentiste qu'il doit jouer tout une suite de
-sons.
-
-"
-  doctitlefr = "Clusters"
-
-  lsrtags = "specific-notation, keyboards, simultaneous-notes, really-cool, contemporary-notation, chords"
-
+  lsrtags = "specific-notation, chords, contemporary-notation, keyboards, simultaneous-notes, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -26,6 +17,14 @@ interpretación de un ámbito de notas al mismo tiempo.
 "
   doctitlees = "Clusters («racimos»)"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Un cluster indique à l'instrumentiste qu'il doit jouer tout une suite de
+sons.
+
+"
+  doctitlefr = "Clusters"
+
   texidoc = "
 Clusters are a device to denote that a complete range of notes is to be
 played.
diff --git a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
index 6a7ccf9774..062dcea412 100644
--- a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
+++ b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "pitches, really-cool, editorial-annotations"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Les têtes de note peuvent adopter une couleur différenete selon leur
@@ -16,8 +18,6 @@ entre enharmoniques.
 "
   doctitlefr = "Coloration des notes selon leur hauteur"
 
-  lsrtags = "editorial-annotations, really-cool, pitches"
-
   texidoc = "
 It is possible to color note heads depending on their pitch and/or
 their names: the function used in this example even makes it possible
diff --git a/Documentation/snippets/combining-dynamics-with-markup-texts.ly b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
index 73748ca618..34edc8704a 100644
--- a/Documentation/snippets/combining-dynamics-with-markup-texts.ly
+++ b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Certaines indications de nuance peuvent requérir un complément textuel,
-comme @qq{più forte} ou @qq{piano subito}.  Elles se réalisent aisément
-à l'aide d'un bloc @code{\\markup}.
-
-"
-  doctitlefr = "Combinaison de nuance et de texte"
-
-  lsrtags = "text, really-simple, expressive-marks"
-
+  lsrtags = "expressive-marks, really-simple, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -28,6 +18,15 @@ forte} o @qq{piano subito}). Se pueden producir usando un bloque
 "
   doctitlees = "Combinar indicaciones dinámicas con marcados textuales"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Certaines indications de nuance peuvent requérir un complément textuel,
+comme @qq{più forte} ou @qq{piano subito}.  Elles se réalisent aisément
+à l'aide d'un bloc @code{\\markup}.
+
+"
+  doctitlefr = "Combinaison de nuance et de texte"
+
   texidoc = "
 Some dynamics may involve text indications (such as @qq{più forte} or
 @qq{piano subito}). These can be produced using a @code{\\markup}
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 4e53b5464e..f7d9badedd 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "syntax-and-expressions, text, simultaneous-notes"
+  lsrtags = "text, simultaneous-notes, syntax-and-expressions"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/consistently-left-aligned-bar-numbers.ly b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
new file mode 100644
index 0000000000..ba21601977
--- /dev/null
+++ b/Documentation/snippets/consistently-left-aligned-bar-numbers.ly
@@ -0,0 +1,55 @@
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.14.2"
+
+\header {
+  lsrtags = "rhythms"
+
+  texidoc = "
+When left aligning bar numbers, overlapping problems may occur with
+Staves brackets. The snippet solves this by keeping right aligned the
+first bar number following line breaks.
+
+"
+  doctitle = "Consistently left aligned bar numbers"
+} % begin verbatim
+
+consistentlyLeftAlignedBarNumbers = {
+  \override Score.BarNumber #'break-visibility = #end-of-line-invisible
+  \override Score.BarNumber #'self-alignment-X =
+    #(lambda (grob)
+       (let ((break-dir (ly:item-break-dir grob)))
+         (if (= break-dir RIGHT) RIGHT LEFT)))
+}
+
+\new ChoirStaff <<
+  \new Staff {
+    \relative c' {
+      \set Score.barNumberVisibility = #(every-nth-bar-number-visible 3)
+      \bar ""
+      \consistentlyLeftAlignedBarNumbers
+
+      \set Score.currentBarNumber = #112
+      \repeat unfold 8 { R1 }
+      \break
+      \repeat unfold 9 { R1 }
+      \break
+      \repeat unfold 7 { R1 }
+    }
+  }
+  \new Staff {
+    \relative c' {
+      \repeat unfold 24 { R1 }
+    }
+  }
+>>
+
+\layout {
+  indent = #0
+  ragged-right = ##t
+  ragged-last = ##t
+}
diff --git a/Documentation/snippets/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
index 0c557bd9ca..a630c0c8e6 100644
--- a/Documentation/snippets/contemporary-glissando.ly
+++ b/Documentation/snippets/contemporary-glissando.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, contemporary-notation, expressive-marks"
+  lsrtags = "expressive-marks, specific-notation, contemporary-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/contexts-and-engravers.snippet-list b/Documentation/snippets/contexts-and-engravers.snippet-list
index 552afb50b1..bc25da553f 100644
--- a/Documentation/snippets/contexts-and-engravers.snippet-list
+++ b/Documentation/snippets/contexts-and-engravers.snippet-list
@@ -11,6 +11,7 @@ engravers-one-by-one.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
 nesting-staves.ly
 removing-bar-numbers-from-a-score.ly
+stem-cross-staff-engraver.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 vocal-ensemble-template-with-verse-and-refrain.ly
diff --git a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
index 0b08c6a3ae..b59c53da0a 100644
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -7,25 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-La visibilité des extensions qui se terminent sur la première note après
-un saut de ligne est contrôlé par un appel de @code{after-line-breaking}
-à la fonction @code{ly:spanner::kill-zero-spanned-time}.
-
-Pour des objets tels qu'un glissando ou un soufflet, le comportement
-par défaut est de ne pas être reportés après un saut de ligne.
-L'extension sera donc reprise dès lors que l'appel aura été désactivé.
-
-Il en va inversement pour les extensions qui, par défaut pour les textes
-notamment, sont reportées après un saut de ligne@tie{}; il faudra alors
-activer l'appel pour empêcher leur report.
-
-"
-  doctitlefr = "Contrôle de la visibilité des extensions d'objet après saut de ligne"
-
-  lsrtags = "tweaks-and-overrides, expressive-marks"
-
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -49,6 +31,23 @@ ocultar habilitando la función de callback.
   extensión después de un salto de línea"
 
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+La visibilité des extensions qui se terminent sur la première note après
+un saut de ligne est contrôlé par un appel de @code{after-line-breaking}
+à la fonction @code{ly:spanner::kill-zero-spanned-time}.
+
+Pour des objets tels qu'un glissando ou un soufflet, le comportement
+par défaut est de ne pas être reportés après un saut de ligne.
+L'extension sera donc reprise dès lors que l'appel aura été désactivé.
+
+Il en va inversement pour les extensions qui, par défaut pour les textes
+notamment, sont reportées après un saut de ligne@tie{}; il faudra alors
+activer l'appel pour empêcher leur report.
+
+"
+  doctitlefr = "Contrôle de la visibilité des extensions d'objet après saut de ligne"
+
   texidoc = "
 The visibility of spanners which end on the first note following a line
 break is controlled by the @code{after-line-breaking} callback
diff --git a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
index 653d377b6f..d2697a4431 100644
--- a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
+++ b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, editorial-annotations, keyboards, fretted-strings, chords"
+  lsrtags = "specific-notation, chords, keyboards, fretted-strings, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
index c7e99fe5b3..af66b98b76 100644
--- a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
+++ b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly
index 890a73b06a..b824de1db9 100644
--- a/Documentation/snippets/creating-a-delayed-turn.ly
+++ b/Documentation/snippets/creating-a-delayed-turn.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 texidoces = "
diff --git a/Documentation/snippets/creating-blank-staves.ly b/Documentation/snippets/creating-blank-staves.ly
index a0f49a78fb..353f08a7f0 100644
--- a/Documentation/snippets/creating-blank-staves.ly
+++ b/Documentation/snippets/creating-blank-staves.ly
@@ -7,19 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Rien n'est plus simple, pour obtenir une feuille blanche avec des
-portées, que de générer des mesures vides, de supprimer le
-@code{Bar_number_engraver} du contexte @code{Score}, et les
-@code{Time_signature_engraver}, @code{Clef_engraver} et
-@code{Bar_engraver} du contexte @code{Staff}.
-
-"
-  doctitlefr = "Impression de papier à musique"
-
-  lsrtags = "specific-notation, editorial-annotations, paper-and-layout, contexts-and-engravers, staff-notation"
-
+  lsrtags = "specific-notation, paper-and-layout, contexts-and-engravers, staff-notation, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -32,6 +20,17 @@ los compases @code{Bar_engraver} del contexto de @code{Staff}.
 "
   doctitlees = "Crear pentagramas en blanco"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Rien n'est plus simple, pour obtenir une feuille blanche avec des
+portées, que de générer des mesures vides, de supprimer le
+@code{Bar_number_engraver} du contexte @code{Score}, et les
+@code{Time_signature_engraver}, @code{Clef_engraver} et
+@code{Bar_engraver} du contexte @code{Staff}.
+
+"
+  doctitlefr = "Impression de papier à musique"
+
   texidoc = "
 To create blank staves, generate empty measures then remove the
 @code{Bar_number_engraver} from the @code{Score} context, and the
diff --git a/Documentation/snippets/creating-double-digit-fingerings.ly b/Documentation/snippets/creating-double-digit-fingerings.ly
index 19a30ef4a9..5e4ace4ea0 100644
--- a/Documentation/snippets/creating-double-digit-fingerings.ly
+++ b/Documentation/snippets/creating-double-digit-fingerings.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "expressive-marks, tweaks-and-overrides, staff-notation, scheme-language, editorial-annotations"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Il est impossible, par défaut, de noter un doigté sur deux caractères --
@@ -17,8 +19,6 @@ Voici cependant deux méthodes pour créer des doigtés plus grands que 9.
 "
   doctitlefr = "Création de doigtés sur deux caractères"
 
-  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks, scheme-language"
-
   texidoc = "
 By default you cannot make double-digit fingering notation (i.e.
 numbers larger than 9). This is a hard coded limitation.
diff --git a/Documentation/snippets/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
index 85027ff73c..63446a5907 100644
--- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly
+++ b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
@@ -7,25 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Bien que le moyen le plus simple pour ajouter des parenthèses à une
-indication de nuance consiste à utiliser un bloc @code{\\markup}, cette
-pratique a un inconvénient@tie{}: les objets ainsi créés seront
-considérés comme des annotations textuelles, non comme des nuances.
-
-Il est néanmoins possible de créer des objets particuliers en partant de
-code Scheme -- comme expliqué dans le manuel de notation -- avec la
-fonction @code{make-dynamic-script}.  Les @emph{markups} ainsi créés
-seront alors considérés comme étant des indications de nuance, et de ce
-fait pourront se voir appliquer les effets des commandes
-@code{\\dynamicUp} et @code{\\dynamicDown}.
-
-"
-  doctitlefr = "Indications de nuance vraiment entre parenthèses"
-
-  lsrtags = "workaround, text, expressive-marks"
-
+  lsrtags = "expressive-marks, workaround, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -46,6 +28,23 @@ compatible con instrucciones como @code{\\dynamicUp} o
 "
   doctitlees = "Crear indicaciones dinámicas \"verdaderas\" entre paréntesis"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Bien que le moyen le plus simple pour ajouter des parenthèses à une
+indication de nuance consiste à utiliser un bloc @code{\\markup}, cette
+pratique a un inconvénient@tie{}: les objets ainsi créés seront
+considérés comme des annotations textuelles, non comme des nuances.
+
+Il est néanmoins possible de créer des objets particuliers en partant de
+code Scheme -- comme expliqué dans le manuel de notation -- avec la
+fonction @code{make-dynamic-script}.  Les @emph{markups} ainsi créés
+seront alors considérés comme étant des indications de nuance, et de ce
+fait pourront se voir appliquer les effets des commandes
+@code{\\dynamicUp} et @code{\\dynamicDown}.
+
+"
+  doctitlefr = "Indications de nuance vraiment entre parenthèses"
+
   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
diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
index b93f6d412a..e1c84a0b11 100644
--- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
+++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
@@ -7,22 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Les indications de repère, à la différence des scripts textuels, ne
-peuvent s'empiler en un même endroit de la partition@tie{}: il n'est
-possible de créer qu'un seul objet @code{RehearsalMark} à la fois.  Le
-recours à une mesure invisible et à une barre de mesure permet cependant
-d'ajouter une autre indication de repère, donnant ainsi l'impression
-d'un double repère sur la même colonne.  cette méthode permet aussi
-de positionner un repère en fin de ligne et un autre au début de la
-ligne suivante.
-
-"
-  doctitlefr = "Création de repères simultanés"
-
-  lsrtags = "text, tweaks-and-overrides, expressive-marks"
-
+  lsrtags = "expressive-marks, tweaks-and-overrides, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -39,6 +24,20 @@ siguiente.
 "
   doctitlees = "Creación de marcas de ensayo simultáneas"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Les indications de repère, à la différence des scripts textuels, ne
+peuvent s'empiler en un même endroit de la partition@tie{}: il n'est
+possible de créer qu'un seul objet @code{RehearsalMark} à la fois.  Le
+recours à une mesure invisible et à une barre de mesure permet cependant
+d'ajouter une autre indication de repère, donnant ainsi l'impression
+d'un double repère sur la même colonne.  cette méthode permet aussi
+de positionner un repère en fin de ligne et un autre au début de la
+ligne suivante.
+
+"
+  doctitlefr = "Création de repères simultanés"
+
   texidoc = "
 Unlike text scripts, rehearsal marks cannot be stacked at a particular
 point in a score: only one @code{RehearsalMark} object is created.
diff --git a/Documentation/snippets/creating-slurs-across-voices.ly b/Documentation/snippets/creating-slurs-across-voices.ly
index dfccc06d76..88e5674ba2 100644
--- a/Documentation/snippets/creating-slurs-across-voices.ly
+++ b/Documentation/snippets/creating-slurs-across-voices.ly
@@ -7,22 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Dans certaines situations, il peut être nécessaire de lier des notes
-appartenant à des voix différentes.
-
-La solution consiste à ajouter une note invisible dans l'une des voix, à
-l'aide de la commande @code{\\hideNotes}.
-
-Voici par exemple la mesure 235 de la chaconne de la seconde partita
-pour violon solo, BWV 1004, de Bach.
-
-"
-  doctitlefr = "Création d'une liaison entre plusieurs voix"
-
-  lsrtags = "keyboards, real-music, unfretted-strings, connecting-notes, expressive-marks"
-
+  lsrtags = "expressive-marks, keyboards, real-music, unfretted-strings, connecting-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -38,6 +23,20 @@ para violín solo, BWV 1004, de Bach.
 "
   doctitlees = "Hacer ligaduras entre voces distintas"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Dans certaines situations, il peut être nécessaire de lier des notes
+appartenant à des voix différentes.
+
+La solution consiste à ajouter une note invisible dans l'une des voix, à
+l'aide de la commande @code{\\hideNotes}.
+
+Voici par exemple la mesure 235 de la chaconne de la seconde partita
+pour violon solo, BWV 1004, de Bach.
+
+"
+  doctitlefr = "Création d'une liaison entre plusieurs voix"
+
   texidoc = "
 In some situations, it may be necessary to create slurs between notes
 from different voices.
diff --git a/Documentation/snippets/creating-text-spanners.ly b/Documentation/snippets/creating-text-spanners.ly
index 77f6bdd0d8..2f73b74bba 100644
--- a/Documentation/snippets/creating-text-spanners.ly
+++ b/Documentation/snippets/creating-text-spanners.ly
@@ -7,18 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Les commandes @code{\\startTextSpan} et @code{\\stopTextSpan} permettent
-d'ajouter une ligne de prolongation aux indications textuelles, à
-l'instar des indications de pédale ou d'octaviation.  Jouer sur les
-propriétés de l'objet @code{TextSpanner} permet d'en modifier le rendu.
-
-"
-  doctitlefr = "Création d'extensions de texte"
-
-  lsrtags = "text, tweaks-and-overrides, expressive-marks"
-
+  lsrtags = "expressive-marks, tweaks-and-overrides, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -31,6 +20,16 @@ octavaciones. Sobreescribimos ciertas propiedades del objeto
 "
   doctitlees = "Crear elementos de extensión textuales"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Les commandes @code{\\startTextSpan} et @code{\\stopTextSpan} permettent
+d'ajouter une ligne de prolongation aux indications textuelles, à
+l'instar des indications de pédale ou d'octaviation.  Jouer sur les
+propriétés de l'objet @code{TextSpanner} permet d'en modifier le rendu.
+
+"
+  doctitlefr = "Création d'extensions de texte"
+
   texidoc = "
 The @code{\\startTextSpan} and @code{\\stopTextSpan} commands allow the
 creation of text spanners as easily as pedal indications or
diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
index d830f3930c..3385bf5b73 100644
--- a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, workaround, chords, keyboards"
+
 %% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
   texidocfr = "
 Il est parfois préférable d'utiliser les hampes de la portée supérieure
@@ -20,8 +22,6 @@ qu'il ne tienne pas compte des collisions entre portées.
 "
   doctitlefr = "Accord distribué et problème de hampe - solution"
 
-  lsrtags = "keyboards, workaround, chords, tweaks-and-overrides"
-
   texidoc = "
 Sometimes it is better to use stems from the upper staff for creating
 cross-staff chords, because no problems with automatic beam collision
diff --git a/Documentation/snippets/cross-staff-tremolos.ly b/Documentation/snippets/cross-staff-tremolos.ly
index 6806298b41..0419a00e3a 100644
--- a/Documentation/snippets/cross-staff-tremolos.ly
+++ b/Documentation/snippets/cross-staff-tremolos.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, keyboards, real-music"
+  lsrtags = "keyboards, repeats, real-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
diff --git a/Documentation/snippets/custodes.ly b/Documentation/snippets/custodes.ly
index f8f0dc38d6..88c56f3c89 100644
--- a/Documentation/snippets/custodes.ly
+++ b/Documentation/snippets/custodes.ly
@@ -7,15 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
-  texidocfr = "
-Les guidons peuvent adopter différents styles.
-
-"
-  doctitlefr = "Guidons"
-
-  lsrtags = "specific-notation, ancient-notation, symbols-and-glyphs, tweaks-and-overrides"
-
+  lsrtags = "specific-notation, tweaks-and-overrides, ancient-notation, symbols-and-glyphs"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -24,6 +16,13 @@ Se pueden tipografiar «custos» en diferentes estilos.
 "
   doctitlees = "Custos"
 
+%% Translation of GIT committish: f5cfaf8ef4ac347702f554af0944ef0d8396e73a
+  texidocfr = "
+Les guidons peuvent adopter différents styles.
+
+"
+  doctitlefr = "Guidons"
+
   texidoc = "
 Custodes may be engraved in various styles.
 
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index a13e0e5b4a..4151b3e658 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "fretted-strings, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, fretted-strings"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/customizing-markup-fret-diagrams.ly b/Documentation/snippets/customizing-markup-fret-diagrams.ly
index 0969a27eb9..4641f1b8e7 100644
--- a/Documentation/snippets/customizing-markup-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-markup-fret-diagrams.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "fretted-strings, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, fretted-strings"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 bfefa7b1f1..049e722941 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
@@ -7,18 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-La direction des hampes des notes placées sur la ligne médiane de la
-portée est gérée par la propriété @code{neutral-direction} de l'objet
-@code{Stem}.
-
-"
-  doctitlefr = "Direction par défaut des hampes de la ligne médiane"
-
   lsrtags = "editorial-annotations"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 La dirección predeterminada de las plicas sobre la tercera línea
@@ -37,6 +27,15 @@ Die Richtung von Hälsen auf der mittleren Linie kann mit der @code{Stem}-Eigens
 "
   doctitlede = "Standardrichtung für Hälse auf der Mittellinie"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+La direction des hampes des notes placées sur la ligne médiane de la
+portée est gérée par la propriété @code{neutral-direction} de l'objet
+@code{Stem}.
+
+"
+  doctitlefr = "Direction par défaut des hampes de la ligne médiane"
+
   texidoc = "
 The default direction of stems on the center line of the staff is set
 by the @code{Stem} property @code{neutral-direction}.
diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index d0e33381d6..fffa4acb54 100644
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "specific-notation, midi, real-music"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Partant du problème que l'on ignore quel @code{midiInstrument} serait le
@@ -15,8 +17,6 @@ plus adapté à sa composition, voici un fichier LilyPond de démonstration.
 "
   doctitlefr = "Démonstration de MidiInstrument"
 
-  lsrtags = "specific-notation, real-music, midi"
-
   texidoc = "
 Problem: How to know which @code{midiInstrument} would be best for your
 composition? Solution: A LilyPond demo file.
diff --git a/Documentation/snippets/demonstrating-all-headers.ly b/Documentation/snippets/demonstrating-all-headers.ly
index 35505c56bb..4b8d086971 100644
--- a/Documentation/snippets/demonstrating-all-headers.ly
+++ b/Documentation/snippets/demonstrating-all-headers.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "paper-and-layout, text, titles"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Voici la liste de tous les champs d'entête :
@@ -14,8 +16,6 @@ Voici la liste de tous les champs d'entête :
 "
   doctitlefr = "Champs d'entête"
 
-  lsrtags = "text, paper-and-layout, titles"
-
   texidoc = "
 A demonstration of all headers.
 
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 c8c7ee5fa8..c16ac7325a 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "staff-notation, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index ec8e47a52f..dbd3e41d24 100644
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -4,19 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-Voici comment obtenir l'impression d'un accord au sein duquel une même
-note est jouée deux fois avec des altérations différentes.
-
-"
-  doctitlefr = "Impression d'accords complexes"
-
-  lsrtags = "workaround, simultaneous-notes, chords"
-
+  lsrtags = "workaround, chords, simultaneous-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -27,6 +18,14 @@ dos veces con distintas alteraciones.
 "
   doctitlees = "Impresión de acordes complejos"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+Voici comment obtenir l'impression d'un accord au sein duquel une même
+note est jouée deux fois avec des altérations différentes.
+
+"
+  doctitlefr = "Impression d'accords complexes"
+
   texidoc = "
 Here is a way to display a chord where the same note is played twice
 with different accidentals.
diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index 2bf249061b..2760ef5663 100644
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -7,68 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-Lorsque l'on manipule des rappels d'objet (@emph{grob callbacks}), il
-peut être intéressant d'en maîtriser la @qq{ascendants}.  La plupart des
-objets graphiques ont des parents, lesquels auront une influence sur le
-positionnement de l'objet en question.  Ainsi, les X- et Y-parents
-influenceront respectivement la position horizontale et verticale de
-l'objet.  De plus, chacun des parents peut avoir ses propres parents.
-
-Certains aspects de la lignée d'un objet peuvent toutefois porter à
-confusion :
-
--- Les types de parents d'un @emph{grob} peuvent dépendre du contexte.
-
--- Dans le cas de certains @emph{grobs}, les parents X et Y peuvent être
-   le même.
-
--- Un @qq{ascendant} particulier peut dépendre d'un @emph{grob} de
-   différentes manières.
-
--- Le concept de @qq{génération} est trompeur.
-
-Par exemple, l'objet @code{System} peut, vis à vis d'un objet
-@code{VerticalAlignment},  être à la fois parent (par son
-côté Y) et grand parent (par deux fois du côté X).
-
-La macro ci-dessous affiche à l'écran une représentation textuelle de
-l'ascendance d'un @emph{grob}.
-
-
-Elle se lance ainsi :
-
-@example
-@{
-   \\once \\override NoteHead #'before-line-breaking = #display-ancestry
-   c4
-@}
-@end example
-
-et génère la sortie suivante :
-
-@example
-------------------------------------
-
-NoteHead X,Y: NoteColumn
-    X: PaperColumn
-       X,Y: System
-    Y: VerticalAxisGroup
-       X: NonMusicalPaperColumn
-          X,Y: System
-       Y: VerticalAlignment
-          X: NonMusicalPaperColumn
-             X,Y: System
-          Y: System
-@end example
-
-"
-  doctitlefr = "Affichage de la généalogie d'un objet"
-
   lsrtags = "devel, tweaks-and-overrides, scheme-language"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
   texidoces = "
@@ -139,6 +79,65 @@ NoteHead X,Y: NoteColumn
 
   doctitlees = "Imprimir el árbol genealógico de un grob"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+Lorsque l'on manipule des rappels d'objet (@emph{grob callbacks}), il
+peut être intéressant d'en maîtriser la @qq{ascendants}.  La plupart des
+objets graphiques ont des parents, lesquels auront une influence sur le
+positionnement de l'objet en question.  Ainsi, les X- et Y-parents
+influenceront respectivement la position horizontale et verticale de
+l'objet.  De plus, chacun des parents peut avoir ses propres parents.
+
+Certains aspects de la lignée d'un objet peuvent toutefois porter à
+confusion :
+
+-- Les types de parents d'un @emph{grob} peuvent dépendre du contexte.
+
+-- Dans le cas de certains @emph{grobs}, les parents X et Y peuvent être
+   le même.
+
+-- Un @qq{ascendant} particulier peut dépendre d'un @emph{grob} de
+   différentes manières.
+
+-- Le concept de @qq{génération} est trompeur.
+
+Par exemple, l'objet @code{System} peut, vis à vis d'un objet
+@code{VerticalAlignment},  être à la fois parent (par son
+côté Y) et grand parent (par deux fois du côté X).
+
+La macro ci-dessous affiche à l'écran une représentation textuelle de
+l'ascendance d'un @emph{grob}.
+
+
+Elle se lance ainsi :
+
+@example
+@{
+   \\once \\override NoteHead #'before-line-breaking = #display-ancestry
+   c4
+@}
+@end example
+
+et génère la sortie suivante :
+
+@example
+------------------------------------
+
+NoteHead X,Y: NoteColumn
+    X: PaperColumn
+       X,Y: System
+    Y: VerticalAxisGroup
+       X: NonMusicalPaperColumn
+          X,Y: System
+       Y: VerticalAlignment
+          X: NonMusicalPaperColumn
+             X,Y: System
+          Y: System
+@end example
+
+"
+  doctitlefr = "Affichage de la généalogie d'un objet"
+
   texidoc = "
 When working with grob callbacks, it can be helpful to understand a
 grob's @qq{ancestry}. Most grobs have @qq{parents} which influence the
diff --git a/Documentation/snippets/dotted-harmonics.ly b/Documentation/snippets/dotted-harmonics.ly
index a77a0875c7..5f570f8ca1 100644
--- a/Documentation/snippets/dotted-harmonics.ly
+++ b/Documentation/snippets/dotted-harmonics.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, real-music, unfretted-strings"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Les notes harmoniques artificielles, obtenues grâce à @code{\\harmonic},
@@ -16,8 +18,6 @@ propriété de contexte @code{harmonicDots}.
 "
   doctitlefr = "Harmoniques pointées"
 
-  lsrtags = "real-music, tweaks-and-overrides, unfretted-strings"
-
   texidoc = "
 Artificial harmonics using @code{\\harmonic} do not show dots.  To
 override this behavior, set the context property @code{harmonicDots}.
diff --git a/Documentation/snippets/double-glissando.ly b/Documentation/snippets/double-glissando.ly
index c97a218259..b780060432 100644
--- a/Documentation/snippets/double-glissando.ly
+++ b/Documentation/snippets/double-glissando.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "expressive-marks, workaround, contemporary-notation, simultaneous-notes"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 La connection d'accords par des glissandos s'obtient par l'ajout d'un
@@ -15,8 +17,6 @@ deuxième glissando dans une voix masquée.
 "
   doctitlefr = "Double glissando"
 
-  lsrtags = "workaround, simultaneous-notes, contemporary-notation, expressive-marks"
-
   texidoc = "
 To connect chords with glissando lines, attach a second glissando to a
 hidden voice.
diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index 635fdef441..fd068efd4e 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -4,9 +4,11 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
+  lsrtags = "tweaks-and-overrides, scheme-language, editorial-annotations"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 La fonction @code{print} peut se modifier pour obtenir l'encadrement de
@@ -15,8 +17,6 @@ n'importe quel objet.
 "
   doctitlefr = "Encadrement d'objets"
 
-  lsrtags = "editorial-annotations, tweaks-and-overrides, scheme-language"
-
   texidoc = "
 The @code{print-function} can be overridden to draw a box around an
 arbitrary grob.
diff --git a/Documentation/snippets/drawing-circles-around-note-heads.ly b/Documentation/snippets/drawing-circles-around-note-heads.ly
index 7ef2b4ea9f..cc80903fd4 100644
--- a/Documentation/snippets/drawing-circles-around-note-heads.ly
+++ b/Documentation/snippets/drawing-circles-around-note-heads.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "editorial-annotations"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Voici comment entourer d'un cercle une note :
@@ -14,8 +16,6 @@ Voici comment entourer d'un cercle une note :
 "
   doctitlefr = "Encerclement de notes"
 
-  lsrtags = "editorial-annotations"
-
   texidoc = "
 Here is how to circle a note.
 
diff --git a/Documentation/snippets/drawing-circles-around-various-objects.ly b/Documentation/snippets/drawing-circles-around-various-objects.ly
index 2e314382f6..4bab50ad7d 100644
--- a/Documentation/snippets/drawing-circles-around-various-objects.ly
+++ b/Documentation/snippets/drawing-circles-around-various-objects.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, scheme-language, editorial-annotations"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 La commande de @emph{markup} @code{\\circle} permet de dessiner un
@@ -18,8 +20,6 @@ pour les numéros de mesure.
 "
   doctitlefr = "Encercler divers objets"
 
-  lsrtags = "editorial-annotations, tweaks-and-overrides, scheme-language"
-
   texidoc = "
 The @code{\\circle} markup command draws circles around various
 objects, for example fingering indications.  For other objects,
diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
index a8ebf995f3..7a2dbc6fa4 100644
--- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -20,6 +20,7 @@ comienzo del eobjeto de extensión se asignará a la nota siguiente.
 "
 
   doctitlees = "Objeto personalizado de extensión de texto de matices dinámicos postfijo"
+
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
 
diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly
index 5751858b80..8222ebddf5 100644
--- a/Documentation/snippets/dynamics-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -23,6 +23,7 @@ extensores de texto de forma predeterminada.
 "
 
   doctitlees = "Objetos extensores de texto postfijos para dinámica"
+
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
 
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 478699be68..80af3f7cae 100644
--- a/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
+++ b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
@@ -7,16 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-Du code PostScript peut directement être intégré dans un bloc
-@code{\\markup}.
-
-"
-  doctitlefr = "Intégration de PostScript dans un markup"
-
-  lsrtags = "specific-notation, editorial-annotations, text, really-cool"
-
+  lsrtags = "specific-notation, text, really-cool, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -26,6 +17,14 @@ bloque @code{\\markup}.
 "
   doctitlees = "Empotrar PostScript nativo dentro de un bloque \\markup"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+Du code PostScript peut directement être intégré dans un bloc
+@code{\\markup}.
+
+"
+  doctitlefr = "Intégration de PostScript dans un markup"
+
   texidoc = "
 PostScript code can be directly inserted inside a @code{\\markup}
 block.
diff --git a/Documentation/snippets/engravers-one-by-one.ly b/Documentation/snippets/engravers-one-by-one.ly
index 2e24e06bba..e3512428ba 100644
--- a/Documentation/snippets/engravers-one-by-one.ly
+++ b/Documentation/snippets/engravers-one-by-one.ly
@@ -7,36 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-Pour appréhender la notation, nous l'avons disséquée en éléments
-simples : chaque type de symbole est géré par un module différent.
-Chaque module est appelé @qq{graveur}.  Dans cet exemple, chaque graveur
-est appelé à son tour, dans l'ordre suivant :
-
--- têtes de note,
-
--- symboles de la portée,
-
--- clef,
-
--- hampes,
-
--- ligatures, liaisons, accents,
-
--- altérations, barres de mesure, métrique et armure.
-
-Les graveurs se regroupent.  Par exemple, têtes de note, liaisons,
-ligature etc. forment un contexte de voix (@code{Voice}).  Les graveurs
-chargés de la métrique, des altérations, des barres de mesure etc.
-forment un contexte de portée (@code{Staff}).
-
-"
-  doctitlefr = "Les graveurs un par un"
-
   lsrtags = "specific-notation, contexts-and-engravers"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 Del problema central de la notación, esto es, crear un determinado
@@ -66,6 +38,33 @@ alteraciones, líneas de compás, etc. forman un contexto de pentagrama,
 "
   doctitlees = "Los grabadores uno por uno"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+Pour appréhender la notation, nous l'avons disséquée en éléments
+simples : chaque type de symbole est géré par un module différent.
+Chaque module est appelé @qq{graveur}.  Dans cet exemple, chaque graveur
+est appelé à son tour, dans l'ordre suivant :
+
+-- têtes de note,
+
+-- symboles de la portée,
+
+-- clef,
+
+-- hampes,
+
+-- ligatures, liaisons, accents,
+
+-- altérations, barres de mesure, métrique et armure.
+
+Les graveurs se regroupent.  Par exemple, têtes de note, liaisons,
+ligature etc. forment un contexte de voix (@code{Voice}).  Les graveurs
+chargés de la métrique, des altérations, des barres de mesure etc.
+forment un contexte de portée (@code{Staff}).
+
+"
+  doctitlefr = "Les graveurs un par un"
+
   texidoc = "
 The notation problem, creating a certain symbol, is handled by plugins.
  Each plugin is called an Engraver. In this example, engravers are
diff --git a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
index a374de3e2c..0e38a7ef92 100644
--- a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
+++ b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "rhythms, repeats"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Lorsque la durée totale d'un trémolo est inférieur à la noire, égale une
@@ -21,8 +23,6 @@ la propriété @code{'gap}.
 "
   doctitlefr = "Impression de trémolo avec ligature flottante"
 
-  lsrtags = "repeats, rhythms"
-
   texidoc = "
 If a tremolo's total duration is less than a quarter-note, or exactly a
 half-note, or between a half-note and a whole-note, it is normally
diff --git a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
index 175a41fa12..4717362286 100644
--- a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
+++ b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "syntax-and-expressions, rhythms"
+  lsrtags = "rhythms, syntax-and-expressions"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
  doctitlees = "Escribir varios grupos especiales usando una sola instrucción \\times"
diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
index 3839370667..5ce48ab443 100644
--- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly
+++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
@@ -7,17 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-En mode tablature, un @emph{hammer}, ou lié ascendant, peut se simuler à
-l'aide d'une liaison.
-
-"
-  doctitlefr = "Simulation d'un hammer en tablature"
-
   lsrtags = "specific-notation, workaround, fretted-strings"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
   texidoces = "
@@ -28,6 +19,14 @@ expresión.
 
   doctitlees = "Simular un hammer o ligado ascendente en una tablatura"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+En mode tablature, un @emph{hammer}, ou lié ascendant, peut se simuler à
+l'aide d'une liaison.
+
+"
+  doctitlefr = "Simulation d'un hammer en tablature"
+
   texidoc = "
 A hammer in tablature can be faked with slurs.
 
diff --git a/Documentation/snippets/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
index 5fe1b4641d..9d173cfd61 100644
--- a/Documentation/snippets/fine-tuning-pedal-brackets.ly
+++ b/Documentation/snippets/fine-tuning-pedal-brackets.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, keyboards"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Les crochets d'indication de pédale peuvent se modifier de différentes
@@ -15,8 +17,6 @@ manières.
 "
   doctitlefr = "Affinage des indications de pédale"
 
-  lsrtags = "keyboards, tweaks-and-overrides"
-
   texidoc = "
 The appearance of pedal brackets may be altered in different ways.
 
diff --git a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
index 93605b3bff..54e8da12ce 100644
--- a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
+++ b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "winds, symbols-and-glyphs"
+  lsrtags = "symbols-and-glyphs, winds"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index ac4a1e205f..2c55485526 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -7,41 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-La guitare flamenco fait appel à des éléments de notation particuliers :
-
--- le @emph{golpe} : coup frappé sur la caisse de résonance avec
-   l'ongle de l'annulaire,
-
--- une flèche pour indiquer le sens des butés (@emph{strokes}),
-
--- les doigtés : @qq{p} pouce, @qq{i} index, @qq{m}  majeur, @qq{a}
-   annulaire et @qq{x} auriculaire,
-
--- les @emph{rasgueados} sur trois ou quatre doigts : grattage des
-   cordes en étendant les doigts rapidement les uns après les autres
-   dans un mouvement continu, se terminant sur l'index,
-
--- les @emph{abanicos} : séries de butés du pouce, index et auriculaire.
-   Il existe aussi un @emph{abanico 2} pour lequel l'index et
-   l'annulaire remplacent l'auriculaire.
-
--- @emph{alza púa} : jeu rapide du pouce.
-
-La plupart de ces symboles utilisent une flèche en plus des doigtés.
-Dans le cas d'un @emph{abanico}, les têtes de note ne sont imprimées que
-pour le premier accord.
-
-Le début du code ci-dessous répertorie le paramétrage de ces différents
-symboles, que vous pouvez copier dans un fichier @file{flamenco.ly}
-pour inclusion dans vos propres compositions.
-
-"
-  doctitlefr = "Notation de flamenco"
-
-  lsrtags = "specific-notation, version-specific, fretted-strings, stylesheet"
-
+  lsrtags = "specific-notation, version-specific, stylesheet, fretted-strings"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
@@ -83,6 +49,39 @@ copiar como @file{flamenco.ly} e incluirse en los documentos fuente.
 "
   doctitlees = "Notación del flamenco"
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+La guitare flamenco fait appel à des éléments de notation particuliers :
+
+-- le @emph{golpe} : coup frappé sur la caisse de résonance avec
+   l'ongle de l'annulaire,
+
+-- une flèche pour indiquer le sens des butés (@emph{strokes}),
+
+-- les doigtés : @qq{p} pouce, @qq{i} index, @qq{m}  majeur, @qq{a}
+   annulaire et @qq{x} auriculaire,
+
+-- les @emph{rasgueados} sur trois ou quatre doigts : grattage des
+   cordes en étendant les doigts rapidement les uns après les autres
+   dans un mouvement continu, se terminant sur l'index,
+
+-- les @emph{abanicos} : séries de butés du pouce, index et auriculaire.
+   Il existe aussi un @emph{abanico 2} pour lequel l'index et
+   l'annulaire remplacent l'auriculaire.
+
+-- @emph{alza púa} : jeu rapide du pouce.
+
+La plupart de ces symboles utilisent une flèche en plus des doigtés.
+Dans le cas d'un @emph{abanico}, les têtes de note ne sont imprimées que
+pour le premier accord.
+
+Le début du code ci-dessous répertorie le paramétrage de ces différents
+symboles, que vous pouvez copier dans un fichier @file{flamenco.ly}
+pour inclusion dans vos propres compositions.
+
+"
+  doctitlefr = "Notation de flamenco"
+
   texidoc = "
 For flamenco guitar, special notation is used:
 
diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index 33a4d39be5..eabaebe522 100644
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "contemporary-notation, winds"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 L'indication d'une technique particulière d'articulation, telle le
@@ -16,8 +18,6 @@ glyphe approprié.
 "
   doctitlefr = "Coup de langue à la flûte"
 
-  lsrtags = "winds, contemporary-notation"
-
   texidoc = "
 It is possible to indicate special articulation techniques such as a
 flute @qq{tongue slap} by replacing the note head with the appropriate
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 86bb5d6071..2e3517fb18 100644
--- a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
+++ b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "pitches"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Lorsqu'une clef a déjà été imprimée et qu'aucune autre clef n'a depuis
@@ -17,8 +19,6 @@ la commande @code{\\set Staff.forceClef = ##t}.
 "
   doctitlefr = "Réimpression forcée de la clef"
 
-  lsrtags = "pitches"
-
   texidoc = "
 When a clef sign has already been displayed and it has not been changed
 to a different clef, then repeating the @code{\\clef} command will be
diff --git a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
index 881eb56bc9..3d7b98a063 100644
--- a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
+++ b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, simultaneous-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
index f9958cc075..4a2be161dc 100644
--- a/Documentation/snippets/forcing-hyphens-to-be-shown.ly
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -7,18 +7,8 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
-  texidocfr = "
-LilyPond n'imprimera de tiret entre deux syllabes que s'il juge qu'il y
-a suffisamment d'espace.  Ce comportement peut être modifié grâce à la
-propriété @code{minimum-distance} de @code{LyricHyphen}.
-
-"
-  doctitlefr = "Impression forcée de tirets entre syllabes"
-
   lsrtags = "vocal-music"
 
-
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
 
@@ -31,6 +21,15 @@ con la propiedad @code{minimum-distance} de @code{LyricHyphen}.
 
 
 
+%% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
+  texidocfr = "
+LilyPond n'imprimera de tiret entre deux syllabes que s'il juge qu'il y
+a suffisamment d'espace.  Ce comportement peut être modifié grâce à la
+propriété @code{minimum-distance} de @code{LyricHyphen}.
+
+"
+  doctitlefr = "Impression forcée de tirets entre syllabes"
+
   texidoc = "
 If LilyPond does not think there is space for a hyphen, it will be
 omitted.  The behaviour can be overridden with the
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 126a805848..018514ff44 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
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "workaround, staff-notation"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Par défaut, les indications métronomiques n'influencent en rien
@@ -19,8 +21,6 @@ dérogation comme dans la deuxième partie.
 "
   doctitlefr = "Adaptation de la largeur de mesure selon le MetronomeMark"
 
-  lsrtags = "workaround, staff-notation"
-
   texidoc = "
 By default, metronome marks do not influence horizontal spacing.  This
 has one downside: when using compressed rests, some metronome marks may
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 a35f4d7477..b1a91cac88 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
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "really-simple, automatic-notation, rhythms, preparing-parts"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Voici comment initialiser arbitrairement une indication automatique de
@@ -15,8 +17,6 @@ repère, qu'elle soit alphabétique ou numérique :
 "
   doctitlefr = "Fixation arbitraire du numéro de repère de départ"
 
-  lsrtags = "preparing-parts, automatic-notation, really-simple, rhythms"
-
   texidoc = "
 This snippet demonstrates how to obtain automatic ordered rehearsal
 marks, but from the letter or number desired.
diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
index b155571690..ab1c3f2ecd 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, text"
+  lsrtags = "text, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -16,6 +16,7 @@ individuales dentro de la letra.
 
 "
   doctitlees = "Dar formato a sílabas de la letra"
+
 %%%    Translation of GIT committish: f86f00c1a8de0f034ba48506de2801c074bd5422
   texidocde = "
 Textbeschriftungsmodus kann eingesetzt werden, um individuelle Silben im Gesangstext
@@ -23,6 +24,7 @@ zu formatieren.
 
 "
   doctitlede = "Silben im Gesangstext formatieren"
+
 %%  Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Le mode @emph{markup} permet d'individualiser la mise en forme de
diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index a6b2470f12..da3a65a61e 100644
--- a/Documentation/snippets/fret-diagrams-explained-and-developed.ly
+++ b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
@@ -7,6 +7,8 @@
 \version "2.14.2"
 
 \header {
+  lsrtags = "tweaks-and-overrides, fretted-strings"
+
 %% Translation of GIT committish: 30339cb3706f6399c84607426988b25f79b4998c
   texidocfr = "
 Voici différentes manières d'obtenir et de personnaliser des diagrammes
@@ -15,8 +17,6 @@ de fret :
 "
   doctitlefr = "Construction et développement de diagrammes de fret"
 
-  lsrtags = "fretted-strings, tweaks-and-overrides"
-
   texidoc = "
 This snippet shows many possibilities for obtaining and tweaking fret
 diagrams.
diff --git a/Documentation/snippets/generating-custom-flags.ly b/Documentation/snippets/generating-custom-flags.ly
index ad8d45a3ee..cea693d5cd 100644
--- a/Documentation/snippets/generating-custom-flags.ly
+++ b/Documentation/snippets/generating-custom-flags.ly
@@ -8,6 +8,15 @@
 \version "2.15.15"
 
 \header {
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Une fonction Scheme personnalisée permet de redéfinir la propriété
+@code{stencil} de l'objet @code{Flag}, de sorte à modifier le glyphe
+utilisé pour les crochets de croche.
+
+"
+  doctitlefr = "Génération de crochets personnalisés"
+
   lsrtags = "rhythms, tweaks-and-overrides"
 
   texidoc = "
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index 5a840facc3..2ff76a4ed4 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,10 +4,10 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-  lsrtags = "really-cool, pitches, scheme-language"
+  lsrtags = "pitches, scheme-language, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -21,6 +21,17 @@ sólo tiene que modificar este número.
 "
   doctitlees = "Generación de notas aleatorias"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Le fragment de code Scheme ci-dessous génère aléatoirement 24 notes
+(ou autant que nécessaire), à partir de l'heure courante (ou un nombre
+quelconque donné en argument, afin d'obtenir toujours les mêmes notes
+aléatoires).  Pour obtenir une autre série de notes, il suffit de
+changer ce nombre.
+
+"
+  doctitlefr = "Génération de notes aléatoires"
+
   texidoc = "
 This Scheme-based snippet generates 24 random notes (or as many as
 required), based on the current time (or any randomish number specified
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 a8e3f0cb73..1c216d3ed7 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
@@ -7,7 +7,43 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "really-cool, automatic-notation, scheme-language"
+  lsrtags = "automatic-notation, scheme-language, really-cool"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Une partition LilyPond, de manière interne, n'est rien d'autre qu'une
+expression Scheme générée par l'analyseur syntaxique de lilypond.  Il
+est donc possible, à l'aide de Scheme, de générer automatiquement une
+partition sans fichier source.  Une expression musicale en Scheme sera
+transformée en partition par un appel à
+@code{(scorify-music music parser)}.  Ceci aura pour effet de générer
+un objet @code{score} auquel sera appliqué un bloc @code{layout}
+comportant la fonction
+
+@example
+(let* ((layout (ly:output-def-clone $defaultlayout)))
+   ; modification de la mise en forme, puis assignation :
+   (ly:score-add-output-def! score layout)
+  )
+@end example
+
+Il suffit alors de transmettre ce @code{score} à lilypond pour qu'il le
+grave.  Les trois fonctions -- @code{(add-score parser score)},
+@code{(add-text parser text)} et @code{(add-music parser music)} --
+définies dans le code ci-dessous permettent de transmettre à lilypond,
+aux fins de les graver, une partition complète, un @emph{markup} ou
+simplement de la musique.
+
+Cet exemple permet aussi de graver les pièces contenues dans un bloc
+@code{\\book@{@dots{}@}} ainsi que des partitions de niveau supérieur.
+Chaque partition destinée à être gravée est alors ajoutée à la liste des
+partitions de niveau supérieur ; le @code{toplevel-book-handler} --
+fonction Scheme appelée pour traiter un @emph{book} dès que le bloc
+@code{\\book@{@dots{}@}} est clôturé -- s'adapte pour prendre en charge
+tous les @code{score} jusque là collectés dans l'ouvrage.
+
+"
+  doctitlefr = "Génération en Scheme de partitions complètes (y compris des parties d'ouvrage) sans utiliser l'analyseur"
 
   texidoc = "
 A lilypond score internally is just a Scheme expression, generated by
diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
index 5dd60df76d..4fc0a858d9 100644
--- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
+++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
@@ -18,33 +18,7 @@ pueden presentar por el nombre de la llave así como de forma gráfica.
 "
 
   doctitlees = "Diagramas para viento madera gráficos y textuales"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-In vielen Fällen können die nicht in der mittleren Reihe befindlichen
-Löcher dargestellt werden, indem man die Lochbezeichnung oder
-graphische Zeichen benutzt.
 
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-In vielen Fällen können die nicht in der mittleren Reihe befindlichen
-Löcher dargestellt werden, indem man die Lochbezeichnung oder
-graphische Zeichen benutzt.
-
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-In vielen Fällen können die nicht in der mittleren Reihe befindlichen
-Löcher dargestellt werden, indem man die Lochbezeichnung oder
-graphische Zeichen benutzt.
-
-"
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
 
@@ -57,12 +31,13 @@ graphische Zeichen benutzt.
 
   doctitlede = "Graphische und Text-Holzbläserdiagramme"
 
-%% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 Dans certains cas, vous pouvez opter pour l'affichage textuel d'une clé
 située à côté d'un trou plutôt que sa représentation graphique.
-"
 
+"
   doctitlefr = "Ajout de texte à un diagramme de doigté"
 
 
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 923f7dc4ad..03ffbe9067 100644
--- a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+++ b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
@@ -19,6 +19,16 @@ las líneas sean más cortas, como en este fragmento de código.
 "
   doctitlees = "Líneas de rejilla: destacar ritmos y la relación temporal entre notas"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Des lignes verticales entre les portées peuvent s'ajouter dans le but
+d'indiquer la synchronisation entre des notes.  Dans le cas de musique
+monophonique, on peut toutefois créer une deuxième portée, invisible, et
+raccourcir les lignes comme ici.
+
+"
+  doctitlefr = "Quadrillage temporel : mise en évidence du rythme et synchronisation des notes"
+
   texidoc = "
 Regular vertical lines can be drawn between staves to show note
 synchronization; however, in case of monophonic music, you may want to
diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly
index 082a767cc1..0e508bcb36 100644
--- a/Documentation/snippets/guitar-slides.ly
+++ b/Documentation/snippets/guitar-slides.ly
@@ -21,6 +21,16 @@ nota real, como se muestra en el ejemplo siguiente.
 
   doctitlees = "Ligaduras de guitarra"
 
+%% Translation of GIT committish: 0
+  texidocfr = "
+Contrairement au glissando, un @qq{slide} peut aller d'un point non
+précisé du manche jusqu'à un fret spécifique.  Ceci peut s'indiquer à
+l'aide d'une note d'ornement masquée précédant la note effectivement
+jouée, comme dans l'exemple suivant.
+
+"
+  doctitlefr = "Indication d'un glissé de guitare"
+
   lsrtags = "fretted-strings"
 
   texidoc = "
diff --git a/Documentation/snippets/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly
index fabd734474..db98ae115f 100644
--- a/Documentation/snippets/guitar-strum-rhythms.ly
+++ b/Documentation/snippets/guitar-strum-rhythms.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "fretted-strings, rhythms"
+  lsrtags = "rhythms, fretted-strings"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/hairpins-with-different-line-styles.ly b/Documentation/snippets/hairpins-with-different-line-styles.ly
index 4446613e13..24ddb9c595 100644
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -19,6 +19,15 @@ Los reguladores pueden imprimirse en uno cualquiera de los estilos de
 
 
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Les lignes d'un soufflet peuvent adopter tous les styles permis par la
+@code{line-interface} : discontinu, pointillé, continu, ondulé ou en
+zigzag.
+
+"
+  doctitlefr = "Stylisation des lignes de soufflet"
+
   texidoc = "
 Hairpins can take any style from @code{line-interface} - dashed-line,
 dotted-line, line, trill or zigzag.
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index 46c5b14815..447e02d220 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -4,10 +4,20 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-  lsrtags = "real-music, percussion, contemporary-notation, rhythms"
+  lsrtags = "contemporary-notation, rhythms, real-music, percussion"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Bien que la métrique complexe ne soit pas l'élément primordial de cet
+exemple, elle permet d'indiquer la pulsation de cette pièce qui, par
+ailleurs, constitue le canevas d'une chanson traditionnelle des
+Balkans.
+
+"
+  doctitlefr = "Indication personnalisée d'une polymétrie complexe"
 
   texidoc = "
 Though the polymetric time signature shown was not the most essential
diff --git a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
index 1794c15d60..d55e49707c 100644
--- a/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
+++ b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
@@ -7,7 +7,54 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "correction-wanted, version-specific, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, correction-wanted, version-specific"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Certaines indication de nuance requièrent un complément textuel, comme
+« sempre pp ».  Dans la mesure où les nuances sont habituellement
+centrées sous la note, le @emph{pp} se trouvera repoussé loin après la
+note à laquelle il s'applique.
+
+Différentes approches permettent de correctement aligner horizontalement
+ce « sempre pp » :
+
+-- Un simple @code{\\once \\override DynamicText #'X-offset = #-9.2}
+   avant la note considérée de telle sorte que la nuance soit décalée
+   manuellement à la bonne place.  Inconvénient : il faut le faire
+   manuellement à chaque fois qu'intervient ce @emph{markup}.
+
+-- L'intégration d'un rembourrage (@code{#:hspace 7.1}) à la définition
+   de cette nuance personnalisée afin qu'une fois centrée par lilypond
+   elle soit correctement alignée.  Inconvénient : le rembourrage
+   occupera exactement cet espace et ne permettra à aucun autre
+   @emph{markup} ou nuance d'apparaître à cet endroit.
+
+-- L'application d'un décalage au script de nuance
+   @code{\\once \\override @dots{} #'X-offset = @dots{}}.
+   Inconvénient : là aussi il faut le faire à chaque fois.
+
+-- L'attribution arbitraire d'une dimension à 0 du texte additionnel à
+   l'aide d'un @code{#:with-dimensions '(0 . 0) '(0 . 0)}.
+   Inconvénient : lilypond considère que « sempre » n'occupe pas
+   d'espace, et donc pourra mettre à cet endroit d'autres éléments, ce
+   qui pourrait générer des collisions qui ne seront pas détectées par
+   les routines @emph{ad hoc}.  D'autre part, il semble persister un
+   espacement, ce qui laisse l'impression d'un alignement différent en
+   l'absence de texte additionnel.
+
+-- L'ajout, explicite, du décalage directement dans la fonction Scheme
+   du script de nuance.
+
+-- La définition d'un alignement explicite au sein du script de nuance.
+   Ceci ne sera suivi d'effet, par défaut, qu'en jouant sur
+   @code{X-offset}.  Inconvénient : il faut définir
+   @code{DynamicText #'X-offset}, ce qui s'appliquera à toutes les
+   nuances textuelles.  Par ailleurs, l'alignement sera réalisé sur le
+   bord droit du texte additionnel, non sur le milieu de @emph{pp}.
+
+"
+  doctitlefr = "Alignement de nuances personnalisées comme \"sempre pp\" \"più f\" \"subito p\""
 
   texidoc = "
 Some dynamic expressions involve additional text, like @qq{sempre pp}.
diff --git a/Documentation/snippets/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
index 91c10bd9cc..a00bb0ff3e 100644
--- a/Documentation/snippets/how-to-change-fret-diagram-position.ly
+++ b/Documentation/snippets/how-to-change-fret-diagram-position.ly
@@ -7,7 +7,26 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, fretted-strings, tweaks-and-overrides"
+  lsrtags = "specific-notation, tweaks-and-overrides, fretted-strings"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Différents moyens permettent de repositionner un diagramme de fret pour
+éviter des collisions ou le placer entre deux notes :
+
+-- La modification des valeurs de @code{#'padding} ou de
+   @code{#'extra-offset}comme pour le second diagramme;
+
+-- L'adjonction d'une voix invisible dans laquelle les diagrammes sont
+   attachés à des notes invisibles comme pour le troisième diagramme.
+
+Lorsque le diagramme doit correspondre à une position rythmique dans la
+mesure,  comme au troisième temps de la deuxième mesure, la seconde
+méthode est plus appropriée, puisque le diagramme sera aligné sur le
+temps.
+
+"
+  doctitlefr = "Repositionnement d'un diagramme de fret"
 
   texidoc = "
 If you want to move the position of a fret diagram, for example, to
diff --git a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
index 584d22c556..540cfc0ce5 100644
--- a/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
+++ b/Documentation/snippets/how-to-print-two-rehearsal-marks-above-and-below-the-same-barline-method-1.ly
@@ -7,7 +7,34 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, staff-notation, editorial-annotations"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Cette méthode permet d'imprimer deux marques-repères l'un au dessus de
+l'autre.  Le repère inférieur est décalé sous la portée, puis s'insère
+au-dessus de lui un espace pour positionner le repère supérieur
+au-dessus de la portée.
+
+L'ajustement des valeurs de @code{extra-offset} et @code{baseline-skip}
+permet d'accroître ou réduire globalement l'espace entre le repère et la
+portée.
+
+La capacité de pratiquement tout type de glyphe ou chaîne de caractère à
+faire l'objet d'un repère les rend capable de venir se centrer au-dessus
+ou en dessous d'une barre de mesure.
+
+L'adjonction de la propriété @code{break-visibility}, comme dans le
+troisième cas, permet de placer un double repère en fin de ligne.
+
+Cette première méthode, bien que moins compliquée que la seconde, ne
+permet pas d'ajuster le positionnement d'un repère indépendamment de
+l'autre.  Elle peut aussi générer quelques problèmes quant à
+l'espacement vertical, puisque le recours à @code{extra-offset} ne
+modifie en rien la valeur originelle de la boîte englobant le repère.
+
+"
+  doctitlefr = "Impression d'un double repère sur une même barre (méthode 1)"
 
   texidoc = "
 This method prints two 'rehearsal marks', one on top of the other. It
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 0e7fb3a8cb..f15ec46571 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
@@ -7,7 +7,21 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, staff-notation, editorial-annotations"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Cette méthode permet d'imprimer deux marques-repères -- l'un au-dessus de
+la portée et l'autre en dessous -- à l'aide de deux voix séparées.  Le
+graveur de repères est ensuite déplacé dans chacune des voix, sans quoi
+aucun repère ne sera imprimé.  Enfin, chaque voix se voit attribuer un
+positionnement pour les repères.
+
+Cette méthode, bien que plus complexe que la première, apporte plus de
+flexibilité dans l'ajustement individuel des deux composants du repère.
+
+"
+  doctitlefr = "Impression d'un double repère sur une même barre (méthode 2)"
 
   texidoc = "
 This method prints two 'rehearsal marks' - one above the stave and one
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 20f56b1694..e1bd015466 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
@@ -7,7 +7,15 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, vocal-music, text, symbols-and-glyphs"
+  lsrtags = "specific-notation, text, vocal-music, symbols-and-glyphs"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Des mots monosyllabiques peuvent s'attacher par une liaison à l'aide
+d'un tilde.
+
+"
+  doctitlefr = "Séparation de syllables par une liaison"
 
   texidoc = "
 This can be achieved by separating those syllables by tildes.
diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly
index f9140ccccc..ee8e583f94 100644
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music"
+  lsrtags = "vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -27,6 +27,7 @@ strofe come testo separato sotto la musica.
 
 "
   doctitleit = "Modello per inno"
+
 %%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly
index 23ea359c54..299b1ef0e3 100644
--- a/Documentation/snippets/incipit.ly
+++ b/Documentation/snippets/incipit.ly
@@ -16,6 +16,15 @@ nombre del instrumento y del incipit."
 
  doctitlees = "Incipit"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Les « incipits » peuvent faire partie de l'objet @code{InstrumentName},
+tout en définissant de manière indépendante le nom de l'instrument et
+l'incipit.
+
+"
+  doctitlefr = "Incipit"
+
   lsrtags = "staff-notation, ancient-notation"
   texidoc = "
 Incipits can be added using the instrument name grob, but keeping
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 b68a2f26e6..4771e9d9de 100644
--- a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -36,6 +36,19 @@ muss auf eine Klammer eingestellt werden.
 "
   doctitlede = "Akkorde auf zwei Systemen mit Arpeggioklammern anzeigen"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Un crochet d'arpège peut indiquer que des notes réparties sur deux
+portées différentes doivent être jouées par la même main.  Le contexte
+@code{PianoStaff} doit accepter des arpèges « distribués », et les
+indications d'arpège du contexte @code{PianoStaff} adopter une allure de
+crochet.
+
+(Debussy, Les collines d’Anacapri, mesure 65)
+
+"
+  doctitlefr = "Indication d'un accord à cheval sur deux portées par un crochet d'arpège"
+
   texidoc = "
 An arpeggio bracket can indicate that notes on two different staves are
 to be played with the same hand. In order to do this, the
diff --git a/Documentation/snippets/inserting-a-caesura.ly b/Documentation/snippets/inserting-a-caesura.ly
index bbda941613..dc385147d7 100644
--- a/Documentation/snippets/inserting-a-caesura.ly
+++ b/Documentation/snippets/inserting-a-caesura.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
index b8e14d6274..3ff97b4cd5 100644
--- a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
+++ b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -7,7 +7,15 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "real-music, staff-notation"
+  lsrtags = "staff-notation, real-music"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+La commande @code{\\markup} est polyvalente.  Dans cet exemple, elle
+contient un bloc @code{\\score} plutôt que du texte ou une marque.
+
+"
+  doctitlefr = "Insertion d'un fragment au-dessus de la portée"
 
   texidoc = "
 The @code{\\markup} command is quite versatile.  In this snippet, it
diff --git a/Documentation/snippets/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly
index d67e18d6d8..723947f8e4 100644
--- a/Documentation/snippets/isolated-percent-repeats.ly
+++ b/Documentation/snippets/isolated-percent-repeats.ly
@@ -26,10 +26,10 @@ erreicht, indem man eine Ganztaktpause notiert und ihre Ausgabeform
 "
   doctitlede = "Isolierte Prozentwiederholungen"
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 Des symboles de pourcentage isolés peuvent aussi être obtenus, au
-moyen d'un silence multi-mesures dont on modifie l'aspect@tie{}:
+moyen d'un silence multimesure dont on modifie l'aspect :
 
 "
   doctitlefr = "Répétition en pourcent isolée"
diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
index ffea646b1b..5a1013ca53 100644
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -41,11 +41,11 @@ sich die Noten innerhalb eines @code{\\transpose}-Abschnitts befinden.
 
   doctitlede = "Vorlage für Jazz-Combo"
 
-%% Translation of GIT committish: bdfe3dc8175a2d7e9ea0800b5b04cfb68fe58a7a
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 Bien que compliqué de prime abord, voici un canevas tout à fait indiqué
 pour les ensembles de jazz.  Vous noterez que tous les instruments sont
-notés en ut (@code{\\key c \major}), la tonalité de concert.  Les notes
+notés en ut (@code{\\key c \major}), la tonalité de concert.  Les notes
 seront automatiquement transposée dès lors qu'elles seront inscrites
 dans une section @code{\\transpose}.
 
diff --git a/Documentation/snippets/keep-change-clefs-full-sized.ly b/Documentation/snippets/keep-change-clefs-full-sized.ly
index 4617c2c9cd..2049189492 100644
--- a/Documentation/snippets/keep-change-clefs-full-sized.ly
+++ b/Documentation/snippets/keep-change-clefs-full-sized.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "pitches, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, pitches"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -20,6 +20,15 @@ un tamaño menor que la clave inicial.  Esto se puede ajustar con
 
 
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Le symbole imprimé lors d'un changement de clef est plus petit que la
+clef initiale.  La taille s'ajuste à l'aide de la propriété
+@code{full-size-change}.
+
+"
+  doctitlefr = "Maintien de la taille de clef lors d'un changement"
+
   texidoc = "
 When a clef is changed, the clef sign displayed is smaller than the
 initial clef.  This can be overridden with @code{full-size-change}.
diff --git a/Documentation/snippets/laissez-vibrer-ties.ly b/Documentation/snippets/laissez-vibrer-ties.ly
index d0df760856..f57ab0a89d 100644
--- a/Documentation/snippets/laissez-vibrer-ties.ly
+++ b/Documentation/snippets/laissez-vibrer-ties.ly
@@ -7,7 +7,16 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, keyboards, fretted-strings, contemporary-notation, connecting-notes, expressive-marks"
+  lsrtags = "expressive-marks, specific-notation, contemporary-notation, keyboards, fretted-strings, connecting-notes"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Les indication de « laisser vibrer » ont une taille fixe.  Leur
+formatage est accessible au travers de la propriété
+@code{'tie-configuration}.
+
+"
+  doctitlefr = "Liaison « Laissez vibrer »"
 
   texidoc = "
 Laissez vibrer ties have a fixed size. Their formatting can be tuned
diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
index 4057852e51..963f093a28 100644
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "fretted-strings, staff-notation"
+  lsrtags = "staff-notation, fretted-strings"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -17,6 +17,13 @@ La tablatura se puede formatear utilizando letras en lugar de números.
 
   doctitlees = "Formateado de tablaturas con letras"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Une tablature peut comporter des lettres en lieu et place des chiffres.
+
+"
+  doctitlefr = "Tablature en lettres"
+
   texidoc = "
 Tablature can be formatted using letters instead of numbers.
 
diff --git a/Documentation/snippets/line-arrows.ly b/Documentation/snippets/line-arrows.ly
index a2846ecdb7..4b8de796b6 100644
--- a/Documentation/snippets/line-arrows.ly
+++ b/Documentation/snippets/line-arrows.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -17,6 +17,14 @@ texto y de línea (como el Glissando).
 "
   doctitlees = "Puntas de flecha para las líneas"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Les extensions de texte, tout comme les indications sous forme de ligne
+tel un glissando, peuvent se voir pourvues d'une extrémité en flèche.
+
+"
+  doctitlefr = "Terminaison de ligne en flèche"
+
   texidoc = "
 Arrows can be applied to text-spanners and line-spanners (such as the
 Glissando).
diff --git a/Documentation/snippets/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
index 29338bd477..98314068d0 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, text, really-simple"
+  lsrtags = "really-simple, text, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -45,7 +45,7 @@ les valeurs @code{1} ou @code{RIGHT} un alignement par la droite.
   doctitlefr = "Alignement des syllabes"
 
   texidoc = "
-Horizontal alignment for lyrics cam be set by overriding the
+Horizontal alignment for lyrics can be set by overriding the
 @code{self-alignment-X} property of the @code{LyricText} object.
 @code{#-1} is left, @code{#0} is center and @code{#1} is right;
 however, you can use @code{#LEFT}, @code{#CENTER} and @code{#RIGHT} as
@@ -55,7 +55,6 @@ well.
   doctitle = "Lyrics alignment"
 } % begin verbatim
 
-
 \layout { ragged-right = ##f }
 \relative c'' {
   c1
diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly
index 493ec8f8bb..d341ebbe4a 100644
--- a/Documentation/snippets/makam-example.ly
+++ b/Documentation/snippets/makam-example.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "version-specific, pitches, world-music"
+  lsrtags = "world-music, version-specific, pitches"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly
index 8e91988808..df9fd26051 100644
--- a/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly
+++ b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly
@@ -8,6 +8,24 @@
 \version "2.15.15"
 
 \header {
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Une modification de la propriété @code{transparent} permet d'imprimer un
+objet à « l'encre sympathique » : l'objet n'est pas affiché bien que tous
+ses attributs soient préservés.  L'objet en question occupe donc sa
+place, est pris en compte lors de collisions, et peut se voir attaché
+liaisons ou ligatures.
+
+Cet exemple illustre la manière de connecter deux voix par une liaison
+de prolongation.  Les liaisons de prolongation ne peuvent normalement
+intervenir que dans la même voix.  Dès lors que la liaison est entamée
+dans une autre voix et que la première  hampe ascendante est rendue
+transparente dans cette même voix, la liaison semble passer d'une voix à
+l'autre.
+
+"
+  doctitlefr = "Recours à la propriété 'transparent pour rendre des objets invisibles"
+
   lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
 
   texidoc = "
diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index 5091ca061a..78c2a72274 100644
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, expressive-marks"
+  lsrtags = "expressive-marks, rhythms"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -58,7 +58,7 @@ gesetzt.
   doctitlede = "Legatobögen mit kompliziertem Strichelmuster
   definieren"
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 Grâce à la propriété @code{dash-definition}, une liaison d'articulation
 peut être formée de traits discontinus variables.
@@ -68,13 +68,13 @@ peut être formée de traits discontinus variables.
 déterminent le comportement du trait pour une section de la liaison.
 
 Cette liaison se définit selon le paramètre de Bézier @code{t} qui est
-compris entre 0 (l'extrémité gauche de la liaison) et 1 (l'extrémité
+compris entre 0 (l'extrémité gauche de la liaison) et 1 (l'extrémité
 droite de la liaison).  Chaque @code{segment-discontinu} se composera
 selon la liste @code{(t-début t-fin segment-style segment-taille)}.
 La portion de liaison allant de @code{t-début} à @code{t-fin} aura un
 trait @code{segment-style} de longueur @code{segment-taille}.
-@code{segment-taille} est exprimé en espace de portée@tie{}; un
-@code{segment-style} à 1 donnera un trait plein.
+@code{segment-taille} est exprimé en espace de portée ; un
+@code{segment-style} à 1 donnera un trait plein.
 
 "
   doctitlefr = "Dessin d'une liaison d'articulation au trait discontinu"
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 94134ec6c3..e17face260 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, workaround, really-cool, staff-notation"
+  lsrtags = "workaround, staff-notation, really-cool, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -32,12 +32,12 @@ herangezogen.
 "
   doctitlede = "Eine Linie des Notensystems dicker als die anderen machen"
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 Vous pourriez avoir envie, dans un but pédagogique, de rendre certaines
 lignes d'une portée plus épaisses que les autres, comme la ligne médiane,
-ou bien pour mettre en exergue la ligne portant la clé de sol.  Il
-suffit pour cela d'ajouter une ligne qui sera accolée à celle qui doît
+ou bien pour mettre en exergue la ligne portant la clef de sol.  Il
+suffit pour cela d'ajouter une ligne qui sera accolée à celle qui doit
 être mise en évidence, grâce à la propriété @code{line-positions} de
 l'objet @code{StaffSymbol}.
 
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 0ff599aa90..220335d931 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
@@ -9,6 +9,18 @@
 \header {
   lsrtags = "chords"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+La basse chiffrée utilise fréquemment des lignes pour indiquer la
+prolongation jusqu'à un certain point.  LilyPond est alors dispendieux
+en ce sens qu'il place le plus de prolongateurs possible.
+L'interruption d'un prolongateur particulier s'obtient en affectant
+d'un @code{\\!} le chiffre qui doit être réimprimé ; ceci interrompra de
+fait la ligne de prolongation juste avant ce chiffre.
+
+"
+  doctitlefr = "Interruption manuelle des prolongations de certains chiffrages"
+
   texidoc = "
 Figured bass often uses extenders to indicate continuation of the
 corresponding step. However, in this case lilypond is in greedy-mode
diff --git a/Documentation/snippets/manually-controlling-beam-positions.ly b/Documentation/snippets/manually-controlling-beam-positions.ly
index dd27995e11..48c8e626dc 100644
--- a/Documentation/snippets/manually-controlling-beam-positions.ly
+++ b/Documentation/snippets/manually-controlling-beam-positions.ly
@@ -7,7 +7,16 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, connecting-notes, rhythms"
+  lsrtags = "tweaks-and-overrides, rhythms, connecting-notes"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Le positionnement et la pente des ligatures peuvent être contrôlés
+manuellement à l'aide d'une adaptation de la propriété
+@code{positions} de l'objet @code{Beam}.
+
+"
+  doctitlefr = "Contrôle manuel du positionnement des ligatures"
 
   texidoc = "
 Beam positions may be controlled manually, by overriding the
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 6e6c6e9134..b44968531f 100644
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -4,10 +4,19 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
-  lsrtags = "vocal-music, editorial-annotations, workaround, contemporary-notation"
+  lsrtags = "workaround, contemporary-notation, vocal-music, editorial-annotations"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Voici comment ajouter une croix aux hampes.  Le début du fragment parlé
+est stipulé par une commande @code{\\speakOn}, et la fin par une
+commande @code{\\speakOff}.
+
+"
+  doctitlefr = "Adjonction d'une croix sur la hampe des notes d'un fragment parlé"
 
   texidoc = "
 This example shows how to put crosses on stems.  Mark the beginning of
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index ad09798f3d..fa25d788b8 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -4,11 +4,19 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "text"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Un bloc de texte conséquent peut se répartir sur plusieurs pages à
+l'aide de la commande @code{\\markuplist}.
+
+"
+  doctitlefr = "Répartition de lignes de texte (markup)"
+
   texidoc = "
 Text that can spread over pages is entered with the
 @code{\\markuplist} command.
diff --git a/Documentation/snippets/measure-counter.ly b/Documentation/snippets/measure-counter.ly
index ff5fe2b5a5..b7eefc7faa 100644
--- a/Documentation/snippets/measure-counter.ly
+++ b/Documentation/snippets/measure-counter.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, editorial-annotations, workaround, staff-notation"
+  lsrtags = "workaround, staff-notation, repeats, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -18,6 +18,14 @@ transparentes de tipo porcentaje.
 "
   doctitlees = "Contador de compases"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Le code ci-dessous permet, de façon détournée, d'afficher un compteur de
+mesures à l'aide d'une répétition en pourcent rendue transparente.
+
+"
+  doctitlefr = "Compteur de mesures"
+
   texidoc = "
 This snippet provides a workaround for emitting measure counters using
 transparent percent repeats.
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 e4b9a8fa55..2b4b5e21b2 100644
--- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, contexts-and-engravers, staff-notation, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, contexts-and-engravers, staff-notation, ancient-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -36,7 +36,7 @@ Systemen werden mit der @code{transparent}-Eigenschaft ausgelöscht.
   texidocfr = "
 En musique mensurale, les barres de mesure ne traversent pas les
 portées.  Pour obtenir ce résultat avec un @code{StaffGroup} plutôt
-qu'en utilisant un @code{ChoirStaff}, il faudra rendre 
+qu'en utilisant un @code{ChoirStaff}, il faudra rendre
 @qq{transparentes} les portions de barre qui recouvrent les portées.
 
 "
diff --git a/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly b/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
index 1d05f61572..b15c40dd1f 100644
--- a/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
+++ b/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
@@ -7,7 +7,16 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "version-specific, really-simple, rhythms"
+  lsrtags = "really-simple, version-specific, rhythms"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Dans le cadre d'un portée polyphonique, les silences multimesures sont
+positionnés différemment selon la voix à laquelle ils appartiennent.
+Le réglage suivant permet néanmoins de les imprimer sur une même ligne.
+
+"
+  doctitlefr = "Fusion de silences multimesures dans une partie polyphonique"
 
   texidoc = "
 When using multi-measure rests in a polyphonic staff, the rests will be
diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly
index db3ebb1e73..5a64d3e089 100644
--- a/Documentation/snippets/modifying-tuplet-bracket-length.ly
+++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly
@@ -9,6 +9,20 @@
 \header {
   lsrtags = "really-simple, rhythms"
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Les crochets indiquant un nolet peuvent être prolongés jusqu'à un
+élément de rupture ou jusqu'à la note suivante.  LilyPond termine un
+crochet de nolet sur la droite de sa dernière tête de note par défaut ;
+un crochet de pleine longueur s'étendra plus avant, soit jusqu'à le note
+suivante et en traversant tous les éléments non rythmiques, soit sur
+tout l'espace précédant le prochain élément de notation, que ce soit une
+clef, une métrique, une armure ou une autre note.  L'exemple suivant
+illustre la manière d'activer ces deux fonctionnalités.
+
+"
+  doctitlefr = "Modification de la longueur d'un crochet de nolet"
+
   texidoc = "
 Tuplet brackets can be made to run to prefatory matter or the next
 note. Default tuplet brackets end at the right edge of the final note
diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
index d90bd44a14..2a396939a4 100644
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, tweaks-and-overrides, rhythms"
+  lsrtags = "tweaks-and-overrides, rhythms, simultaneous-notes"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -21,6 +21,17 @@ propiedad @code{prefer-dotted-right} de @code{NoteCollision}.
 
 
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Une note pointée appartenant à la voix supérieure d'une portée
+polyphonie sera par défaut décalée vers la droite afin d'éviter les
+collisions avec les autres voix.  Ce comportement peut être outrepassé à
+l'aide de la propriété @code{prefer-dotted-right} de
+@code{NoteCollision}.
+
+"
+  doctitlefr = "Déplacement des notes pointées dans une polyphonie"
+
   texidoc = "
 When a dotted note in the upper voice is moved to avoid a collision
 with a note in another voice, the default is to move the upper note to
diff --git a/Documentation/snippets/moving-slur-positions-vertically.ly b/Documentation/snippets/moving-slur-positions-vertically.ly
index 7b2e54e3c0..b56860ec37 100644
--- a/Documentation/snippets/moving-slur-positions-vertically.ly
+++ b/Documentation/snippets/moving-slur-positions-vertically.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -28,6 +28,20 @@ más hacia abajo.
 
 
 
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+Le positionnement vertical d'une liaison se contrôle par la propriété
+@code{positions} de l'objet @code{Slur}.  Cette propriété dispose de
+deux paramètres : le premier affecte l'extrémité gauche de liaison, le
+second son extrémité droite.  La valeur des paramètres n'aura aucune
+influence sur le galbe de la liaison.  LilyPond ne s'en servira que pour
+adapter le positionnement de la courbe.  Des valeurs positives décalent
+la liaison vers le haut et s'utilisent pour des hampes descendantes.
+Des valeurs négatives entraînent un décalage vers le bas.
+
+"
+  doctitlefr = "Déplacement vertical des liaisons d'articulation"
+
   texidoc = "
 The vertical position of a slur can be adjusted using the
 @code{positions} property of @code{Slur}.  The property has 2
diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
index e9f61dc55a..6eb8700a33 100644
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "text, rhythms"
+  lsrtags = "rhythms, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 texidoces = "
@@ -47,13 +47,13 @@ ist."
 
 
 
-%% Translation of GIT committish: 4da4307e396243a5a3bc33a0c2753acac92cb685
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
-Lorsque du texte est attaché à un silence multi-mesures, il sera centré
+Lorsque du texte est attaché à un silence multimesure, il sera centré
 dans la mesure, au-dessus ou en dessous de la portée.  Afin d'étirer la
 mesure dans le cas ou ce texte est relativement long, il suffit
 d'insérer un silence invisible auquel on attache le texte en question,
-avant le silence multi-mesures.
+avant le silence multimesure.
 
 Rappelez-vous qu'un silence invisible génère une barre de mesure.  Le
 texte attaché à ce silence invisible sera alors aligné sur la gauche de
@@ -61,7 +61,7 @@ là où serait positionnée la note.  Cependant, si la taille de la mesure
 est déterminée par la longueur du texte, il apparaîtra comme centré.
 
 "
-  doctitlefr = "Ajout de texte à un silence multi-mesures"
+  doctitlefr = "Ajout de texte à un silence multimesure"
 
   texidoc = "
 Markups attached to a multi-measure rest will be centered above or
diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
index 0349d9aa59..bd5ae08b83 100644
--- a/Documentation/snippets/nesting-staves.ly
+++ b/Documentation/snippets/nesting-staves.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "preparing-parts, contexts-and-engravers, staff-notation, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, contexts-and-engravers, staff-notation, preparing-parts"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly
index e014b4a09b..ad054f0a45 100644
--- a/Documentation/snippets/non-traditional-key-signatures.ly
+++ b/Documentation/snippets/non-traditional-key-signatures.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "version-specific, really-cool, pitches, contemporary-notation, staff-notation"
+  lsrtags = "version-specific, pitches, contemporary-notation, staff-notation, really-cool"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Armaduras de tonalidad no tradicionales"
@@ -86,30 +86,27 @@ für alle Oktaven gelten.
 Hier ein Beispiel einer möglichen Tonart für eine Ganztonleiter:
 "
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 La commande @code{\\key} détermine la propriété @code{keySignature} d'un
 contexte @code{Staff}.
 
 Des armures inhabituelles peuvent être spécifiées en modifiant
-directement cette propriété. Il s'agit en l'occurence de définir une
-liste@tie{}:
+directement cette propriété. Il s'agit en l'occurrence de définir une
+liste :
 
-@code{\\set Staff.keySignature = #`(((octave . pas) . altération) ((octave
-. pas) . altération) @dots{})}
+@code{\\set Staff.keySignature = #`(((octave . pas) . altération) ((octave . pas) . altération) @dots{})}
 
 dans laquelle, et pour chaque élément,
-@code{octave} spécifie l'octave (0@tie{}pour celle allant du
-do@tie{}médium au si supérieur), @code{pas} la note dans cette octave
-(0@tie{}pour@tie{}do et 6@tie{}pour@tie{}si), et @code{altération} sera
-@code{,SHARP ,FLAT ,DOUBLE-SHARP} etc.  (attention à la virgule en
-préfixe).
+@code{octave} spécifie l'octave (0 pour celle allant du do médium au si
+supérieur), @code{pas} la note dans cette octave (0 pour do et 6 pour
+si), et @code{altération} sera @code{,SHARP ,FLAT ,DOUBLE-SHARP} etc.
+(attention à la virgule en préfixe).
 
 Une formulation abrégée -- @code{(pas . altération)} -- signifie que
 l'altération de l'élément en question sera valide quel que soit l'octave.
 
-
-Voici, par exemple, comment générer une gamme par ton :
+Voici, par exemple, comment générer une gamme par ton :
 
 "
   doctitlefr = "Armures inhabituelles"
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 eadf2ea12a..5e7b0b6a3e 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
@@ -7,18 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: 06f227dd80f3a30cbf33c879b7c125079dfaf5c3
-
-  texidocde = "
-Die Maschine für die vertikale Platzverteilung hat sich in Version 2.14 verändert.
-Dadurch wurde Gesangstext auf andere Art verteilt.  Es ist möglich, Eigenschaften
-von @code{Lyric}- und @code{Staff}-Kontexten einzustellen, um die Platzverteilung
-so aussehen zu lassen wie für Version 2.12.
-
-"
-  doctitlede = "Platzverteilung von Gesangstext wie in 2.12 für neuere Versionen"
-
-
+  lsrtags = "vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -33,6 +22,18 @@ hacía en la versión 2.12.
   doctitlees = "Conseguir el espaciado de la letra de la versión 2.12
   en versiones más recientes"
 
+%% Translation of GIT committish: 06f227dd80f3a30cbf33c879b7c125079dfaf5c3
+
+  texidocde = "
+Die Maschine für die vertikale Platzverteilung hat sich in Version 2.14 verändert.
+Dadurch wurde Gesangstext auf andere Art verteilt.  Es ist möglich, Eigenschaften
+von @code{Lyric}- und @code{Staff}-Kontexten einzustellen, um die Platzverteilung
+so aussehen zu lassen wie für Version 2.12.
+
+"
+  doctitlede = "Platzverteilung von Gesangstext wie in 2.12 für neuere Versionen"
+
+
 %% Translation of GIT committish: 0f93dd92ffa0319328e58148458d22c5448b3d58
   texidocfr = "
 La version 2.14 a donné naissance à un nouveau moteur pour l'espacement
@@ -45,8 +46,6 @@ que vous aurez réglé certaines propriétés des contextes @code{Lyric} et
   doctitlefr = "Espacement des paroles selon les pratiques de la version 2.12"
 
 
-  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
diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index 76b0df371a..2c75e2f8d9 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, pitches, staff-notation"
+  lsrtags = "pitches, staff-notation, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/ottava-text.ly b/Documentation/snippets/ottava-text.ly
index 422a42f494..3215faa2a4 100644
--- a/Documentation/snippets/ottava-text.ly
+++ b/Documentation/snippets/ottava-text.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "text, pitches"
+  lsrtags = "pitches, text"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -45,13 +45,13 @@ und @code{middleCPosition}.  Um den Text der Oktavierungsklammer zu
 
 doctitlede = "Ottava-Text"
 
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
   texidocfr = "
 En interne, la fonction @code{\\ottava} détermine les
-propriétés @code{ottavation} (p.ex. en @code{\"8va\"} ou @code{\"8vb\"})
+propriétés @code{ottavation} (par ex. en @code{\"8va\"} ou @code{\"8vb\"})
 et @code{centralCPosition}.  Vous pouvez modifier le texte d'une marque
 d'octaviation en définissant @code{ottavation} après avoir fait appel
-à @code{ottava}@tie{}:
+à @code{ottava} :
 
 "
   doctitlefr = "Texte des marques d'octaviation"
diff --git a/Documentation/snippets/outputting-the-version-number.ly b/Documentation/snippets/outputting-the-version-number.ly
index 714bc1a438..05c1e88a76 100644
--- a/Documentation/snippets/outputting-the-version-number.ly
+++ b/Documentation/snippets/outputting-the-version-number.ly
@@ -7,7 +7,18 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "text, really-simple, titles, scheme-language"
+  lsrtags = "really-simple, text, titles, scheme-language"
+
+%% Translation of GIT committish: 57f9346bb030f49336a858fcbf1519366fe56454
+  texidocfr = "
+L'insertion du résultat de @code{lilypond-version} dans des paroles
+permet d'ajouter à la partition ou au document généré par
+@code{lilypond-book} le numéro de la version de LilyPond utilisée.  Une
+autre possibilité consiste à l'ajouter à une chaîne textuelle comme
+ci-dessous.
+
+"
+  doctitlefr = "Impression du numéro de version"
 
   texidoc = "
 By putting the output of
diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly
index 5b0c5fddf9..e4e00e13ee 100644
--- a/Documentation/snippets/partcombine-and-autobeamoff.ly
+++ b/Documentation/snippets/partcombine-and-autobeamoff.ly
@@ -47,6 +47,7 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}.
 
 "
   doctitlees = "Partcombine y autoBeamOff"
+
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
@@ -78,6 +79,7 @@ wenn man es mit @code{\\partcombine} verwendet, muss @code{\\autoBeamOff}
 "
 doctitlede = "Partcombine und autoBeamOff"
 
+
 %% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 La fonction @code{\\autoBeamOff} dans le cadre d'un
diff --git a/Documentation/snippets/percent-repeat-count-visibility.ly b/Documentation/snippets/percent-repeat-count-visibility.ly
index fbf98c0c8a..a320fb136c 100644
--- a/Documentation/snippets/percent-repeat-count-visibility.ly
+++ b/Documentation/snippets/percent-repeat-count-visibility.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, repeats"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
index 74577573cc..52210e9b01 100644
--- a/Documentation/snippets/piano-template-simple.ly
+++ b/Documentation/snippets/piano-template-simple.ly
@@ -7,17 +7,7 @@
 \version "2.14.2"
 
 \header {
-%% Translation of GIT committish: d76b338302374164acc9b62a0d628d4d230bfa95
-  texidocja = "
-いくつかの音符を持つシンプルなピアノ譜を示します。
-
-"
-  doctitleja = "ピアノ テンプレート (シンプル)"
-
-  lsrtags = "template, keyboards, really-simple"
-
-
-
+  lsrtags = "really-simple, keyboards, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -28,6 +18,13 @@ notas.
   doctitlees = "Plantilla de piano (sencilla)"
 
 
+%% Translation of GIT committish: d76b338302374164acc9b62a0d628d4d230bfa95
+  texidocja = "
+いくつかの音符を持つシンプルなピアノ譜を示します。
+
+"
+  doctitleja = "ピアノ テンプレート (シンプル)"
+
 %% Translation of GIT committish: 6ae36b6f8a7cf2df5f4e46c3c06820fccd9f35e1
   texidocit = "
 Ecco un comune doppio pentagramma per pianoforte con un po' di note.
diff --git a/Documentation/snippets/piano-template-with-centered-lyrics.ly b/Documentation/snippets/piano-template-with-centered-lyrics.ly
index 1c12bbebb8..9742224bf1 100644
--- a/Documentation/snippets/piano-template-with-centered-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-centered-lyrics.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, keyboards, text, really-simple"
+  lsrtags = "really-simple, keyboards, text, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 64cc1aeb53..34e6a433c9 100644
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, keyboards, really-simple"
+  lsrtags = "really-simple, keyboards, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/positioning-arpeggios.ly b/Documentation/snippets/positioning-arpeggios.ly
index ebeaca3824..8f271fb706 100644
--- a/Documentation/snippets/positioning-arpeggios.ly
+++ b/Documentation/snippets/positioning-arpeggios.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 4906994cce..c3898c3a61 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, workaround, breaks, symbols-and-glyphs"
+  lsrtags = "breaks, workaround, repeats, symbols-and-glyphs"
 
   texidoc = "
 If you want to place an exiting segno sign and add text like @qq{D.S.
diff --git a/Documentation/snippets/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
index 6eddf1f0c5..ee1b9ff4ec 100644
--- a/Documentation/snippets/positioning-text-markups-inside-slurs.ly
+++ b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 9f3756610d..1fc3948bd6 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "pitches, automatic-notation"
+  lsrtags = "automatic-notation, pitches"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 doctitlees = "Evitar que se añadan becuadros adicionales automáticamente"
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 127fc7b10a..66ea84f716 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "pitches, automatic-notation"
+  lsrtags = "automatic-notation, pitches"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 doctitlees = "Evitar que se impriman becuadros cuando cambia la armadura"
diff --git a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
index bbc21c127f..78f261b336 100644
--- a/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
+++ b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, repeats"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 151ed41dd8..3b68c918fd 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, rhythms, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, rhythms"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index 944f69ad0c..e60d614f8a 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "really-cool, real-music, percussion, contemporary-notation, rhythms"
+  lsrtags = "contemporary-notation, rhythms, real-music, percussion, really-cool"
 
   texidoc = "
 In the following snippet, two parts have a completely different time
diff --git a/Documentation/snippets/printing-text-from-right-to-left.ly b/Documentation/snippets/printing-text-from-right-to-left.ly
index 1ebaff222a..bcc477aae9 100644
--- a/Documentation/snippets/printing-text-from-right-to-left.ly
+++ b/Documentation/snippets/printing-text-from-right-to-left.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, workaround, text, world-music"
+  lsrtags = "world-music, workaround, text, editorial-annotations"
 
   texidoc = "
 It is possible to print text from right to left in a markup object, as
diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
index d3a5011cbc..1c690654a9 100644
--- a/Documentation/snippets/proportional-strict-notespacing.ly
+++ b/Documentation/snippets/proportional-strict-notespacing.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, spacing"
+  lsrtags = "spacing, tweaks-and-overrides"
 
   texidoc = "
 If @code{strict-note-spacing} is set spacing of notes is not influenced
diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
index 3b95a02218..20c7f1b8cb 100644
--- a/Documentation/snippets/putting-lyrics-inside-the-staff.ly
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, text, staff-notation"
+  lsrtags = "staff-notation, text, vocal-music"
 
   texidoc = "
 Lyrics can be moved vertically to place them inside the staff.  The
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index 3900f2fc1f..24a54487ab 100644
--- a/Documentation/snippets/recorder-fingering-chart.ly
+++ b/Documentation/snippets/recorder-fingering-chart.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index c6ad7205a8..a4e3c7323e 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "breaks, staff-notation, tweaks-and-overrides"
+  lsrtags = "breaks, tweaks-and-overrides, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index 569e2f270d..d3f4944f99 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, symbols-and-glyphs, tweaks-and-overrides, rhythms"
+  lsrtags = "tweaks-and-overrides, rhythms, ancient-notation, symbols-and-glyphs"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Estilos de silencios"
diff --git a/Documentation/snippets/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list
index e68f29d662..6f964e1c63 100644
--- a/Documentation/snippets/rhythms.snippet-list
+++ b/Documentation/snippets/rhythms.snippet-list
@@ -18,6 +18,7 @@ changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
 chant-or-psalms-notation.ly
 compound-time-signatures.ly
 conducting-signs,-measure-grouping-signs.ly
+consistently-left-aligned-bar-numbers.ly
 controlling-tuplet-bracket-visibility.ly
 creating-metronome-marks-in-markup-mode.ly
 engraving-ties-manually.ly
diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly
index 8f73d45c44..64cc703c33 100644
--- a/Documentation/snippets/satb-choir-template---four-staves.ly
+++ b/Documentation/snippets/satb-choir-template---four-staves.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music"
+  lsrtags = "vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly
index 7f40d17551..a88804bd47 100644
--- a/Documentation/snippets/screech-and-boink.ly
+++ b/Documentation/snippets/screech-and-boink.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \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 148699d7c5..28cfb30453 100644
--- a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
+++ b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "pitches, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, pitches"
 
   texidoc = "
 By default, the accidentals used for key cancellations are placed
diff --git a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
index f4405f8c81..9647c36a27 100644
--- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
+++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/setting-system-separators.ly b/Documentation/snippets/setting-system-separators.ly
index 95070734df..b1b970ef6e 100644
--- a/Documentation/snippets/setting-system-separators.ly
+++ b/Documentation/snippets/setting-system-separators.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "paper-and-layout, staff-notation, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, paper-and-layout, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 8602449476..145e592db8 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "version-specific, tweaks-and-overrides, expressive-marks"
+  lsrtags = "expressive-marks, tweaks-and-overrides, version-specific"
 
   texidoc = "
 By default, LilyPond does not allow the same articulation (e.g., an
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 0ce744ed90..3e1e10bd06 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, chords, really-simple"
+  lsrtags = "really-simple, chords, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 d5cf0acfb1..74f26d45ff 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, chords"
+  lsrtags = "chords, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 efa7940c0a..4d7c4a1e3c 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, chords, really-simple"
+  lsrtags = "really-simple, chords, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 38b88b2f81..ae0b2ed1e5 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, really-simple"
+  lsrtags = "really-simple, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/single-staff-template-with-only-notes.ly b/Documentation/snippets/single-staff-template-with-only-notes.ly
index df4bc59dc4..e13037a282 100644
--- a/Documentation/snippets/single-staff-template-with-only-notes.ly
+++ b/Documentation/snippets/single-staff-template-with-only-notes.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, really-simple"
+  lsrtags = "really-simple, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/skips-in-lyric-mode-2.ly b/Documentation/snippets/skips-in-lyric-mode-2.ly
index 0899a14693..ec691eb770 100644
--- a/Documentation/snippets/skips-in-lyric-mode-2.ly
+++ b/Documentation/snippets/skips-in-lyric-mode-2.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, really-simple, rhythms"
+  lsrtags = "really-simple, rhythms, vocal-music"
 
   texidoc = "
 Although @code{s} skips cannot be used in @code{\\lyricmode} (it is
diff --git a/Documentation/snippets/skips-in-lyric-mode.ly b/Documentation/snippets/skips-in-lyric-mode.ly
index 337021ae2d..735e6baefa 100644
--- a/Documentation/snippets/skips-in-lyric-mode.ly
+++ b/Documentation/snippets/skips-in-lyric-mode.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, really-simple, rhythms"
+  lsrtags = "really-simple, rhythms, vocal-music"
 
   texidoc = "
 The @code{s} syntax for skips is only available in note mode and chord
diff --git a/Documentation/snippets/slides-in-tablature.ly b/Documentation/snippets/slides-in-tablature.ly
index c397795d63..56060057b5 100644
--- a/Documentation/snippets/slides-in-tablature.ly
+++ b/Documentation/snippets/slides-in-tablature.ly
@@ -28,7 +28,7 @@ Gleiten kann sowohl in normalem Notensystem als auch in Tabulaturen notiert werd
 %% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 Un glissando s'indique dans un @code{TabStaff} tout comme dans un
-@code{Staff}. 
+@code{Staff}.
 
 "
   doctitlefr = "Glissando et tablature"
diff --git a/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
index 78800a4e9e..7ff4174035 100644
--- a/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
+++ b/Documentation/snippets/snap-pizzicato-or-bartok-pizzicato.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "unfretted-strings, expressive-marks"
+  lsrtags = "expressive-marks, unfretted-strings"
 
   texidoc = "
 A snap-pizzicato (also known as @qq{Bartok pizzicato}) is a @qq{strong
diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
index 39dfd206ff..5432a76999 100644
--- a/Documentation/snippets/staff-notation.snippet-list
+++ b/Documentation/snippets/staff-notation.snippet-list
@@ -27,6 +27,7 @@ quoting-another-voice-with-transposition.ly
 quoting-another-voice.ly
 removing-the-first-empty-line.ly
 setting-system-separators.ly
+stem-cross-staff-engraver.ly
 tick-bar-lines.ly
 time-signature-in-parentheses---method-3.ly
 time-signature-in-parentheses.ly
diff --git a/Documentation/snippets/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
index 320812a706..0b28772744 100644
--- a/Documentation/snippets/string-quartet-template-simple.ly
+++ b/Documentation/snippets/string-quartet-template-simple.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, really-simple, unfretted-strings"
+  lsrtags = "really-simple, unfretted-strings, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
index 3241c2495b..727d21105b 100644
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "preparing-parts, template, unfretted-strings"
+  lsrtags = "unfretted-strings, preparing-parts, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 2ad9fb5f10..b1c228cefe 100644
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "simultaneous-notes, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, simultaneous-notes"
 
   texidoc = "
 If notes from two voices with stems in the same direction are placed at
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 9670958eb8..cae2479773 100644
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "paper-and-layout"
diff --git a/Documentation/snippets/text.snippet-list b/Documentation/snippets/text.snippet-list
index 9599ad506d..9076d5318b 100644
--- a/Documentation/snippets/text.snippet-list
+++ b/Documentation/snippets/text.snippet-list
@@ -3,6 +3,7 @@ adjusting-lyrics-vertical-spacing.ly
 aligning-and-centering-instrument-names.ly
 aligning-marks-with-various-notation-objects.ly
 aligning-objects-created-with-the--mark-command.ly
+aligning-syllables-with-melisma.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 center-text-below-hairpin-dynamics.ly
 centering-markup-on-note-heads-automatically.ly
diff --git a/Documentation/snippets/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly
index 5d5d7a3ae8..04e7515e2f 100644
--- a/Documentation/snippets/three-sided-box.ly
+++ b/Documentation/snippets/three-sided-box.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "text, rhythms, scheme-language"
+  lsrtags = "rhythms, text, scheme-language"
 
   texidoc = "
 This example shows how to add a markup command to get a three sided box
diff --git a/Documentation/snippets/time-signature-in-parentheses---method-3.ly b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
index 817ee9e67e..12a67031bb 100644
--- a/Documentation/snippets/time-signature-in-parentheses---method-3.ly
+++ b/Documentation/snippets/time-signature-in-parentheses---method-3.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
+  lsrtags = "specific-notation, tweaks-and-overrides, staff-notation"
 
   texidoc = "
 Another way to put the time signature in parenthesis
diff --git a/Documentation/snippets/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
index 05eb0de0cf..d346d96c6b 100644
--- a/Documentation/snippets/time-signature-in-parentheses.ly
+++ b/Documentation/snippets/time-signature-in-parentheses.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, staff-notation, tweaks-and-overrides"
+  lsrtags = "specific-notation, tweaks-and-overrides, staff-notation"
 
   texidoc = "
 The time signature can be enclosed within parentheses.
diff --git a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
index a1d47df0e7..fb2ece7c8a 100644
--- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
+++ b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "specific-notation, ancient-notation, workaround, tweaks-and-overrides"
+  lsrtags = "specific-notation, tweaks-and-overrides, workaround, ancient-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index 531d1b25ce..a24d548c75 100644
--- a/Documentation/snippets/tweaking-clef-properties.ly
+++ b/Documentation/snippets/tweaking-clef-properties.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "pitches, staff-notation, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, pitches, staff-notation"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   doctitlees = "Trucaje de las propiedades de clave"
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index 5695487e3e..265967911e 100644
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "tweaks-and-overrides, rhythms"
diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list
index e3f35bc165..7fd505fee8 100644
--- a/Documentation/snippets/tweaks-and-overrides.snippet-list
+++ b/Documentation/snippets/tweaks-and-overrides.snippet-list
@@ -68,6 +68,7 @@ separating-key-cancellations-from-key-signature-changes.ly
 setting-hairpin-behavior-at-bar-lines.ly
 setting-system-separators.ly
 showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+stem-cross-staff-engraver.ly
 string-number-extender-lines.ly
 suppressing-warnings-for-clashing-note-columns.ly
 time-signature-in-parentheses---method-3.ly
diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 31ed44ac7c..b6f116f946 100644
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.32"
+\version "2.15.40"
 
 \header {
   lsrtags = "headword"
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 e8f9c8ecde..945361dfb4 100644
--- a/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
+++ b/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, expressive-marks"
+  lsrtags = "expressive-marks, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 e42137ee41..053f8631d1 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, really-cool, tweaks-and-overrides, scheme-language"
+  lsrtags = "tweaks-and-overrides, scheme-language, really-cool, editorial-annotations"
 
 %% Translation of GIT committish: 5a898cf43a2a78be6c3a58e4359dccd82196fbe7
   texidocfr = "
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 ffda278283..6ff9396094 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "tweaks-and-overrides, really-simple"
+  lsrtags = "really-simple, tweaks-and-overrides"
 
   texidoc = "
 With the @code{\\tweak} command, every grob can be tuned directly.
diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly
index 9d53d358d3..edce235eb4 100644
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "editorial-annotations, expressive-marks"
+  lsrtags = "expressive-marks, editorial-annotations"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
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 1f368a1a34..7930ea31ce 100644
--- a/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
+++ b/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "ancient-notation, expressive-marks"
+  lsrtags = "expressive-marks, ancient-notation"
 
   texidoc = "
 This short vertical line placed above the note is commonly used in
diff --git a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
index 0c18df37c1..c8350e6081 100644
--- a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
+++ b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "workaround, tweaks-and-overrides, spacing"
+  lsrtags = "spacing, tweaks-and-overrides, workaround"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
index f61f9c3f9d..20fe06fb02 100644
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "vocal-music, tweaks-and-overrides, spacing"
+  lsrtags = "spacing, tweaks-and-overrides, vocal-music"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
index 8439ed771b..fa4c5834a9 100644
--- a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
+++ b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "chords, tweaks-and-overrides"
+  lsrtags = "tweaks-and-overrides, chords"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 507c972a43..f0560db188 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, keyboards, automatic-notation"
+  lsrtags = "automatic-notation, keyboards, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 95f180fe5b..abf2433fb3 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
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, text, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, text, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
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 6afaae23dd..7820fdb005 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, contexts-and-engravers"
+  lsrtags = "contexts-and-engravers, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
 
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index 81562a48b1..3fb14b33e4 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "template, vocal-music, really-simple"
+  lsrtags = "really-simple, vocal-music, template"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
index d38ce6d521..b62574ffc0 100644
--- a/Documentation/snippets/vocal-music.snippet-list
+++ b/Documentation/snippets/vocal-music.snippet-list
@@ -2,6 +2,7 @@ adding-ambitus-per-voice.ly
 adding-indicators-to-staves-which-get-split-after-a-break.ly
 adding-orchestral-cues-to-a-vocal-score.ly
 adjusting-lyrics-vertical-spacing.ly
+aligning-syllables-with-melisma.ly
 ambitus-with-multiple-voices.ly
 ambitus.ly
 ancient-notation-template----modern-transcription-of-gregorian-music.ly
diff --git a/Documentation/snippets/volta-below-chords.ly b/Documentation/snippets/volta-below-chords.ly
index 12aac9198e..3d88d19809 100644
--- a/Documentation/snippets/volta-below-chords.ly
+++ b/Documentation/snippets/volta-below-chords.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, staff-notation, chords"
+  lsrtags = "chords, staff-notation, repeats"
 
 %% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
diff --git a/Documentation/snippets/volta-multi-staff.ly b/Documentation/snippets/volta-multi-staff.ly
index 975ec83da9..0f49c2b0a0 100644
--- a/Documentation/snippets/volta-multi-staff.ly
+++ b/Documentation/snippets/volta-multi-staff.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, staff-notation, really-simple"
+  lsrtags = "really-simple, staff-notation, repeats"
 
   texidoc = "
 By adding the @code{Volta_engraver} to the relevant staff, volte can be
diff --git a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
index 106b318a41..a261831650 100644
--- a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
+++ b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "repeats, text, symbols-and-glyphs"
+  lsrtags = "text, repeats, symbols-and-glyphs"
 
   texidoc = "
 Though volte are best specified using @code{\\repeat volta}, the
diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly
index f056dfcf4c..7125f39eec 100644
--- a/Documentation/snippets/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/woodwind-diagrams-listing.ly
@@ -7,7 +7,7 @@
 \version "2.14.2"
 
 \header {
-  lsrtags = "winds, specific-notation"
+  lsrtags = "specific-notation, winds"
 
 %%%    Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
   texidoces = "
@@ -17,30 +17,7 @@ el momento.
 
 "
   doctitlees = "Listado de los diagramas para viento madera"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-Folgende Noten zeige alle Holzbläserdiagramme, die für LilyPond
-definiert sind.
-
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
-
-  texidocde="
-Folgende Noten zeige alle Holzbläserdiagramme, die für LilyPond
-definiert sind.
-
-"
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
-
 
-  texidocde="
-Folgende Noten zeige alle Holzbläserdiagramme, die für LilyPond
-definiert sind.
-
-"
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
 
@@ -51,6 +28,7 @@ definiert sind.
 "
   doctitlede = "Liste der Holzbläserdiagramme"
 
+
 %% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
   texidocfr = "
 Voici la liste des différents instruments à vent de la section des bois
-- 
2.39.2