From cf93b1df71253b2686ceabacdf49a47e6908da64 Mon Sep 17 00:00:00 2001
From: Phil Holmes <mail@philholmes.net>
Date: Sun, 27 Nov 2011 12:49:49 +0000
Subject: [PATCH] Update LSR and fix Issue 1971

Fixes Issue 1971
---
 .../snippets/accordion-discant-symbols.ly     |  2 +-
 ...a-figured-bass-above-or-below-the-notes.ly |  6 +--
 .../adding-bar-lines-to-chordnames-context.ly |  2 +-
 Documentation/snippets/adding-drum-parts.ly   |  2 +-
 ...to-staves-which-get-split-after-a-break.ly |  2 +-
 ...adding-orchestral-cues-to-a-vocal-score.ly |  4 +-
 .../snippets/arabic-improvisation.ly          | 27 +++++++------
 .../center-text-below-hairpin-dynamics.ly     |  2 +-
 ...changing-a-single-notes-size-in-a-chord.ly |  5 +--
 .../snippets/changing-fret-orientations.ly    | 35 ++++++-----------
 .../snippets/changing-the-staff-size.ly       |  2 +-
 .../controlling-tuplet-bracket-visibility.ly  |  2 +-
 .../customizing-fretboard-fret-diagrams.ly    | 39 +++++++------------
 .../snippets/demo-midiinstruments.ly          |  2 +-
 .../snippets/drawing-boxes-around-grobs.ly    |  2 +-
 .../snippets/engraving-ties-manually.ly       |  4 +-
 .../snippets/formatting-lyrics-syllables.ly   | 16 ++++----
 .../snippets/generating-random-notes.ly       |  2 +-
 ...y-customized-polymetric-time-signatures.ly |  2 +-
 ...ing-the-extender-line-for-text-dynamics.ly |  2 +-
 Documentation/snippets/hymn-template.ly       |  1 +
 Documentation/snippets/lyrics-alignment.ly    |  4 +-
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |  6 +--
 Documentation/snippets/markup-lines.ly        |  2 +-
 ...ues-for-articulation-shorthand-notation.ly |  2 +-
 ...ng-grace-note-slashes-with-normal-heads.ly |  2 +-
 .../snippets/partcombine-and-autobeamoff.ly   |  2 +
 .../piano-template-with-melody-and-lyrics.ly  |  2 +-
 ...naturals-from-being-automatically-added.ly |  2 +-
 .../snippets/recorder-fingering-chart.ly      |  2 +-
 .../snippets/removing-the-first-empty-line.ly |  2 +-
 Documentation/snippets/table-of-contents.ly   |  2 +-
 .../tweaking-grace-layout-within-music.ly     |  2 +-
 ...ng-grace-note-slashes-with-normal-heads.ly |  4 +-
 .../volta-text-markup-using-repeatcommands.ly |  2 +-
 35 files changed, 88 insertions(+), 109 deletions(-)

diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 35bea436be..b93c1511d9 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "keyboards"
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 1d49f5c2e7..c66f980d4d 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
@@ -33,9 +33,9 @@ a toda la partitura.
   texidoc = "
 When writing a figured bass, you can place the figures above or below
 the bass notes, by defining the @code{BassFigureAlignmentPositioning
-#'direction} property (exclusively in a @code{Staff} context).  Choices
-are @code{UP} (or @code{1}), @code{CENTER} (or @code{0}) and
-@code{DOWN} (or @w{@code{-1}}).
+#'direction} property (exclusively in a @code{Staff} context). Choices
+are @code{#UP} (or @code{#1}), @code{#CENTER} (or @code{#0}) and
+@code{#DOWN} (or @code{#-1}).
 
 This property can be changed as many times as you wish. Use
 @code{\\once \\override} if you don't want the override to apply to the
diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index 602a599a25..27b1b63d00 100644
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "chords"
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index f37de00ded..c3a915d5d4 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "rhythms, percussion"
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 8267f547c3..7ade8fc15f 100644
--- a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
+++ b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "staff-notation, vocal-music"
diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
index 68b80df57d..3a0bd736a4 100644
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.18"
+\version "2.15.20"
 
 \header {
   lsrtags = "staff-notation, vocal-music"
@@ -76,7 +76,7 @@ This shows one approach to simplify adding many orchestral cues to the
 piano reduction in a vocal score.  The music function @code{\\cueWhile}
 takes four arguments: the music from which the cue is to be taken, as
 defined by @code{\\addQuote}, the name to be inserted before the cue
-notes, then either @code{UP} or @code{DOWN} to specify either
+notes, then either @code{#UP} or @code{#DOWN} to specify either
 @code{\\voiceOne} with the name above the staff or @code{\\voiceTwo}
 with the name below the staff, and finally the piano music in parallel
 with which the cue notes are to appear.  The name of the cued
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index ec2e7fb9ba..6e58de54d9 100644
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -7,22 +7,8 @@
 \version "2.15.20"
 
 \header {
-%% Translation of GIT committish: af2292dff32d630f62d69294158452f103f3e393
-  texidocfr = "
-Lorsque les improvisations ou @emph{taqasim} sont temporairement libres,
-la métrique peut ne pas apparaître, auquel cas on utilisera un
-@code{\\cadenzaOn}.  Les altérations accidentelles devront alors être
-répétées en raison de l'absence de barre de mesure.  Voici comment
-  pourrait débuter un improvisation de @emph{hijaz}.
-
-"
-
-  doctitlefr = "Improvisation en musique arabe"
-
-
   lsrtags = "world-music"
 
-
 %% Translation of GIT committish: 8b93de6ce951b7b14bc7818f31019524295b990f
   texidoces = "
 Para las improvisaciones o @emph{taqasim} que son libres durante unos
@@ -49,6 +35,19 @@ der Beginn einer @emph{hijaz}-Improvisation aussehen könnte:
 
   doctitlede = "Arabische Improvisation"
 
+%% Translation of GIT committish: af2292dff32d630f62d69294158452f103f3e393
+  texidocfr = "
+Lorsque les improvisations ou @emph{taqasim} sont temporairement libres,
+la métrique peut ne pas apparaître, auquel cas on utilisera un
+@code{\\cadenzaOn}.  Les altérations accidentelles devront alors être
+répétées en raison de l'absence de barre de mesure.  Voici comment
+  pourrait débuter un improvisation de @emph{hijaz}.
+
+"
+
+  doctitlefr = "Improvisation en musique arabe"
+
+
   texidoc = "
 For improvisations or taqasim which are temporarily free, the time
 signature can be omitted and @code{\\cadenzaOn} can be used.  Adjusting
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 38a691d6c5..64bcc683f9 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.18"
+\version "2.15.20"
 
 \header {
   lsrtags = "expressive-marks, text"
diff --git a/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly b/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
index 0a8ff6e9d4..f463849cf3 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
@@ -30,7 +30,7 @@ property.
 
 Inside the chord (within the brackets @code{< >}), before the note to
 be altered, place the @code{\\tweak} command, followed by
-@code{'font-size} and define the proper size like @w{@code{-2}} (a tiny
+@code{#'font-size} and define the proper size like @code{#-2} (a tiny
 note head).
 
 
@@ -40,7 +40,6 @@ note head).
 } % begin verbatim
 
 \relative c' {
-  <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1
-    ^\markup { A tiny e }_\markup { A big c }
+  <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup { A tiny e }_\markup { A big c }
 }
 
diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly
index 084a893495..3bc2885665 100644
--- a/Documentation/snippets/changing-fret-orientations.ly
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -7,31 +7,8 @@
 \version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
-
-  texidocfr = "
-Les diagrammes de fret peuvent s'orienter de trois manières différentes.
-Ils s'aligneront par défaut sur la corde du haut ou le sommet du fret.
-
-
-"
-
-  doctitlefr = "Orientation des diagrammes de fret"
-
-
   lsrtags = "fretted-strings"
 
-
-
-
-
-
-
-
-
-
-
-
 %% Translation of GIT committish: 8b93de6ce951b7b14bc7818f31019524295b990f
 
   texidoces = "
@@ -45,6 +22,18 @@ superior en las distintas alineaciones.
 
   doctitlees = "Modificar la orientación de los trastes"
 
+%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
+
+  texidocfr = "
+Les diagrammes de fret peuvent s'orienter de trois manières différentes.
+Ils s'aligneront par défaut sur la corde du haut ou le sommet du fret.
+
+
+"
+
+  doctitlefr = "Orientation des diagrammes de fret"
+
+
   texidoc = "
 Fret diagrams can be oriented in three ways.  By default the top string
 or fret in the different orientations will be aligned.
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index f7c4d3dd78..4ec923b18b 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -11,7 +11,7 @@
 
   texidoc = "
 Though the simplest way to resize staves is to use
-@code{#(set-global-staff-size @var{xx})}, an individual staff's size can be
+@code{#(set-global-staff-size xx)}, an individual staff's size can be
 changed by scaling the properties @code{'staff-space} and
 @code{fontSize}.
 
diff --git a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
index 4fd51e89d3..f7b6e4edd1 100644
--- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
+++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
@@ -44,7 +44,7 @@ The default behavior of tuplet-bracket visibility is to print a bracket
 unless there is a beam of the same length as the tuplet. To control the
 visibility of tuplet brackets, set the property
 @code{'bracket-visibility} to either @code{#t} (always print a
-bracket), @code{#f} (never print a bracket) or @code{'if-no-beam}
+bracket), @code{#f} (never print a bracket) or @code{#'if-no-beam}
 (only print a bracket if there is no beam).
 
 "
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index 18351d31df..30d11f31be 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -4,35 +4,11 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
-%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
-  texidocfr = "
-Les propriétés d'un diagramme de fret sont définies par les
-@code{fret-diagram-details}.  En matière de diagramme FretBoards, les
-adaptations s'appliquent à l'objet @code{FretBoards.FretBoard}.  Un
-@code{FretBoard} est comparable à un @code{Voice}@tie{}: il s'agit
-d'un contexte du plus bas niveau, et il n'est donc pas primordial de
-l'instancier de manière explicite pour adapter ses propriétés.
-
-"
-  doctitlefr = "Personnalisation de diagrammes de fret"
-
-
   lsrtags = "fretted-strings, tweaks-and-overrides"
 
-
-
-
-
-
-
-
-
-
-
-
 %% Translation of GIT committish: 8b93de6ce951b7b14bc7818f31019524295b990f
   texidoces = "
 Se pueden establecer las propiedades de los diagramas de
@@ -59,6 +35,19 @@ weggelassen werden kann.
 "
   doctitlede = "Bunddiagramme anpassen"
 
+%% Translation of GIT committish: 40bf2b38d674c43f38058494692d1a0993fad0bd
+  texidocfr = "
+Les propriétés d'un diagramme de fret sont définies par les
+@code{fret-diagram-details}.  En matière de diagramme FretBoards, les
+adaptations s'appliquent à l'objet @code{FretBoards.FretBoard}.  Un
+@code{FretBoard} est comparable à un @code{Voice}@tie{}: il s'agit
+d'un contexte du plus bas niveau, et il n'est donc pas primordial de
+l'instancier de manière explicite pour adapter ses propriétés.
+
+"
+  doctitlefr = "Personnalisation de diagrammes de fret"
+
+
   texidoc = "
 Fret diagram properties can be set through
 @code{'fret-diagram-details}.  For FretBoard fret diagrams, overrides
diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index 8ef9a3bcd7..fb209c6a40 100644
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "midi"
diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index c790099770..1e3ce84446 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.10"
+\version "2.15.20"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
diff --git a/Documentation/snippets/engraving-ties-manually.ly b/Documentation/snippets/engraving-ties-manually.ly
index b33883f8b3..f09afb6d3b 100644
--- a/Documentation/snippets/engraving-ties-manually.ly
+++ b/Documentation/snippets/engraving-ties-manually.ly
@@ -47,8 +47,8 @@ le second la direction (1 pour haut, @minus{}1 pour bas).
   texidoc = "
 Ties may be engraved manually by changing the @code{tie-configuration}
 property of the @code{TieColumn} object. The first number indicates the
-distance from the center of the staff in half staff-spaces, and the second
-number indicates the direction (1 = up, -1 = down).
+distance from the center of the staff in half staff-spaces, and the
+second number indicates the direction (1 = up, -1 = down).
 
 "
   doctitle = "Engraving ties manually"
diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
index 19a19aabce..e630d84640 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -7,14 +7,6 @@
 \version "2.14.0"
 
 \header {
-%%  Translation of GIT committish: f88e964fea14c10b48787ec9f4b5f8261a23de48
-  texidocfr = "
-Le mode markup permet d'individualiser la mise en forme de certaines syllabes.
-
-"
-  doctitlefr = "Mise en forme individuelle de syllabes"
-
-
   lsrtags = "text, vocal-music"
 
 %%%    Translation of GIT committish: f86f00c1a8de0f034ba48506de2801c074bd5422
@@ -25,6 +17,14 @@ zu formatieren.
 "
   doctitlede = "Silben im Gesangstext formatieren"
 
+%%  Translation of GIT committish: f88e964fea14c10b48787ec9f4b5f8261a23de48
+  texidocfr = "
+Le mode markup permet d'individualiser la mise en forme de certaines syllabes.
+
+"
+  doctitlefr = "Mise en forme individuelle de syllabes"
+
+
   texidoc = "
 Markup mode may be used to format individual syllables in lyrics.
 
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index c5c2220ba9..65e897e397 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.18"
+\version "2.15.20"
 
 \header {
   lsrtags = "pitches"
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index a7e08b3c86..c13c8c7161 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.19"
+\version "2.15.20"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
index 57c83fc237..4c68cc8ccf 100644
--- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
+++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly
index 00ddc15638..c121eed510 100644
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -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/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
index c66b9ecc34..f5f48869e1 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -48,8 +48,8 @@ les valeurs @code{1} ou @code{RIGHT} un alignement par la droite.
   texidoc = "
 Horizontal alignment for lyrics cam be set by overriding the
 @code{self-alignment-X} property of the @code{LyricText} object.
-@w{@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
+@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
 well.
 
 "
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 967b3a4e22..08c57c7e62 100644
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.10"
+\version "2.15.20"
 
 \header {
   lsrtags = "editorial-annotations, vocal-music"
@@ -30,8 +30,8 @@ speakOn = {
               Y
               (- (ly:grob-property grob 'direction))
               (grob-interpret-markup grob
-                                    (markup #:center-align #:fontsize -4
-                                            #:musicglyph "noteheads.s2cross"))
+                                     (markup #:center-align #:fontsize -4
+                                             #:musicglyph "noteheads.s2cross"))
               -2.3))))
 }
 
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 106ad4f36e..8bc11221b0 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.17"
+\version "2.15.20"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
index e517b11ccd..155456662e 100644
--- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -61,7 +61,7 @@ variables @code{dashHat}, @code{dashPlus}, @code{dashDash},
 @code{dashBar}, @code{dashLarger}, @code{dashDot}, and
 @code{dashUnderscore} are assigned default values.  The default values
 for the shorthands can be modified. For example, to associate the
-@w{@code{-+}} (@code{dashPlus}) shorthand with the trill symbol instead of
+@code{-+} (@code{dashPlus}) shorthand with the trill symbol instead of
 the default + symbol, assign the value @code{trill} to the variable
 @code{dashPlus}:
 
diff --git a/Documentation/snippets/new/using-grace-note-slashes-with-normal-heads.ly b/Documentation/snippets/new/using-grace-note-slashes-with-normal-heads.ly
index 646f5ad9df..65ca599380 100644
--- a/Documentation/snippets/new/using-grace-note-slashes-with-normal-heads.ly
+++ b/Documentation/snippets/new/using-grace-note-slashes-with-normal-heads.ly
@@ -9,7 +9,7 @@ other situations.
 
 "
   doctitle = "Using grace note slashes with normal heads"
-} % begin verbatim
+}
 
 \relative c'' {
   \override Flag #'stroke-style = #"grace"
diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly
index d5b3340110..bb6f54ba50 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: e1a149d0cc60b02e86209387958f4028567dd366
   texidocfr = "
 Le fonction @code{@bs{}autoBeamOff} dans le cadre d'un
diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 92eff22d0f..f1d602a585 100644
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"
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 85622b6f27..dc5c0136a4 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -48,7 +48,7 @@ altération précédente.  Pour modifier ce comportement, assignez la propriét
 In accordance with standard typesetting rules, a natural sign is
 printed before a sharp or flat if a previous accidental on the same
 note needs to be canceled.  To change this behavior, set the
-@code{extraNatural} property to @code{#f} in the @code{Staff} context.
+@code{extraNatural} property to @code{f} in the @code{Staff} context.
 
 
 
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index 43dd4d9173..054feffd84 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.10"
+\version "2.15.20"
 
 \header {
   lsrtags = "winds"
diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index 5ec02fd6b8..86199737de 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.15.7"
+\version "2.15.20"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, breaks"
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index 42fe2cb4d2..bea4576ff1 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.17"
+\version "2.15.20"
 
 \header {
   lsrtags = "paper-and-layout"
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index 4e0dd6b524..2046030d8f 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.18"
+\version "2.15.20"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly b/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
index f2bc237e8c..cc1368fb12 100644
--- a/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
+++ b/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
@@ -39,9 +39,9 @@ other situations.
   doctitle = "Using grace note slashes with normal heads"
 } % begin verbatim
 
+
 \relative c'' {
   \override Flag #'stroke-style = #"grace"
   c8( d2) e8( f4)
-} % begin verbatim
-
+}
 
diff --git a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
index 71363b15b9..b739b7b4c0 100644
--- a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
+++ b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
@@ -17,7 +17,7 @@ volta text needs more advanced formatting with @code{\\markup}.
 
 Since @code{repeatCommands} takes a list, the simplest method of
 including markup is to use an identifier for the text and embed it in
-the command list using the Scheme syntax @code{(list (list 'volta
+the command list using the Scheme syntax @code{#(list (list 'volta
 textIdentifier))}. Start- and end-repeat commands can be added as
 separate list elements:
 
-- 
2.39.5