From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 21 Nov 2010 18:49:42 +0000 (+0100)
Subject: Merge branch 'lilypond/translation'
X-Git-Tag: release/2.13.41-1~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=580faff1d6167b1500228dc5c5ae073dca0ead40;hp=ee3a89f9f7289bcd90c5f27fd8f86400159088b2;p=lilypond.git

Merge branch 'lilypond/translation'
---

diff --git a/Documentation/contributor/doc-work.itexi b/Documentation/contributor/doc-work.itexi
index a42d029b15..0162670763 100644
--- a/Documentation/contributor/doc-work.itexi
+++ b/Documentation/contributor/doc-work.itexi
@@ -756,16 +756,33 @@ Don't capitalize the first word.
 @itemize
 @item
 @code{@@enumerate} --- Create an ordered list (with numbers).
-Always put @samp{@@item} on its own line, and separate consecutive
-items with a blank line:
+Always put @samp{@@item} on its own line.  As an exception, if all
+the items in the list are short enough to fit on single lines, placing
+them on the @samp{@@item} lines is also permissible.  @samp{@@item}
+and @samp{@@end@tie{}enumerate} should always be preceded by a blank
+line.
 
 @example
 @@enumerate
+
 @@item
-Foo
+A long multi-line item like this one must begin
+on a line of its own and all the other items in
+the list must do so too.
 
 @@item
-Bar
+Even short ones
+
+@@end enumerate
+@end example
+
+@example
+@@enumerate
+
+@@item Short item
+
+@@item Short item
+
 @@end enumerate
 @end example
 
diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely
index 68e923533e..26347e2df8 100644
--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -742,27 +742,11 @@ different from the default style.  If called for, the natural sign
 will be taken from the @code{vaticana} style.
 
 @lilypond[quote,ragged-right,staffsize=26]
-\score {
-{
-  \textLengthOn
-  s^\markup {
-    \column {
-      "mensural"
-      \line { " " \musicglyph #"accidentals.mensural-1"
-        " " \musicglyph #"accidentals.mensural1" }
-    }
-  }
-}
-\layout {
-  interscoreline = 1
-  \context { \Score \remove "Bar_number_engraver" }
-  \context { \Staff
-      \remove "Clef_engraver"
-      \remove "Key_engraver"
-      \remove "Time_signature_engraver"
-      \remove "Staff_symbol_engraver"
-      \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
+\markup {
+  \column {
+    "mensural"
+    \line { " " \musicglyph #"accidentals.mensural-1"
+      " " \musicglyph #"accidentals.mensural1" }
   }
 }
 @end lilypond
@@ -1133,35 +1117,19 @@ Notation Reference:
 Accidentals for the three different Gregorian styles are available:
 
 @lilypond[quote,ragged-right,staffsize=26]
-\score {
-{
-  \textLengthOn
-  s^\markup {
-    \column {
-      "vaticana"
-      \line { " " \musicglyph #"accidentals.vaticana-1"
-        " " \musicglyph #"accidentals.vaticana0" }
-    }
-    \column {
-      "medicaea"
-      \line { " " \musicglyph #"accidentals.medicaea-1" }
-    }
-    \column {
-      "hufnagel"
-      \line { " " \musicglyph #"accidentals.hufnagel-1" }
-    }
+\markup {
+  \column {
+    "vaticana"
+    \line { " " \musicglyph #"accidentals.vaticana-1"
+      " " \musicglyph #"accidentals.vaticana0" }
   }
-}
-\layout {
-  interscoreline = 1
-  \context { \Score \remove "Bar_number_engraver" }
-  \context { \Staff
-      \remove "Clef_engraver"
-      \remove "Key_engraver"
-      \remove "Time_signature_engraver"
-      \remove "Staff_symbol_engraver"
-      \override VerticalAxisGroup #'minimum-Y-extent = ##f
-    }
+  \column {
+    "medicaea"
+    \line { " " \musicglyph #"accidentals.medicaea-1" }
+  }
+  \column {
+    "hufnagel"
+    \line { " " \musicglyph #"accidentals.hufnagel-1" }
   }
 }
 @end lilypond
diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index 9363954c02..2b302c54a4 100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -2345,11 +2345,11 @@ Absolute distances are used for specifying margins, indents, and
 other page layout details, and are by default specified in
 millimeters.  Distances may be specified in other units by
 following the quantity by @code{\mm}, @code{\cm},
-@code{\in}@tie{}(inches), or @code{\pt}@tie{}(points, 1/72.27
-of an inch).  Page layout distances can also be specified in
-scalable units (see the following paragraph) by appending
-@code{\staff-space} to the quantity.
-Page layout is described in detail in @ref{Page formatting}.
+@code{\in}@tie{}(inches), or @code{\pt}@tie{}(points, 1/72.27 of
+an inch).  Page layout distances can also be specified in scalable
+units (see the following paragraph) by appending
+@code{\staff-space} to the quantity.  Page layout is described in
+detail in @ref{Page layout}.
 
 Scaled distances are always specified in units of the staff-space
 or, rarely, the half staff-space.  The staff-space is the distance
@@ -2382,7 +2382,7 @@ Learning Manual:
 @rlearning{Length and thickness of objects}.
 
 Notation Reference:
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Setting the staff size}.
 
 
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 43e1c8a073..f240fd7d50 100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -514,7 +514,7 @@ some pieces include a lot more information.
 
 @menu
 * Creating titles::
-* Custom titles::
+* Custom headers footers and titles::
 * Reference to page numbers::
 * Table of contents::
 @end menu
@@ -706,8 +706,8 @@ Headers may be completely removed by setting them to false.
 @end example
 
 
-@node Custom titles
-@subsection Custom titles
+@node Custom headers footers and titles
+@subsection Custom headers, footers, and titles
 
 A more advanced option is to change the definitions of the following
 variables in the @code{\paper} block.  The init file
@@ -759,16 +759,47 @@ the name of the movement (@code{piece} field).
 The following definition will put the title flush left, and the
 composer flush right on a single line.
 
-@verbatim
-\paper {
-  bookTitleMarkup = \markup {
-   \fill-line {
+@example
+\paper @{
+  bookTitleMarkup = \markup @{
+   \fill-line @{
      \fromproperty #'header:title
      \fromproperty #'header:composer
-   }
-  }
-}
-@end verbatim
+   @}
+  @}
+@}
+@end example
+
+The header and footer are created by the functions
+@code{make-header} and @code{make-footer}, defined in
+@code{\paper}.  The default implementations are in
+@file{ly/paper-defaults-init.ly} and @file{ly/titling-init.ly}.
+
+This example centers page numbers at the bottom of every page.
+
+@example
+\paper @{
+  print-page-number = ##t
+  print-first-page-number = ##t
+  oddHeaderMarkup = \markup \fill-line @{ " " @}
+  evenHeaderMarkup = \markup \fill-line @{ " " @}
+  oddFooterMarkup = \markup @{
+    \fill-line @{
+      \bold \fontsize #3
+      \on-the-fly #print-page-number-check-first
+      \fromproperty #'page:page-number-string
+    @}
+  @}
+  evenFooterMarkup = \markup @{
+    \fill-line @{
+      \bold \fontsize #3
+      \on-the-fly #print-page-number-check-first
+      \fromproperty #'page:page-number-string
+    @}
+  @}
+@}
+@end example
+
 
 @node Reference to page numbers
 @subsection Reference to page numbers
diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index 47705007ef..1048b387bc 100644
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -249,7 +249,6 @@ mus = \drummode {
        \remove Time_signature_engraver
        \override Stem #'transparent = ##t
        \override Stem #'Y-extent = ##f
-       \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0)
      } \mus
      \new Lyrics \nam
   >>
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 27aef2095e..d8aab3bcff 100644
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -68,19 +68,18 @@ estimated.  Finally, a page breaking and line breaking combination is chosen
 so that neither the horizontal nor the vertical spacing is too cramped
 or stretched.
 
-Settings which influence layout may be placed in two blocks.
-The @code{\paper @{...@}} block is placed outside any
-@code{\score @{...@}} blocks and contains settings that
-relate to the entire document.  The @code{\layout @{...@}}
-block is placed within a @code{\score @{...@}} block and
-contains settings for that particular score.  If you have
-only one @code{\score @{...@}} block the two have the same
-effect.  In general the commands shown in this chapter can
-be placed in either.
+Two types of blocks can contain layout settings:
+@code{\paper @{@dots{}@}} and @code{\layout @{@dots{}@}}.  The
+@code{\paper} block contains page layout settings that are
+expected to be the same for all scores in a book, such as the
+paper height, or whether to print page numbers, etc.  See
+@ref{Page layout}.  The @code{\layout} block contains score layout
+settings, such as the number of systems to use, or the space
+between staff-groups, etc.  See @ref{Score layout}.
 
 @menu
-* Paper and pages::
-* Music layout::
+* Page layout::
+* Score layout::
 * Breaks::
 * Vertical spacing::
 * Horizontal spacing::
@@ -88,24 +87,111 @@ be placed in either.
 @end menu
 
 
-@node Paper and pages
-@section Paper and pages
+@node Page layout
+@section Page layout
 
-This section deals with the boundaries that define the area
-within which music can be printed.
+This section discusses page layout options for the @code{\paper}
+block.
 
 @menu
-* Paper size::
-* Page formatting::
+* The \paper block::
+* Paper size and automatic scaling::
+* Fixed vertical spacing \paper variables::
+* Flexible vertical spacing \paper variables::
+* Horizontal spacing \paper variables::
+* Other \paper variables::
 @end menu
 
 
-@node Paper size
-@subsection Paper size
+@node The \paper block
+@subsection The @code{\paper} block
+
+The @code{\paper} block can appear within a @code{\book} block,
+but not within a @code{\score} block.  Settings in a @code{\paper}
+block apply to the entire book, which may include multiple scores.
+Settings that can appear in a @code{\paper} block include:
+
+@itemize
+
+@item
+the @code{set-paper-size} scheme function,
+
+@item
+@code{\paper} variables used for customizing page layout, and
+
+@item
+markup definitions used for customizing the layout of headers,
+footers, and titles.
+
+@end itemize
+
+The @code{set-paper-size} function is discussed in the next
+section, @ref{Paper size and automatic scaling}.  The
+@code{\paper} variables that deal with page layout are discussed
+in later sections.  The markup definitions that deal with headers,
+footers, and titles are discussed in
+@ref{Custom headers footers and titles}.
+
+Most @code{\paper} variables will only work in a @code{\paper}
+block.  The few that will also work in a @code{\layout} block are
+listed in @ref{The \layout block}.
+
+Except when specified otherwise, all @code{\paper} variables that
+correspond to distances on the page are measured in millimeters,
+unless a different unit is specified by the user.  For example,
+the following declaration sets @code{top-margin} to ten
+millimeters:
+
+@example
+\paper @{
+  top-margin = 10
+@}
+@end example
+
+To set it to @code{0.5} inches, use the @code{\in} unit suffix:
+
+@example
+\paper @{
+  top-margin = 0.5\in
+@}
+@end example
+
+The available unit suffixes are @code{\mm}, @code{\cm},
+@code{\in}, and @code{\pt}.  For the sake of clarity, when using
+millimeters, the @code{\mm} is typically included in the code,
+even though it is not technically necessary.
+
+It is also possible to define @code{\paper} values using Scheme.
+The Scheme equivalent of the above example is:
+
+@example
+\paper @{
+  #(define top-margin (* 0.5 in))
+@}
+@end example
+
+@seealso
+Notation Reference:
+@ref{Custom headers footers and titles}.
+
+
+@node Paper size and automatic scaling
+@subsection Paper size and automatic scaling
 
 @cindex paper size
 @cindex page size
 
+@funindex \paper
+
+@menu
+* Setting paper size::
+* Automatic scaling to paper size::
+@end menu
+
+
+@node Setting paper size
+@unnumberedsubsubsec Setting paper size
+
 Two functions are available for changing the paper size:
 @code{set-default-paper-size} and @code{set-paper-size}.
 @code{set-default-paper-size} must be placed in the toplevel
@@ -123,6 +209,13 @@ block:
 @end example
 
 @noindent
+In the toplevel scope, the @code{set-default-paper-size} function
+can safely be called anywhere before the first @code{\paper}
+block.  Within a @code{\paper} block, the safest place to call
+@code{set-paper-size} is at the top, above the list of variable
+declarations.  The reasons for this are discussed in
+@ref{Automatic scaling to paper size}.
+
 @code{set-default-paper-size} sets the size of all pages, whereas
 @code{set-paper-size} only sets the size of the pages that the
 @code{\paper} block applies to.  For example, if the @code{\paper}
@@ -156,70 +249,111 @@ degrees, and wider line widths will be set accordingly.
 #(set-default-paper-size "a6" 'landscape)
 @end example
 
-Setting the paper size will adjust a number of @code{\paper}
-variables, such as margins.  To use a particular paper size with
-altered @code{\paper} variables, set the paper size before setting
-the variables.
-
-
 @seealso
 Installed Files:
 @file{scm/@/paper@/.scm}.
 
-Snippets:
-@rlsr{Spacing}.
-
 
-@node Page formatting
-@subsection Page formatting
-
-@funindex \paper
+@node Automatic scaling to paper size
+@unnumberedsubsubsec Automatic scaling to paper size
+
+If the paper size is changed with one of the scheme functions
+(@code{set-default-paper-size} or @code{set-paper-size}), the
+values of several @code{\paper} variables are automatically scaled
+to the new size.  To bypass the automatic scaling for a particular
+variable, set the variable after setting the paper size.  Note
+that the automatic scaling is not triggered by setting
+@code{paper-height} or @code{paper-width}, even though
+@code{paper-width} can influence other values (this is separate
+from scaling and is discussed below).  The
+@code{set-default-paper-size} and @code{set-paper-size} functions
+are described in @ref{Setting paper size}.
+
+The vertical dimensions affected by automatic scaling are
+@code{top-margin} and @code{bottom-margin}.  The horizontal
+dimensions affected by automatic scaling are @code{left-margin},
+@code{right-margin}, @code{inner-margin}, @code{outer-margin},
+@code{binding-offset}, @code{indent}, and @code{short-indent}.
+
+The default values for these dimensions are set in
+@file{ly/paper-defaults-init.ly}, using internal variables named
+@code{top-margin-default}, @code{bottom-margin-default}, etc.
+These are the values that result at the default paper size
+@code{a4}.  For reference, with @code{a4} paper the
+@code{paper-height} is @code{297\mm} and the @code{paper-width} is
+@code{210\mm}.
 
-Margins, headers, and footers and other layout variables are
-automatically set according to the paper size.
-
-Default margin values are accessible in
-@file{ly/@/paper@/-defaults@/-init@/.ly}.  They apply to the default
-paper size (a4, unless specified differently) and are scaled
-accordingly for other paper sizes.
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly},
+@file{scm/paper.scm}.
 
-This section lists and describes a number of paper variables that
-may be altered.
 
-@menu
-* Fixed vertical dimensions::
-* Flexible vertical dimensions::
-* Horizontal dimensions::
-* Other layout variables::
-@end menu
+@node Fixed vertical spacing \paper variables
+@subsection Fixed vertical spacing @code{\paper} variables
 
+@warning{Some @code{@bs{}paper} dimensions are automatically
+scaled to the paper size, which may lead to unexpected behavior.
+See @ref{Automatic scaling to paper size}.}
 
-@node Fixed vertical dimensions
-@unnumberedsubsubsec Fixed vertical dimensions
+Default values (before scaling) are defined in
+@file{ly/paper-defaults-init.ly}.
 
 @table @code
 @item paper-height
 @funindex paper-height
 
-The height of the page.  Default: the height of the current paper
-size.  For details, see @ref{Paper size}.
+The height of the page, unset by default.  Note that the automatic
+scaling of some vertical dimensions is not affected by this.
 
 @item top-margin
 @funindex top-margin
 
 The margin between the top of the page and the top of the
-printable area.  Default: @code{5\mm}.
+printable area.  If the paper size is modified, this dimension's
+default value is scaled accordingly.
 
 @item bottom-margin
 @funindex bottom-margin
 
 The margin between the bottom of the printable area and the bottom
-of the page.  Default: @code{6\mm}.
+of the page.  If the paper size is modified, this dimension's
+default value is scaled accordingly.
+
+@item ragged-bottom
+@funindex ragged-bottom
+
+If set to true, systems will not spread vertically down the page.
+This does not affect the last page.  This should be set to true
+for pieces that have only two or three systems per page, for
+example orchestral scores.
+
+@item ragged-last-bottom
+@funindex ragged-last-bottom
+
+If set to false, systems will spread vertically down the last
+page.  Pieces that amply fill two pages or more should have this
+set to true.  It also affects the last page of book parts, i.e.
+parts of a book created with @code{\bookpart} blocks.
+
 @end table
 
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
+
+Snippets:
+@rlsr{Spacing}.
+
+@knownissues
+
+The titles (from the @code{\header} block) are treated as a
+system, so @code{ragged-bottom} and @code{ragged-last-bottom} will
+add space between the titles and the first system of the score.
 
-@node Flexible vertical dimensions
-@unnumberedsubsubsec Flexible vertical dimensions
+
+@node Flexible vertical spacing \paper variables
+@subsection Flexible vertical spacing @code{\paper} variables
 
 In most cases, it is preferable for the vertical distances between
 certain items (such as margins, titles, systems, and separate
@@ -231,46 +365,57 @@ of these dimensions.
 Note that the @code{\paper} variables discussed in this section do
 not control the spacing of staves within individual systems.
 Within-system spacing is controlled by grob properties, with
-settings typically entered inside a @code{\score} or @code{layout}
-block, and not inside a @code{\paper} block.  See
+settings typically entered inside a @code{\score} or
+@code{\layout} block, and not inside a @code{\paper} block.  See
 @ref{Flexible vertical spacing within systems}.
 
+@menu
+* Structure of flexible vertical spacing alists::
+* List of flexible vertical spacing \paper variables::
+@end menu
+
 
-@subsubheading Structure of spacing alists for @code{\paper} variables
+@node Structure of flexible vertical spacing alists
+@unnumberedsubsubsec Structure of flexible vertical spacing alists
 
-Each of these variables is an alist (association list) containing
-four @emph{keys}:
+Each of the flexible vertical spacing @code{\paper} variables is
+an alist (association list) containing four @emph{keys}:
 
 @itemize
-@item @code{padding} -- the minimum required amount of
-unobstructed vertical whitespace between two items, measured in
-staff-spaces.  This can be thought of as the minimum height of an
-unobstructed (invisible) rectangle that extends from the leftmost
-to the rightmost point of the combined items.
-
-@item @code{space} -- the default vertical distance, measured in
-staff-spaces, between the @emph{reference points} of the two
-items, when no collisions would result, and no stretching or
-compressing is in effect.  The reference point of a (title or
-top-level) markup is its highest point, and the reference point of
-a system is the vertical center of the nearest @code{StaffSymbol}
--- even if a non-staff line (such as a @code{Lyrics} context) is
-in the way.  Values for @code{space} that are less than either
-@code{padding} or @code{minimum-distance} are not meaningful,
-since the resulting distance will never be less than either
-@code{padding} or @code{minimum-distance}.
-
-@item @code{minimum-distance} -- the minimum required vertical
+
+@item
+@code{padding} -- the minimum required amount of unobstructed
+vertical whitespace between two items, measured in staff-spaces.
+This can be thought of as the minimum height of an unobstructed
+(invisible) rectangle that extends from the leftmost to the
+rightmost point of the combined items.
+
+@item
+@code{space} -- the vertical distance, measured in staff-spaces,
+between the @emph{reference points} of the two items, when no
+collisions would result, and no stretching or compressing is in
+effect.  The reference point of a (title or top-level) markup is
+its highest point, and the reference point of a system is the
+vertical center of the nearest @code{StaffSymbol} -- even if a
+non-staff line (such as a @code{Lyrics} context) is in the way.
+Values for @code{space} that are less than either @code{padding}
+or @code{minimum-distance} are not meaningful, since the resulting
+distance will never be less than either @code{padding} or
+@code{minimum-distance}.
+
+@item
+@code{minimum-distance} -- the smallest allowable vertical
 distance, measured in staff-spaces, between the reference points
 of the two items, when compressing is in effect.  Values for
 @code{minimum-distance} that are less than @code{padding} are not
 meaningful, since the resulting distance will never be less than
 @code{padding.}
 
-@item @code{stretchability} -- a unitless measure of the
-dimension's relative propensity to stretch.  If zero, the distance
-will not stretch (unless collisions would result).  When positive,
-the significance of a particular dimension's @code{stretchability}
+@item
+@code{stretchability} -- a unitless measure of the dimension's
+relative propensity to stretch.  If zero, the distance will not
+stretch (unless collisions would result).  When positive, the
+significance of a particular dimension's @code{stretchability}
 value lies only in its relation to the @code{stretchability}
 values of the other dimensions.  For example, if one dimension has
 twice the @code{stretchability} of another, it will stretch twice
@@ -281,30 +426,35 @@ spring.  If unset, the default value is set to @code{space}.  Note
 that the dimension's propensity to @emph{compress} cannot be
 directly set by the user and is equal to
 (@code{space}@tie{}@minus{}@tie{}@code{minimum-distance}).
+
 @end itemize
 
 If a page has a ragged bottom, the resulting distance is the
 largest of:
 
 @itemize
-@item @code{space},
-@item @code{minimum-distance}, and
-@item @code{padding} plus the smallest distance necessary to
-eliminate collisions.
+
+@item
+@code{space},
+
+@item
+@code{minimum-distance}, and
+
+@item
+@code{padding} plus the smallest distance necessary to eliminate
+collisions.
+
 @end itemize
 
 Specific methods for modifying alists are discussed in
-@ref{Modifying alists}.  The flexible vertical @code{\paper}
-dimensions variables can only be set within a @code{\paper} block.
-
-The following example demonstrates the two ways these alists can
-be modified.  The first declaration updates one key-value
-individually, and the second complete re-defines the variable:
+@ref{Modifying alists}.  The following example demonstrates the
+two ways these alists can be modified.  The first declaration
+updates one key-value individually, and the second completely
+redefines the variable:
 
 @example
 \paper @{
   system-system-spacing #'space = #8
-
   score-system-spacing =
     #'((padding . 1)
        (space . 12)
@@ -313,11 +463,9 @@ individually, and the second complete re-defines the variable:
 @}
 @end example
 
-The initialized default settings for these variables are defined
-in @file{ly/paper-defaults-init.ly}.
 
-
-@subsubheading Flexible vertical dimension @code{\paper} variables
+@node List of flexible vertical spacing \paper variables
+@unnumberedsubsubsec List of flexible vertical spacing @code{\paper} variables
 
 The names of these variables follow the format
 @code{@var{upper}-@var{lower}-spacing}, where @code{@var{upper}}
@@ -327,7 +475,12 @@ description of the alist structure above).  Note that in these
 variable names, the term @q{@code{markup}} refers to both
 @emph{title markups} (@code{bookTitleMarkup} or
 @code{scoreTitleMarkup}) and @emph{top-level markups} (see
-@ref{File structure}).
+@ref{File structure}).  All distances are measured in
+staff-spaces.
+
+Default settings are defined in @file{ly/paper-defaults-init.ly}.
+
+@c TODO: Where do headers/footers fit in? -mp
 
 @table @code
 @item markup-system-spacing
@@ -381,288 +534,301 @@ of the top margin) to the first (title or top-level) markup on a
 page, when there is no system between the two.
 @end table
 
+@seealso
+Notation Reference:
+@ref{Flexible vertical spacing within systems}.
 
-@snippets
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
 
-The header and footer are created by the functions
-@code{make-footer} and @code{make-header}, defined in
-@code{\paper}.  The default implementations are in
-@file{ly/paper-defaults.ly} and @file{ly/titling-init.ly}.
+Snippets:
+@rlsr{Spacing}.
 
-The page layout itself is done by two functions in the
-@code{\paper} block, @code{page-music-height} and
-@code{page-make-stencil}.  The former tells the line-breaking
-algorithm how much space can be spent on a page, the latter
-creates the actual page given the system to put on it.
 
-You can define @code{\paper} block values in Scheme.  In that case
-@code{mm}, @code{in}, @code{pt}, and @code{cm} are variables
-defined in @file{paper-defaults.ly} with values in millimeters.
-That is why the value @w{@code{2 cm}} must be multiplied in the
-example:
+@node Horizontal spacing \paper variables
+@subsection Horizontal spacing @code{\paper} variables
 
-@example
-\paper @{
- #(define bottom-margin (* 2 cm))
-@}
-@end example
+@warning{Some @code{@bs{}paper} dimensions are automatically
+scaled to the paper size, which may lead to unexpected behavior.
+See @ref{Automatic scaling to paper size}.}
 
+@menu
+* \paper variables for widths and margins::
+* \paper variables for two-sided mode::
+* \paper variables for shifts and indents::
+@end menu
 
-Example:
 
-@example
-\paper @{
-  paper-width = 2\cm
-  top-margin = 3\cm
-  bottom-margin = 3\cm
-  ragged-last-bottom = ##t
-@}
-@end example
+@node \paper variables for widths and margins
+@unnumberedsubsubsec @code{\paper} variables for widths and margins
 
-This second example centers page numbers at the bottom of every page.
+Default values (before scaling) that are not listed here are
+defined in @file{ly/paper-defaults-init.ly}.
 
-@example
-\paper @{
-  print-page-number = ##t
-  print-first-page-number = ##t
-  oddHeaderMarkup = \markup \fill-line @{ " " @}
-  evenHeaderMarkup = \markup \fill-line @{ " " @}
-  oddFooterMarkup = \markup @{ \fill-line @{
-     \bold \fontsize #3 \on-the-fly #print-page-number-check-first
-     \fromproperty #'page:page-number-string @} @}
-  evenFooterMarkup = \markup @{ \fill-line @{
-     \bold \fontsize #3 \on-the-fly #print-page-number-check-first
-     \fromproperty #'page:page-number-string @} @}
-@}
-@end example
+@table @code
 
-@seealso
-Notation Reference:
-@ref{Flexible vertical spacing within systems}.
+@item paper-width
+@funindex paper-width
 
-Snippets:
-@rlsr{Spacing}.
+The width of the page, unset by default.  While @code{paper-width}
+has no effect on the automatic scaling of some horizontal
+dimensions, it does influence the @code{line-width} variable.  If
+both @code{paper-width} and @code{line-width} are set, then
+@code{left-margin} and @code{right-margin} will also be updated.
+Also see @code{check-consistency}.
 
+@item line-width
+@funindex line-width
 
-@node Horizontal dimensions
-@unnumberedsubsubsec Horizontal dimensions
+The horizontal extent of the staff lines in unindented, non-ragged
+systems, equal to
+@code{(paper-width@tie{}@minus{}@tie{}left-margin@tie{}@minus{}@tie{}right-margin)}
+when unset.  If @code{line-width} is set, and both
+@code{left-margin} and @code{right-margin} are unset, then the
+margins will be updated to center the systems on the page
+automatically.  Also see @code{check-consistency}.
 
+@item left-margin
+@funindex left-margin
 
-There are a few variables that determine the horizontal dimensions
-on a page:
+The margin between the left edge of the page and the start of the
+staff lines in unindented systems.  If the paper size is modified,
+this dimension's default value is scaled accordingly.  If
+@code{left-margin} is unset, and both @code{line-width} and
+@code{right-margin} are set, then @code{left-margin} is set to
+@code{(paper-width@tie{}@minus{}@tie{}line-width@tie{}@minus{}@tie{}right-margin)}.
+If only @code{line-width} is set, then both margins are set to
+@code{((paper-width@tie{}@minus{}@tie{}line-width)@tie{}/@tie{}2)},
+and the systems are consequently centered on the page.  Also see
+@code{check-consistency}.
 
-@table @code
+@item right-margin
+@funindex right-margin
 
-@item binding-offset
-@funindex binding-offset
+The margin between the right edge of the page and the end of the
+staff lines in non-ragged systems.  If the paper size is modified,
+this dimension's default value is scaled accordingly.  If
+@code{right-margin} is unset, and both @code{line-width} and
+@code{left-margin} are set, then @code{right-margin} is set to
+@code{(paper-width@tie{}@minus{}@tie{}line-width@tie{}@minus{}@tie{}left-margin)}.
+If only @code{line-width} is set, then both margins are set to
+@code{((paper-width@tie{}@minus{}@tie{}line-width)@tie{}/@tie{}2)},
+and the systems are consequently centered on the page.  Also see
+@code{check-consistency}.
 
-The amount @code{inner-margin} is increased
-to make sure nothing will be hidden by the binding.
-Works only with @code{two-sided} set to true.  Default:
-@code{0}.
+@item check-consistency
+@funindex check-consistency
 
-@item horizontal-shift
-@funindex horizontal-shift
+If set to true, print a warning if @code{left-margin},
+@code{line-width}, and @code{right-margin} do not exactly add up
+to @code{paper-width}, and replace each of these (except
+@code{paper-width}) with its default value (scaled to the paper
+size if necessary).  If set to false, ignore any inconsistencies
+and allow systems to run off the edge of the page.
 
-The amount that all systems (including titles and system
-separators) are shifted to the right.  Default: @code{0.0}.
+@item ragged-right
+@funindex ragged-right
 
-@item indent
-@funindex indent
+If set to true, systems will not fill the line width.  Instead,
+systems end at their natural horizontal length.  Default:
+@code{#t} for scores with only one system, and @code{#f} for
+scores with two or more systems.  This variable can also be set in
+a @code{\layout} block.
+
+@item ragged-last
+@funindex ragged-last
 
-The level of indentation for the first system in a score.
-Default: @code{15\mm}.
+If set to true, the last system in the score will not fill the
+line width.  Instead the last system ends at its natural
+horizontal length.  Default: @code{#f}.  This variable can also be
+set in a @code{\layout} block.
 
-@item inner-margin
-@funindex inner-margin
+@end table
+
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
 
-The margin all pages have at the inner side if they are part
-of a book.  Works only with @code{two-sided} set to true.
-Default: @code{10\mm}.
 
-@item left-margin
-@funindex left-margin
+@node \paper variables for two-sided mode
+@unnumberedsubsubsec @code{\paper} variables for two-sided mode
 
-The margin between the left edge of the page and the beginning of
-each system.  Default: @code{10\mm}.
+Default values (before scaling) are defined in
+@file{ly/paper-defaults-init.ly}.
 
-@item line-width
-@funindex line-width
+@table @code
 
-The width of music systems.  Default: @code{paper-width} minus
-@code{left-margin} and @code{right-margin}.
+@item two-sided
+@funindex two-sided
+
+@cindex gutter
+@cindex binding gutter
+
+If set to true, use @code{inner-margin}, @code{outer-margin} and
+@code{binding-offset} to determine margins depending on whether
+the page number is odd or even.  This overrides @code{left-margin}
+and @code{right-margin}.
+
+@item inner-margin
+@funindex inner-margin
+
+The margin all pages have at the inner side if they are part of a
+book.  If the paper size is modified, this dimension's default
+value is scaled accordingly.  Works only with @code{two-sided} set
+to true.
 
 @item outer-margin
 @funindex outer-margin
 
-The margin all pages have at the outer side if they are part
-of a book.  Works only with @code{two-sided} set to true.
-Default: @code{20\mm}.
+The margin all pages have at the outer side if they are part of a
+book.  If the paper size is modified, this dimension's default
+value is scaled accordingly.  Works only with @code{two-sided} set
+to true.
 
-@item paper-width
-@funindex paper-width
+@item binding-offset
+@funindex binding-offset
 
-The width of the page.  Default: the width of the current paper
-size.  For details, see @ref{Paper size}.
+The amount @code{inner-margin} is increased to make sure nothing
+will be hidden by the binding.  If the paper size is modified,
+this dimension's default value is scaled accordingly.  Works only
+with @code{two-sided} set to true.
 
-@item right-margin
-@funindex right-margin
+@end table
+
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
+
+
+@node \paper variables for shifts and indents
+@unnumberedsubsubsec @code{\paper} variables for shifts and indents
+
+Default values (before scaling) that are not listed here are
+defined in @file{ly/paper-defaults-init.ly}.
+
+@table @code
 
-The margin between the right edge of the page and the end of
-each system.  Default: @code{10\mm}.
+@item horizontal-shift
+@funindex horizontal-shift
+
+@c This default value is buried in the middle of page.scm.  -mp
+
+The amount that all systems (including titles and system
+separators) are shifted to the right.  Default: @code{0.0\mm}.
+
+@item indent
+@funindex indent
+
+The level of indentation for the first system in a score.  If the
+paper size is modified, this dimension's default value is scaled
+accordingly.  This variable can also be set in a @code{\layout}
+block.
 
 @item short-indent
 @funindex short-indent
 
 The level of indentation for all systems in a score besides the
-first system.  Default: @code{0}.
+first system.  If the paper size is modified, this dimension's
+default value is scaled accordingly.  This variable can also be
+set in a @code{\layout} block.
 
 @end table
 
-If some values are not set, defaults will be taken.  Their exact
-value is adjusted, depending on the paper size specified.  Currently,
-the following values are affected by this scaling:
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
 
-@itemize
-@item @var{left-margin}
-@item @var{right-margin}
-@item @var{top-margin}
-@item @var{bottom-margin}
-@item @var{head-separation}
-@item @var{foot-separation}
-@item @var{indent}
-@item @var{short-indent}
-@end itemize
+Snippets:
+@rlsr{Spacing}.
 
-The settings for @code{line-width}, @code{left-margin},
-@code{right-margin} and @code{paper-width} depend on
-each other, but they do not have to be specified
-completely.
 
-@example
-\paper @{
-  left-margin = 30\mm
-@}
-@end example
+@node Other \paper variables
+@subsection Other @code{\paper} variables
 
-In this example, only @code{left-margin} is set.  The value for
-@code{right-margin} will remain default, @code{line-width} is
-calculated automatically.
+@menu
+* \paper variables for line breaking::
+* \paper variables for page breaking::
+* \paper variables for page numbering::
+* Miscellaneous \paper variables::
+@end menu
 
-@example
-\paper @{
-  line-width = 150\mm
-@}
-@end example
 
-Here @code{left-margin} and @code{right-margin} will be set
-to the same value.  Therefore, @code{line-width} is subtracted
-from @code{paper-width} and divided by two.  That means systems
-are centered on the page, if only @code{line-width} is
-specified.
+@node \paper variables for line breaking
+@unnumberedsubsubsec @code{\paper} variables for line breaking
 
-Some checks occur to ensure the values are set correctly.
-If the values do not match or systems would run off the page,
-a warning is printed and default values are set.
+@c TODO: Mention that ly:optimal-breaking is on by default? -mp
 
-@example
-\paper @{
-  paper-width = 210\mm
-  left-margin = 20\mm
-  right-margin = 30\mm
-  line-width = 100\mm
-@}
-@end example
+@table @code
 
-These checks can be avoided by setting @code{check-consistency}
-to false.
+@item max-systems-per-page
+@funindex max-systems-per-page
 
-@example
-\paper @{
-  paper-width = 210\mm
-  left-margin = 20\mm
-  line-width = 200\mm
-  check-consistency = ##f
-@}
-@end example
+The maximum number of systems that will be placed on a page.  This
+is currently supported only by the @code{ly:optimal-breaking} algorithm.
+Default: unset.
 
-@warning{If @code{paper-width} is manually set, @code{line-width},
-@code{left-margin}, @code{indent}, and @code{short-indent} may
-have to be adjusted as well.}
+@item min-systems-per-page
+@funindex min-systems-per-page
 
-@seealso
-Snippets:
-@rlsr{Spacing}.
+The minimum number of systems that will be placed on a page.  This
+may cause pages to be overfilled if it is made too large.  This is
+currently supported only by the @code{ly:optimal-breaking} algorithm.
+Default: unset.
 
+@item systems-per-page
+@funindex systems-per-page
 
+The number of systems that should be placed on each page.
+This is currently supported only by the @code{ly:optimal-breaking} algorithm.
+Default: unset.
 
-@node Other layout variables
-@unnumberedsubsubsec Other layout variables
+@item system-count
+@funindex system-count
 
-These variables can be used to adjust page layout in general.
+The number of systems to be used for a score.  Default: unset.
+This variable can also be set in a @code{\layout} block.
 
-@table @code
+@end table
 
-@item auto-first-page-number
-@funindex auto-first-page-number
+@seealso
+Notation Reference:
+@ref{Line breaking}.
 
-The page breaking algorithm is affected by the first page number
-being odd or even.  If set to true, the page breaking algorithm
-will decide whether to start with an odd or even number.  This
-will result in the first page number remaining as is or being
-increased by one.  Default: @code{##f}.
 
-@ignore
+@node \paper variables for page breaking
+@unnumberedsubsubsec @code{\paper} variables for page breaking
+
+Default values not listed here are defined in
+@file{ly/paper-defaults-init.ly}
+
+@table @code
 
-TODO: this variable is used, but I don't know what it does. -pm
 @item blank-after-score-page-force
 @funindex blank-after-score-page-force
 
-Default: @code{2}.
-
-@end ignore
+The penalty for having a blank page after the end of one score and
+before the next.  By default, this is smaller than
+@code{blank-page-force}, so that we prefer blank pages after
+scores to blank pages within a score.
 
 @item blank-last-page-force
 @funindex blank-last-page-force
 
 The penalty for ending the score on an odd-numbered page.
-Default: @code{0}.
 
 @item blank-page-force
 @funindex blank-page-force
 
 The penalty for having a blank page in the middle of a
 score.  This is not used by @code{ly:optimal-breaking} since it will
-never consider blank pages in the middle of a score.  Default:
-@code{5}.
-
-@item check-consistency
-@funindex check-consistency
-
-If set to true, check whether @code{left-margin}, @code{right-margin} and
-@code{line-width} fit each other.  Also make sure that their combination
-does not exceed the available @code{paper-width}.  Default: @code{##t}.
-
-@item first-page-number
-@funindex first-page-number
-
-The value of the page number on the first page.  Default:
-@code{#1}.
-
-@item max-systems-per-page
-@funindex max-systems-per-page
-
-The maximum number of systems that will be placed on a page.  This
-is currently supported only by the @code{ly:optimal-breaking} algorithm.
-Default: unset.
+never consider blank pages in the middle of a score.
 
-@item min-systems-per-page
-@funindex min-systems-per-page
+@item page-breaking
+@funindex page-breaking
 
-The minimum number of systems that will be placed on a page.  This
-may cause pages to be overfilled if it is made too large.  This is
-currently supported only by the @code{ly:optimal-breaking} algorithm.
-Default: unset.
+The page-breaking algorithm to use.  Choices are
+@code{ly:minimal-breaking}, @code{ly:page-turn-breaking}, and
+@code{ly:optimal-breaking}.
 
 @item page-breaking-system-system-spacing
 @funindex page-breaking-system-system-spacing
@@ -677,120 +843,110 @@ page-breaker will put fewer systems on each page.  Default: unset.
 @item page-count
 @funindex page-count
 
-The number of pages to be used for a score.  Default: unset.
+The number of pages to be used for a score, unset by default.
 
-@item page-spacing-weight
-@funindex page-spacing-weight
+@end table
 
-The relative importance of page (vertical) spacing and line
-(horizontal) spacing.  High values will make page spacing more
-important.  Default: @code{#10}.
+@seealso
+Notation Reference:
+@ref{Page breaking},
+@ref{Optimal page breaking},
+@ref{Optimal page turning},
+@ref{Minimal page breaking}.
 
-@item print-all-headers
-@funindex print-all-headers
+Installed files:
+@file{ly/paper-defaults-init.ly}.
+
+
+@node \paper variables for page numbering
+@unnumberedsubsubsec @code{\paper} variables for page numbering
+
+Default values not listed here are defined in
+@file{ly/paper-defaults-init.ly}
+
+@table @code
+
+@item auto-first-page-number
+@funindex auto-first-page-number
+
+The page breaking algorithm is affected by the first page number
+being odd or even.  If set to true, the page breaking algorithm
+will decide whether to start with an odd or even number.  This
+will result in the first page number remaining as is or being
+increased by one.  Default: @code{#f}.
+
+@item first-page-number
+@funindex first-page-number
 
-If set to true, this will print all headers for each \score in the
-output.  Normally only the piece and opus header variables are
-printed.  Default: @code{##f}.
+The value of the page number on the first page.
 
 @item print-first-page-number
 @funindex print-first-page-number
 
 If set to true, a page number is printed on the first page.
-Default: @code{##f}.
 
 @item print-page-number
 @funindex print-page-number
 
-If set to false, page numbers are not printed.  Default:
-@code{##t}.
+If set to false, page numbers are not printed.
 
-@item ragged-bottom
-@funindex ragged-bottom
-
-If set to true, systems will not spread vertically across the
-page.  This does not affect the last page.  Default: @code{##f}.
-
-This should be set to true for pieces that have only two or three
-systems per page, for example orchestral scores.
-
-@item ragged-last
-@funindex ragged-last
+@end table
 
-If set to true, the last system in the score will not fill the
-line width.  Instead the last system ends at its natural
-horizontal length.  Default: @code{##f}.
+@seealso
+Installed Files:
+@file{ly/paper-defaults-init.ly}.
 
-@item ragged-last-bottom
-@funindex ragged-last-bottom
 
-If set to false, systems will spread vertically across the last
-page.  Default: @code{##t}.
+@node Miscellaneous \paper variables
+@unnumberedsubsubsec Miscellaneous @code{\paper} variables
 
-Pieces that amply fill two pages or more should have this set to
-true.
+@table @code
 
-It also affects the last page of book parts, ie parts of a book created
-with @code{\bookpart} blocks.
+@item page-spacing-weight
+@funindex page-spacing-weight
 
-@item ragged-right
-@funindex ragged-right
+The relative importance of page (vertical) spacing and line
+(horizontal) spacing.  High values will make page spacing more
+important.  Default: @code{#10}.
 
-If set to true, systems will not fill the line width.  Instead,
-systems end at their natural horizontal length.  Default:
-@code{##f}.
+@item print-all-headers
+@funindex print-all-headers
 
-If the score has only one system, the default value is @code{##t}.
+If set to true, this will print all headers for each @code{\score}
+in the output.  Normally only the @code{piece} and @code{opus}
+header variables are printed.  Default: @code{#f}.
 
 @item system-separator-markup
 @funindex system-separator-markup
 
-A markup object that is inserted between systems.  This is often
-used for orchestral scores.  Default: unset.
+A markup object that is inserted between systems, often used for
+orchestral scores.  Default: unset.  The @code{\slashSeparator}
+markup, defined in @file{ly/titling-init.ly}, is provided as a
+sensible default, for example:
 
-The markup command @code{\slashSeparator} is provided as a sensible
-default,  for example
+@lilypond[quote,verbatim,noragged-right,line-width=30\mm]
+#(set-default-paper-size "a8")
 
-@lilypond[quote,ragged-right]
-#(set-default-paper-size "a6" 'landscape)
 \book {
-  \score {
-    \relative c' { c1 \break c1 }
-  }
   \paper {
     system-separator-markup = \slashSeparator
   }
+  \header {
+    tagline = ##f
+  }
+  \score {
+    \relative c'' { c1 \break c1 \break c1 }
+  }
 }
 @end lilypond
 
-@item system-count
-@funindex system-count
-
-The number of systems to be used for a score.
-Default: unset.
-
-@item systems-per-page
-@funindex systems-per-page
-
-The number of systems that should be placed on each page.
-This is currently supported only by the @code{ly:optimal-breaking} algorithm.
-Default: unset.
-
-@item two-sided
-@funindex two-sided
-
-@cindex gutter
-@cindex binding gutter
-
-If set to true, use @code{inner-margin}, @code{outer-margin} and
-@code{binding-offset} to determine margins depending on whether
-the page number is odd or even.  This overrides @code{left-margin}
-and @code{right-margin}.  Default: @code{##f}.
-
 @end table
 
 
 @seealso
+Installed files:
+@file{ly/titling-init.ly}.
+
 Snippets:
 @rlsr{Spacing}.
 
@@ -800,20 +956,80 @@ Snippets:
 The default page header puts the page number and the @code{instrument}
 field from the @code{\header} block on a line.
 
-The titles (from the @code{\header@{@}} section) are treated as a
-system, so @code{ragged-bottom} and @code{ragged-last-bottom} will
-add space between the titles and the first system of the score.
 
+@node Score layout
+@section Score layout
 
-@node Music layout
-@section Music layout
+This section discusses score layout options for the @code{\layout}
+block.
 
 @menu
+* The \layout block::
 * Setting the staff size::
-* Score layout::
 @end menu
 
 
+@node The \layout block
+@subsection The @code{\layout} block
+
+@funindex \layout
+
+While the @code{\paper} block contains settings that relate to the
+page formatting of the whole document, the @code{\layout} block
+contains settings for score-specific layout.  To set score layout
+options globally, enter them in a toplevel @code{\layout} block.
+To set layout options for an individual score, enter them in a
+@code{\layout} block inside the @code{\score} block, after the
+music.  Settings that can appear in a @code{\layout} block
+include:
+
+@itemize
+@item the @code{layout-set-staff-size} scheme function,
+@item context modifications in @code{\context} blocks, and
+@item @code{\paper} variables that affect score layout.
+@end itemize
+
+The @code{layout-set-staff-size} function is discussed in the next
+section, @ref{Setting the staff size}.  Context modifications are
+discussed in a separate chapter; see
+@ref{Modifying context plug-ins} and
+@ref{Changing context default settings}.  The @code{\paper}
+variables that can appear in a @code{\layout} block are:
+
+@itemize
+@item @code{ragged-right}
+@item @code{ragged-last}
+@item @code{indent}
+@item @code{short-indent}
+@item @code{system-count}
+@end itemize
+
+Here is an example @code{\layout} block:
+
+@example
+\layout @{
+  indent = 2.0\cm
+  \context @{
+    \StaffGroup
+    \override StaffGrouper #'staff-staff-spacing #space = #8
+  @}
+  \context @{
+    \Voice
+    \override TextScript #'padding = #1.0
+    \override Glissando #'thickness = #3
+  @}
+@}
+@end example
+
+
+@seealso
+Notation Reference:
+@ref{Changing context default settings}.
+
+Snippets:
+@rlsr{Spacing}.
+
+
 @node Setting the staff size
 @subsection Setting the staff size
 
@@ -922,37 +1138,6 @@ Snippets:
 staff lines.
 
 
-@node Score layout
-@subsection Score layout
-
-@funindex \layout
-
-While @code{\paper} contains settings that relate to the page formatting
-of the whole document, @code{\layout} contains settings for score-specific
-layout.
-
-@example
-\layout @{
-  indent = 2.0\cm
-  \context @{ \Staff
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
-  @}
-  \context @{ \Voice
-    \override TextScript #'padding = #1.0
-    \override Glissando #'thickness = #3
-  @}
-@}
-@end example
-
-
-@seealso
-Notation Reference:
-@ref{Changing context default settings}.
-
-Snippets:
-@rlsr{Spacing}.
-
-
 @node Breaks
 @section Breaks
 
@@ -1047,12 +1232,12 @@ complicated.  More details are available in
 
 
 @seealso
-Internals Reference:
-@rinternals{LineBreakEvent}.
-
 Snippets:
 @rlsr{Spacing}.
 
+Internals Reference:
+@rinternals{LineBreakEvent}.
+
 
 @knownissues
 
@@ -1455,11 +1640,18 @@ Three separate mechanisms control the flexible vertical spacing
 within systems, one for each of the following categories:
 
 @itemize
-@item @emph{ungrouped staves},
-@item @emph{grouped staves} (staves within a staff-group such as
+
+@item
+@emph{ungrouped staves},
+
+@item
+@emph{grouped staves} (staves within a staff-group such as
 @code{ChoirStaff}, etc.), and
-@item @emph{non-staff lines} (such as @code{Lyrics},
-@code{ChordNames}, etc.).
+
+@item
+@emph{non-staff lines} (such as @code{Lyrics}, @code{ChordNames},
+etc.).
+
 @end itemize
 
 @c TODO: Clarify this.  This almost implies that non-staff lines
@@ -1475,7 +1667,7 @@ control the vertical spacing of staves and non-staff lines within
 individual systems.  The vertical spacing between separate
 systems, scores, markups, and margins is controlled by
 @code{\paper} variables, which are discussed in
-@ref{Flexible vertical dimensions}.
+@ref{Flexible vertical spacing \paper variables}.
 
 @menu
 * Within-system spacing properties::
@@ -1608,11 +1800,12 @@ labelContext =
 Each of the vertical spacing grob properties (except
 @code{staff-affinity}) is stored as an alist (association list),
 and each uses the same alist structure as the @code{\paper}
-spacing variables discussed in @ref{Flexible vertical dimensions}.
-Specific methods for modifying alists are discussed in
-@ref{Modifying alists}.  Grob properties should be adjusted with
-an @code{\override} inside a @code{\score} or @code{\layout}
-block, and not inside a @code{\paper} block.
+spacing variables discussed in
+@ref{Flexible vertical spacing \paper variables}.  Specific methods
+for modifying alists are discussed in @ref{Modifying alists}.
+Grob properties should be adjusted with an @code{\override} inside
+a @code{\score} or @code{\layout} block, and not inside a
+@code{\paper} block.
 
 The following example demonstrates the two ways these alists can
 be modified.  The first declaration updates one key-value
@@ -3053,7 +3246,7 @@ Snippets:
 
 The output of @code{annotate-spacing} reveals vertical dimensions
 in great detail.  For details about modifying margins and other
-layout variables, see @ref{Page formatting}.
+layout variables, see @ref{Page layout}.
 
 Other than margins, there are a few other options to save space:
 
@@ -3152,7 +3345,7 @@ block so that it applies to the whole score.
 
 @seealso
 Notation Reference:
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Changing horizontal spacing}.
 
 Snippets:
diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely
index b2bb70bbc9..c964305f23 100644
--- a/Documentation/notation/staff.itely
+++ b/Documentation/notation/staff.itely
@@ -377,7 +377,7 @@ turned on with a @code{\paper} option.
 
 @seealso
 Notation Reference:
-@ref{Page formatting}.
+@ref{Page layout}.
 
 Snippets:
 @rlsr{Staff notation}.
@@ -831,7 +831,7 @@ engraver:
 @end example
 
 For the Known issues and warnings associated with
-@code{\Staff \RemoveEmptyStaves} see 
+@code{\Staff \RemoveEmptyStaves} see
 @ref{Changing context default settings}.
 
 @node Writing parts
@@ -905,7 +905,7 @@ default.  To center multi-line instrument names,
 However, if the instrument names are longer, the instrument names
 in a staff group may not be centered unless the @code{indent} and
 @code{short-indent} settings are increased.  For details about
-these settings, see @ref{Horizontal dimensions}.
+these settings, see @ref{\paper variables for shifts and indents}.
 
 @lilypond[verbatim,quote,ragged-right]
 \layout {
@@ -1000,7 +1000,7 @@ expression to declare the instrument switch:
 
 @seealso
 Notation Reference:
-@ref{Horizontal dimensions},
+@ref{\paper variables for shifts and indents},
 @ref{Modifying context plug-ins}.
 
 Snippets:
@@ -1309,7 +1309,7 @@ bassoon = \relative c {
 
 Alternatively, Clef changes and instrument labels can be
 collected into an instrument definition for repeated use, using
-@code{\addInstrumentDefinition} described in 
+@code{\addInstrumentDefinition} described in
 @ref{Instrument names}.
 
 @funindex \transposedCueDuring
diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 93bab4abb7..aa33746150 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -2187,7 +2187,7 @@ the two systems.  See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
-@ref{Page formatting}.
+@ref{Page layout}.
 
 @end itemize
 
@@ -2233,7 +2233,7 @@ Notation Reference:
 @ref{Changing spacing},
 @ref{Displaying spacing},
 @ref{Fitting music onto fewer pages},
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Score layout},
 @ref{Separating systems},
 @ref{Setting the staff size},
@@ -2336,7 +2336,7 @@ See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
-@ref{Page formatting}.
+@ref{Page layout}.
 
 @item
 Dialogue cues and stage directions can be inserted with markup.
@@ -2357,7 +2357,7 @@ Notation Reference:
 @ref{Hiding staves},
 @ref{Instrument transpositions},
 @ref{Nested staff groups},
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Separating systems},
 @ref{Transpose},
 @ref{Writing parts},
diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 36127b7cfc..710f162c3c 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los símbolos específicos de acordeón discanto se escriben mediante
 @code{\\markup}.  Se puede trucar la colocación vertical de los
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 c80acd4ce3..9a60046300 100644
--- a/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords, ancient-notation, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al escribir un bajo cifrado, existe una forma de especificar si
 queremos que las cifras se sitúen encima o debajo de las notas del
@@ -28,15 +28,15 @@ truco se aplique a toda la partitura.
   doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes"
 
   texidoc = "
-When writing a figured bass, here's a way to specify if you want your
-figures to be placed above or below the bass notes, by defining the
-@code{BassFigureAlignmentPositioning #'direction} property (exclusively
-in a @code{Staff} context). Choices are @code{#UP} (or @code{#1}),
-@code{#CENTER} (or @code{#0}) and @code{#DOWN} (or @code{#-1}).
+When writing a figured bass, you can place the figures above or below
+the bass notes, by defining the @code{BassFigureAlignmentPositioning
+#'direction} property (exclusively in a @code{Staff} context). Choices
+are @code{#UP} (or @code{#1}), @code{#CENTER} (or @code{#0}) and
+@code{#DOWN} (or @code{#-1}).
 
-As you can see here, this property can be changed as many times as you
-wish. Use @code{\\once \\override} if you don't want the tweak to apply
-to the whole score.
+This property can be changed as many times as you wish. Use
+@code{\\once \\override} if you don't want the override to apply to the
+whole score.
 
 "
   doctitle = "Adding a figured bass above or below the notes"
diff --git a/Documentation/snippets/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
index 7ac1256fb6..d2025a496d 100644
--- a/Documentation/snippets/adding-ambitus-per-voice.ly
+++ b/Documentation/snippets/adding-ambitus-per-voice.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Añadir un ámbito por voz"
   texidoces = "
 Se puede añadir un ámbito por cada voz. En este caso, el ámbito se
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 9f3e5babec..9b9bbd0cde 100644
--- a/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
+++ b/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, breaks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al añadir un pentagrama nuevo en un salto de línea, por desgracia
 se añade un espacio adicional al final de la línea antes del salto
diff --git a/Documentation/snippets/adding-an-extra-staff.ly b/Documentation/snippets/adding-an-extra-staff.ly
index f1643c9398..d856224e7b 100644
--- a/Documentation/snippets/adding-an-extra-staff.ly
+++ b/Documentation/snippets/adding-an-extra-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede añadir (posiblemente de forma temporal) un pentagrama
 nuevo una vez que la pieza ha comenzado.
diff --git a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
index dd1ef9db88..aea3f60385 100644
--- a/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
+++ b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para añadir indicaciones de línea divisoria dentro del contexto de
 los nombres de acorde @code{ChordNames}, incluya el grabador
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 dd247f2796..e8228d84e0 100644
--- a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
+++ b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La sintaxis de LilyPond puede implicar muchas colocaciones poco
 comunes para los paréntesis, corchetes, etc, que a veces se tienen
diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 75a2cffa41..ea47f251d8 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, percussion"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Mediante la utilización de las potentes herramientas preconfiguradas
 como la función @code{\\drummode} y el contexto @code{DrumStaff}, la
diff --git a/Documentation/snippets/adding-fingerings-to-a-score.ly b/Documentation/snippets/adding-fingerings-to-a-score.ly
index 41dabea5a6..a8d2294d95 100644
--- a/Documentation/snippets/adding-fingerings-to-a-score.ly
+++ b/Documentation/snippets/adding-fingerings-to-a-score.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings"
diff --git a/Documentation/snippets/adding-fingerings-to-tablatures.ly b/Documentation/snippets/adding-fingerings-to-tablatures.ly
index d6a5253b9e..f9ecebe0a7 100644
--- a/Documentation/snippets/adding-fingerings-to-tablatures.ly
+++ b/Documentation/snippets/adding-fingerings-to-tablatures.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.17
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para añadir digitaciones a las tablaturas, utilice una combinación de
 @code{\\markup} y @code{\\finger}.
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 8ace4e152e..dda995cb99 100644
--- a/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
+++ b/Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \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 5d8afa643f..cf6895718b 100644
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -1,11 +1,12 @@
-% Do not edit this file; it is automatically
-% generated from Documentation/snippets/new
-% This file is in the public domain.
-%% Note: this file works from version 2.13.34
-\version "2.13.36"
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 5a7301fc350ffc3ab5bd3a2084c91666c9e9a549
+  lsrtags = "staff-notation, vocal-music"
+
+%% Translation of GIT committish: 4c1aa3b16f7b94ca32b0c022f60ed66826d031b0
 
   texidoces = "
    Este ejemplo muestra una forma de simplificar la adición de muchas
@@ -28,36 +29,34 @@ ellos.
 
 
 
-  lsrtags="vocal-music, staff-notation"
-  texidoc="
-  This shows one approach to simplify adding many orchestral cues to
-the piano reduction in a vocal score.  The music function
-@code{\\cueWhile} takes four arguments: the music from which the cue
-is to be taken, as defined by @code{\\addQuote}, the name to be
-inserted before the cue notes, then either @code{#UP} or @code{#DOWN}
-to specify either @code{\\voiceOne} with the name above the staff or
-@code{\\voiceTwo} with the name below the staff, and finally the piano
-music in parallel with which the cue notes are to appear.  The name
-of the quoted instrument is positioned to the left of the cue notes.
-Many passages can be cued, but they cannot overlap each other in time.
+  texidoc = "
+This shows one approach to simplify adding many orchestral cues to the
+piano reduction in a vocal score.  The music function @code{\\cueWhile}
+takes four arguments: the music from which the cue is to be taken, as
+defined by @code{\\addQuote}, the name to be inserted before the cue
+notes, then either @code{#UP} or @code{#DOWN} to specify either
+@code{\\voiceOne} with the name above the staff or @code{\\voiceTwo}
+with the name below the staff, and finally the piano music in parallel
+with which the cue notes are to appear.  The name of the cued
+instrument is positioned to the left of the cued notes. Many passages
+can be cued, but they cannot overlap each other in time.
+
 "
   doctitle = "Adding orchestral cues to a vocal score"
 } % begin verbatim
 
-
 cueWhile =
-  #(define-music-function
-    (parser location instrument name dir music)
-    (string? string? ly:dir? ly:music?)
-    #{
-      \cueDuring $instrument #$dir {
-        \once \override TextScript #'self-alignment-X = #RIGHT
-        \once \override TextScript #'direction = $dir
-        s1*0-\markup { \tiny $name }
-        $music
-      }
-    #}
-  )
+#(define-music-function
+   (parser location instrument name dir music)
+   (string? string? ly:dir? ly:music?)
+   #{
+     \cueDuring $instrument #$dir {
+       \once \override TextScript #'self-alignment-X = #RIGHT
+       \once \override TextScript #'direction = $dir
+       s1*0-\markup { \tiny $name }
+       $music
+     }
+   #})
 
 flute = \relative c'' {
   \transposition c'
@@ -104,4 +103,4 @@ pianoLH = \relative c { c4 <c' e> e, <g c> }
       }
     >>
   >>
-}
\ No newline at end of file
+}
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 95ffb0955f..2c9312b130 100644
--- a/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
+++ b/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La función @code{\\parenthesize} es un truco especial que encierra
 objetos entre paréntesis.  El grob asociado es @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 ebacb4be4b..54e6417e0b 100644
--- a/Documentation/snippets/adding-the-current-date-to-a-score.ly
+++ b/Documentation/snippets/adding-the-current-date-to-a-score.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, titles"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Con algo de código de Scheme, se puede añadir fácilmente la fecha
 actual a una partitura.
diff --git a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
index d0eab4521e..c2a04a0deb 100644
--- a/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
+++ b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El grabador @code{Volta_engraver} reside de forma predeterminada
 dentro del contexto de @code{Score}, y los corchetes de la repetición
diff --git a/Documentation/snippets/additional-voices-to-avoid-collisions.ly b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
index d8cf9d904b..e6db50c5ee 100644
--- a/Documentation/snippets/additional-voices-to-avoid-collisions.ly
+++ b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Voces adicionales para evitar colisiones"
  texidoces = "
 En ciertos casos de polifonía compleja, se necesitan voces adicionales
diff --git a/Documentation/snippets/adjusting-grace-note-spacing.ly b/Documentation/snippets/adjusting-grace-note-spacing.ly
index e23c509c8c..b438d0d57c 100644
--- a/Documentation/snippets/adjusting-grace-note-spacing.ly
+++ b/Documentation/snippets/adjusting-grace-note-spacing.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede ajustar la separación entre las notas de adorno utilizando la
 propiedad @code{spacing-increment} de @code{Score.GraceSpacing}.
diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index 8d462fdb1e..63470d4aaf 100644
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.16
+%% Note: this file works from version 2.13.39
 \version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 0b3f8eb5000541aacdb027a93db57c199fd8ba04
   texidoces = "
 Este fragmento de código muestra cómo situar la línea de base de la
 letra más cerca del pentagrama.
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 23e2331288..42ad82a5ea 100644
--- a/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
+++ b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Puede ser necesario trucar la propiedad
 @code{shortest-duration-space} para poder ajustar el tamaño de las
diff --git a/Documentation/snippets/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
index 7c61ae7576..47c7b87b97 100644
--- a/Documentation/snippets/aligning-and-centering-instrument-names.ly
+++ b/Documentation/snippets/aligning-and-centering-instrument-names.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La alineación horizontal de los nombres de instrumento se puede
 trucar modificando la propiedad @code{Staff.InstrumentName
diff --git a/Documentation/snippets/aligning-bar-numbers.ly b/Documentation/snippets/aligning-bar-numbers.ly
index 8cfa9b37da..efdfa948d9 100644
--- a/Documentation/snippets/aligning-bar-numbers.ly
+++ b/Documentation/snippets/aligning-bar-numbers.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Los números de compás se alinean de forma predeterminada por la
diff --git a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
index ea6114978f..b23f39a077 100644
--- a/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
+++ b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Si están especificadas, las marcas de texto se pueden alinear con
 objetos de notación distintos a las líneas divisorias.  Entre estos
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 2e467c5d65..c6b15c58ef 100644
--- a/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
+++ b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly b/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
index 4fa4f6940d..a3f591000e 100644
--- a/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, fretted-strings, spacing"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Las cifras de digitación orientadas verticalmente se colocan de forma
diff --git a/Documentation/snippets/altering-the-length-of-beamed-stems.ly b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
index 36c5bf0b95..dc93e75cc9 100644
--- a/Documentation/snippets/altering-the-length-of-beamed-stems.ly
+++ b/Documentation/snippets/altering-the-length-of-beamed-stems.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede variar la longitud de las plicas de las figuras unidas por
 una barra mediante la sobreescritura de la propiedad
diff --git a/Documentation/snippets/ambitus-with-multiple-voices.ly b/Documentation/snippets/ambitus-with-multiple-voices.ly
index b0c9cf070d..f11c48dc0f 100644
--- a/Documentation/snippets/ambitus-with-multiple-voices.ly
+++ b/Documentation/snippets/ambitus-with-multiple-voices.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, vocal-music"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Ámbitos con varias voces"
   texidoces = "
 La adición del grabador @code{Ambitus_engraver} al contexto de
diff --git a/Documentation/snippets/ambitus.ly b/Documentation/snippets/ambitus.ly
index eb8c490a9e..3207348f5f 100644
--- a/Documentation/snippets/ambitus.ly
+++ b/Documentation/snippets/ambitus.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, vocal-music"
diff --git a/Documentation/snippets/analysis-brackets-above-the-staff.ly b/Documentation/snippets/analysis-brackets-above-the-staff.ly
index 17df875954..ab2a228269 100644
--- a/Documentation/snippets/analysis-brackets-above-the-staff.ly
+++ b/Documentation/snippets/analysis-brackets-above-the-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 De forma predeterminada se añaden corchetes de análisis sencillos
 debajo del pentagrama.  El ejemplo siguiente muestra una manera de
diff --git a/Documentation/snippets/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly
index ba15affcd6..ccb7921591 100644
--- a/Documentation/snippets/ancient-fonts.ly
+++ b/Documentation/snippets/ancient-fonts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "ancient-notation"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Aquí se muestran muchos de (¿o quizá todos?) los símbolos que
 están contemplados por la capacidad de LilyPond para la música
diff --git a/Documentation/snippets/ancient-headword.ly b/Documentation/snippets/ancient-headword.ly
index 9477216504..7d7c8a2364 100644
--- a/Documentation/snippets/ancient-headword.ly
+++ b/Documentation/snippets/ancient-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
index ffab5846d1..401a5dafca 100644
--- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
+++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, ancient-notation, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este ejemplo muestra cómo hacer una transcripción moderna de canto
 gregoriano. El canto gregoriano no tiene compás ni plicas; utiliza
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 b188492205..df586afdc4 100644
--- a/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
+++ b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "ancient-notation, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al transcribir música mensural, es útil un «incipit» al compienzo
 de la pieza para indicar la tonalidad y el tempo
diff --git a/Documentation/snippets/ancient-time-signatures.ly b/Documentation/snippets/ancient-time-signatures.ly
index 338b18d1c2..f9e9ef8db8 100644
--- a/Documentation/snippets/ancient-time-signatures.ly
+++ b/Documentation/snippets/ancient-time-signatures.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "ancient-notation"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las indicaciones de compás también se pueden grabar en estilo antiguo.
 
diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index a7be84431e..fc11142deb 100644
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -1,10 +1,22 @@
-% Do not edit this file; it is automatically
-% generated from Documentation/snippets/new
-% This file is in the public domain.
-%% Note: this file works from version 2.13.32
-\version "2.13.32"
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.13.39"
 
 \header {
+  lsrtags = "vocal-music, template"
+
+%% Translation of GIT committish: 144cd434d02e6d90b2fb738eeee99119a7c5e1d2
+
+  texidocde = "
+Diese Vorlage zeigt eine Art, anglikanische Psalmengesänge zu setzen.  Hier
+wird auch gezeigt, wie Strophen als einfacher Text unter den Noten hinzugefügt
+werden können.  Zwei Strophen sind in unterschiedlicher Weise notiert um mehr
+Möglichkeiten darzustellen.
+"
+  doctitlede = "Vorlage für anglikanischen Psalm"
+
+
 %% Translation of GIT committish: 092f85605dcea69efff5ef31de4ff100346d6ef8
 
   texidocfr = "
@@ -17,17 +29,16 @@ plusieurs styles, comparez le code des deux couplets.
   doctitlefr = "Psalmodie anglicane"
 
 
-  lsrtags = "vocal-music, template"
   texidoc = "
 This template shows one way of setting out an Anglican psalm chant. It
 also shows how the verses may be added as stand-alone text under the
 music.  The two verses are coded in different styles to demonstrate
 more possibilities.
+
 "
   doctitle = "Anglican psalm template"
 } % begin verbatim
 
-
 SopranoMusic = \relative g' {
   g1 | c2 b | a1 | \bar "||"
   a1 | d2 c | c b | c1 | \bar "||"
diff --git a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
index b6ae0fda4d..64f0eebecc 100644
--- a/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
+++ b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Aplicar estilos de cabeza según la nota de la escala"
   texidoces = "
 La propiedad @code{shapeNoteStyles} se puede usar para definir varios
diff --git a/Documentation/snippets/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
index 4200fbccff..9ff4bba686 100644
--- a/Documentation/snippets/arabic-improvisation.ly
+++ b/Documentation/snippets/arabic-improvisation.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "world-music"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para las improvisaciones o @emph{taqasim} que son libres durante unos
 momentos, se puede omitir la indicación de compás y se puede usar
diff --git a/Documentation/snippets/asymmetric-slurs.ly b/Documentation/snippets/asymmetric-slurs.ly
index e7c9b66623..b4d6520b5f 100644
--- a/Documentation/snippets/asymmetric-slurs.ly
+++ b/Documentation/snippets/asymmetric-slurs.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede hacer que una ligadura de expresión sea asimétrica para
 adaptarse mejor a un patrón asimétrico de notas.
diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
index a08bd6b152..617086a741 100644
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden subdividir las barras automáticamente.  Estableciendo la
 propiedad @code{subdivideBeams}, las barras se subdividen en
diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index c776d63ff3..7df4deb9a1 100644
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
+  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
@@ -19,8 +21,6 @@ sobreescribir este comportamiento predeterminado.
   doctitlees = "Evitar colisiones con digitaciones de acordes"
 
 
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
-
   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/bar-chords-notation-for-guitar--with-text-spanner.ly b/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
index e02ccf632b..0cde5f8898 100644
--- a/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
+++ b/Documentation/snippets/bar-chords-notation-for-guitar--with-text-spanner.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords, fretted-strings"
diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index e35e1a2cef..aeab7d0c30 100644
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+%% Translation of GIT committish: cde045f4e833aa491fb63f2222e14bef49507577
   texidoces = "
 Las reglas de final de barra especificadas en el contexto
 @code{Score} se aplican a todos los pentagramas, pero se pueden
diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
index d478bdc5c2..f67ce8bc41 100644
--- a/Documentation/snippets/beam-grouping-in-7-8-time.ly
+++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 No está especificada ninguna agrupación predeterminada automática
 de las barras para el compás de 7/8, de forma que si se requieren
diff --git a/Documentation/snippets/beams-across-line-breaks.ly b/Documentation/snippets/beams-across-line-breaks.ly
index 4f4a308fa7..70b00be1ec 100644
--- a/Documentation/snippets/beams-across-line-breaks.ly
+++ b/Documentation/snippets/beams-across-line-breaks.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Normalmente están prohibidos los saltos de línea si las barras
 atraviesan las líneas divisorias.  Se puede cambiar este
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 7657a4038e..058126053f 100644
--- a/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
+++ b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La instrucción @code{\\whiteout} intercala un rectángulo blanco
 debajo de un elemento de marcado.  Este rectángulo blanco no tapa
diff --git a/Documentation/snippets/book-parts.ly b/Documentation/snippets/book-parts.ly
index 7a05b7dbae..022c2679e4 100644
--- a/Documentation/snippets/book-parts.ly
+++ b/Documentation/snippets/book-parts.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "paper-and-layout"
diff --git a/Documentation/snippets/breathing-signs.ly b/Documentation/snippets/breathing-signs.ly
index 9104013574..8e703f4df6 100644
--- a/Documentation/snippets/breathing-signs.ly
+++ b/Documentation/snippets/breathing-signs.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
index 60d43218c1..ac231acad3 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para hacer invisibles partes de un regulador de crescendo, se usa
 el método de dibujar un rectángulo blanco encima de la parte
diff --git a/Documentation/snippets/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
index 7331af6000..610121df0d 100644
--- a/Documentation/snippets/caesura-railtracks-with-fermata.ly
+++ b/Documentation/snippets/caesura-railtracks-with-fermata.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 A veces se denota una «cesura» mediante una doble marca de respiración
 parecida a las vías del tren, con un calderón encima. Este fragmento
diff --git a/Documentation/snippets/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
index 8c51f8bf15..fa48d0a37a 100644
--- a/Documentation/snippets/center-text-below-hairpin-dynamics.ly
+++ b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este ejemplo proporciona una función para tipografiar un regulador con
 texto por debajo, como @qq{molto} o @qq{poco}. El ejemplo ilustra
diff --git a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
index f76a23e5da..7b3eeb2c7b 100644
--- a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
+++ b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.15
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
   lsrtags = "text, tweaks-and-overrides, contexts-and-engravers"
diff --git a/Documentation/snippets/changing--flageolet-mark-size.ly b/Documentation/snippets/changing--flageolet-mark-size.ly
index 0f007d74c7..45b2fc0d09 100644
--- a/Documentation/snippets/changing--flageolet-mark-size.ly
+++ b/Documentation/snippets/changing--flageolet-mark-size.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, unfretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para hacer más pequeño el círculo de @code{\\flageolet} (armónico)
 utilice la siguiente función de Scheme.
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 ce419d83b9..e3c25c6dcb 100644
--- a/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
+++ b/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes, editorial-annotations, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden modificar notas individuales de un acorde con la instrucción
 @code{\\tweak}, alterando la propiedad @code{font-size}.
diff --git a/Documentation/snippets/changing-beam-knee-gap.ly b/Documentation/snippets/changing-beam-knee-gap.ly
index 785b848208..7e10afa19b 100644
--- a/Documentation/snippets/changing-beam-knee-gap.ly
+++ b/Documentation/snippets/changing-beam-knee-gap.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se insertan automáticamente barras en ángulo cuando se detecta un
 intervalo muy grande entre las notas.  Se puede hacer un ajuste
diff --git a/Documentation/snippets/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly
index f9b843571d..14cd06a49b 100644
--- a/Documentation/snippets/changing-chord-separator.ly
+++ b/Documentation/snippets/changing-chord-separator.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede establecer el separador entre las distintas partes del
 nombre de un acorde para que sea cualquier elemento de marcado.
diff --git a/Documentation/snippets/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
index 407a97a34a..4668729081 100644
--- a/Documentation/snippets/changing-form-of-multi-measure-rests.ly
+++ b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Cambiar la forma de los silencios multicompás"
  texidoces = "
 Si hay diez compases de silencio o menos, se imprime en el pentagrama
diff --git a/Documentation/snippets/changing-fret-orientations.ly b/Documentation/snippets/changing-fret-orientations.ly
index 2d3e4251e6..b6dcc7d391 100644
--- a/Documentation/snippets/changing-fret-orientations.ly
+++ b/Documentation/snippets/changing-fret-orientations.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
+  lsrtags = "fretted-strings"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
@@ -17,8 +19,6 @@ superior en las distintas alineaciones.
 
   doctitlees = "Modificar la orientación de los trastes"
 
-  lsrtags = "fretted-strings"
-
   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-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
index 07156528ad..8949b825b4 100644
--- a/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
+++ b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "contexts-and-engravers, midi"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al producir una salida MIDI, el comportamiento predeterminado es
 que cada pentagrama representa un canal MIDI, con todas las voces
diff --git a/Documentation/snippets/changing-partcombine-texts.ly b/Documentation/snippets/changing-partcombine-texts.ly
index 7301639fea..1690e6fde4 100644
--- a/Documentation/snippets/changing-partcombine-texts.ly
+++ b/Documentation/snippets/changing-partcombine-texts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al utilizar la posibilidad de combinación automática de partes, se
 puede modificar el texto que se imprime para las secciones de solo
diff --git a/Documentation/snippets/changing-properties-for-individual-grobs.ly b/Documentation/snippets/changing-properties-for-individual-grobs.ly
index 8e53a1ede8..8dcbd681cd 100644
--- a/Documentation/snippets/changing-properties-for-individual-grobs.ly
+++ b/Documentation/snippets/changing-properties-for-individual-grobs.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "tweaks-and-overrides"
diff --git a/Documentation/snippets/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
index 45b62754fd..ed0eb75453 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
index 8046cf38cc..9d1c6c2357 100644
--- a/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
+++ b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede modificar el texto empleado para los crescendos y
 decrescendos modificando las propiedades de contexto
diff --git a/Documentation/snippets/changing-the-ambitus-gap.ly b/Documentation/snippets/changing-the-ambitus-gap.ly
index 2ef754070e..fd9ff4d892 100644
--- a/Documentation/snippets/changing-the-ambitus-gap.ly
+++ b/Documentation/snippets/changing-the-ambitus-gap.ly
@@ -1,10 +1,10 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.26
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \header {
-%% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 Es posible ajustar la separación en las indicaciones de tesitura.
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 2595247084..334dd06f04 100644
--- a/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+++ b/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede cambiar el aspecto de las ligaduras de expresión de
 continuas a punteadas o intermitentes.
diff --git a/Documentation/snippets/changing-the-breath-mark-symbol.ly b/Documentation/snippets/changing-the-breath-mark-symbol.ly
index d58206a1fc..5d0703f6fe 100644
--- a/Documentation/snippets/changing-the-breath-mark-symbol.ly
+++ b/Documentation/snippets/changing-the-breath-mark-symbol.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El glifo de la marca de respiración se puede ajustar
 sobreescribiendo la propiedad de texto del objeto de presentación
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 4211d2046a..76aac50a88 100644
--- a/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
+++ b/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La nomenclatura inglesa (predeterminada) para los acordes del cifrado
 americano se puede cambiar por la alemana (@code{\\germanChords}
diff --git a/Documentation/snippets/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
index fdf766e58d..89d61cabb3 100644
--- a/Documentation/snippets/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/changing-the-default-text-font-family.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, tweaks-and-overrides"
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 8c6ec3a63c..4306a39465 100644
--- a/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly
+++ b/Documentation/snippets/changing-the-interval-of-lines-on-the-stave.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
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 36dd0ff44c..ed5b627685 100644
--- a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
+++ b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
@@ -1,10 +1,10 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.26
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \header {
-%% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 Este código muestra cómo cambiar la cantidad de puntillos de una nota.
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 5844f597ef..5714a92dd8 100644
--- a/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
+++ b/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
index c58c6b754f..e7f47044ef 100644
--- a/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
+++ b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las alteraciones y los signos «más» pueden aparecer antes o
 después de los números, según el valor de las propiedades
diff --git a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
index 1bc0e5feaf..585e6df4cc 100644
--- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
+++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.31
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
+%%%    Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
diff --git a/Documentation/snippets/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
index 0122225b4b..3feff91adb 100644
--- a/Documentation/snippets/changing-the-staff-size.ly
+++ b/Documentation/snippets/changing-the-staff-size.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
diff --git a/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
index 8645cd7710..a06a36a31a 100644
--- a/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
+++ b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides, midi"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para cambiar el tempo en la salida MIDI sin
 imprimir nada, hacemos invisible la indicación metronómica:
diff --git a/Documentation/snippets/changing-the-text-for-sustain-markings.ly b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
index 6c82f57366..64035db945 100644
--- a/Documentation/snippets/changing-the-text-for-sustain-markings.ly
+++ b/Documentation/snippets/changing-the-text-for-sustain-markings.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede usar @code{Staff.pedalSustainStrings} para fijar el texto de
 las indicaciones de pisar pedal y levantar pedal.  Observe que las
diff --git a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
index 8a444bb2da..153fa685b2 100644
--- a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
+++ b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.5
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La instrucción @code{\\time} establece las propiedades
 @code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping} y
diff --git a/Documentation/snippets/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly
index c664dcc1ae..4aa12f3e3c 100644
--- a/Documentation/snippets/changing-the-tuplet-number.ly
+++ b/Documentation/snippets/changing-the-tuplet-number.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Cambiar el número del grupo especial"
  texidoces = "
 
diff --git a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
index 5fdcb19150..fafa772f15 100644
--- a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
+++ b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La propiedad @code{measureLength}, junto con
 @code{measurePosition}, determina cuándo es necesario dibujar una
diff --git a/Documentation/snippets/chant-or-psalms-notation.ly b/Documentation/snippets/chant-or-psalms-notation.ly
index 9161eb3744..bceccdc32a 100644
--- a/Documentation/snippets/chant-or-psalms-notation.ly
+++ b/Documentation/snippets/chant-or-psalms-notation.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este tipo de notación se utiliza para el canto de los Salmos, en
 que las estrofas no siempre tienen la misma longitud.
diff --git a/Documentation/snippets/chord-name-exceptions.ly b/Documentation/snippets/chord-name-exceptions.ly
index 4679d3b5ab..195d92f9cf 100644
--- a/Documentation/snippets/chord-name-exceptions.ly
+++ b/Documentation/snippets/chord-name-exceptions.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede usar la propiedad @code{chordNameExceptions} para
 almacenar una lista de notaciones espaciales para acordes
diff --git a/Documentation/snippets/chord-name-major7.ly b/Documentation/snippets/chord-name-major7.ly
index d68f5ba14f..958afb7678 100644
--- a/Documentation/snippets/chord-name-major7.ly
+++ b/Documentation/snippets/chord-name-major7.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La presentación del acorde de séptima mayor se
 puede ajustar mediante majorSevenSymbol.
diff --git a/Documentation/snippets/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly
index 80e6b2c230..e1f87d069d 100644
--- a/Documentation/snippets/chordchanges-for-fretboards.ly
+++ b/Documentation/snippets/chordchanges-for-fretboards.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede hacer que los diagramas de posiciones se muestren sólo
 cuando el acorde cambia o al comienzo de una nueva línea.
diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly
index fd71dc5902..316ea6c1b9 100644
--- a/Documentation/snippets/chords-headword.ly
+++ b/Documentation/snippets/chords-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f
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 ab1cb5505a..178d097299 100644
--- a/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
+++ b/Documentation/snippets/clefs-can-be-transposed-by-arbitrary-amounts.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
index b004980c41..2cdc17f361 100644
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este código muestra cómo recortar (extraer) fragmentos a partir de una
 partitura completa.
diff --git a/Documentation/snippets/clusters.ly b/Documentation/snippets/clusters.ly
index 24443c9c3f..e460acd86a 100644
--- a/Documentation/snippets/clusters.ly
+++ b/Documentation/snippets/clusters.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes, chords, keyboards"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los «clusters» o racimos son un mecanismo para indicar la
 interpretación de un ámbito de notas al mismo tiempo.
diff --git a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
index 4d3c7a66ae..b23c964e25 100644
--- a/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
+++ b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, editorial-annotations"
diff --git a/Documentation/snippets/combining-dynamics-with-markup-texts.ly b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
index 7845a379e0..c1363f11bf 100644
--- a/Documentation/snippets/combining-dynamics-with-markup-texts.ly
+++ b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Ciertas indicaciones dinámicas pueden llevar textos (como @qq{più
 forte} o @qq{piano subito}). Se pueden producir usando un bloque
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 d40fc6b073..8b396029bd 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 La herramienta de combinación de partes (instrucción
diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index a12c86d650..ce22369ed5 100644
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Indicaciones de compases compuestos"
  texidoces = "
 Las indicaciones de compás poco frecuentes como @qq{5/8} se pueden
diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index bc8d207d39..2de8fd25d4 100644
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La agrupación de pulsos dentro de un compás está controlada por la
 propiedad de contexto @code{beatStructure}.  Hay establecidos valores
diff --git a/Documentation/snippets/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
index ae1a7e45d2..290e2fb86a 100644
--- a/Documentation/snippets/contemporary-glissando.ly
+++ b/Documentation/snippets/contemporary-glissando.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede tipografiar un gissando contemporáneo sin nota final
 utilizando una nota oculta y temporalización de cadenza.
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 e532cc7a0a..ed25870462 100644
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.1
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 La visibilidad de los objetos de extensión que acaban en la primera
diff --git a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
index bfdc4b8fa1..dd8434417c 100644
--- a/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
+++ b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, chords, keyboards, fretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede controlar con precisión la colocación de los números de
 digitación.  Para que se tenga en cuenta la orientación de las
@@ -30,9 +30,10 @@ Die Position von Fingersatzzahlen kann exakt kontrolliert werden.
 
   texidocfr = "
 Le positionnement des doigtés peut être contrôlé de manière très précise.
-
+Afin que l'orientation soit prise en compte, il est nécessaire d'utiliser
+une syntaxe d'accord @code{< >}, même s'il ne s'agit que d'une seule note.
 "
-  doctitlefr = "Conrôle du positionnement des doigtés"
+  doctitlefr = "Contrôler la position des doigtés dans un accord"
 
 
   texidoc = "
diff --git a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
index b7b4940d82..b3c32a0a77 100644
--- a/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
+++ b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El orden vertical que ocupan las inscripciones gráficas está
 controlado con la propiedad @code{'script-priority}. Cuanto más
diff --git a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
index 98af6eb714..6a933b94f8 100644
--- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
+++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly
index 84d16a3873..2865ee93b2 100644
--- a/Documentation/snippets/creating-a-delayed-turn.ly
+++ b/Documentation/snippets/creating-a-delayed-turn.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 texidoces = "
 La creación de un grupeto circular de anticipación entre dos notas,
 donde la nota inferior del grupeto utiliza una alteración, requiere
diff --git a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
index c95a0bfac0..8e00a97212 100644
--- a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
+++ b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 En una música que tenga muchas apariciones de la
 misma secuencia de notas a distintas alturas, podría ser de
diff --git a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
index 804a79c90f..e1cc74e9a1 100644
--- a/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
+++ b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede trazar un símbolo de arpegio entre notas de distintas
 voces que están sobre el mismo pentagrama si el grabador
diff --git a/Documentation/snippets/creating-blank-staves.ly b/Documentation/snippets/creating-blank-staves.ly
index f55d31a8e1..d75d132633 100644
--- a/Documentation/snippets/creating-blank-staves.ly
+++ b/Documentation/snippets/creating-blank-staves.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, editorial-annotations, contexts-and-engravers, paper-and-layout"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para crear pentagramas en blanco, genere compases vacíos y después
 elimine el grabador de números de compás @code{Bar_number_engraver}
diff --git a/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
index fb970b4d18..44f450cf84 100644
--- a/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
+++ b/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Dentro de un @code{PianoStaff}, es posible hacer que un arpegio
 cruce entre los pentagramas ajustando la propiedad
diff --git a/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
index 041695521d..241a4a1160 100644
--- a/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
+++ b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden crear arpegios que se cruzan entre pentagramas dentro de
 contextos distintos a @code{GrandStaff}, @code{PianoStaff} y
diff --git a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
index 7182670d87..87bec2f7d3 100644
--- a/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
+++ b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden crear indicaciones metronómicas nuevas en modo de
 marcado, pero no cambian el tempo en la salida MIDI.
diff --git a/Documentation/snippets/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
index d5b8f2006e..87ef63c8a2 100644
--- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly
+++ b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Aunque la manera más fácil de añadir paréntesis a una indicación
 de dinámica es utilizar un bloque @code{\\markup}, este método
diff --git a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
index 236bb9c27a..7dd8ecdba5 100644
--- a/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
+++ b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 A diferencia de las inscripciones de texto, las lestras de ensayo
 no se pueden apilar en un punto concreto de la partitura: sólo se
diff --git a/Documentation/snippets/creating-slurs-across-voices.ly b/Documentation/snippets/creating-slurs-across-voices.ly
index fbd46ceaf4..00acc7d3fc 100644
--- a/Documentation/snippets/creating-slurs-across-voices.ly
+++ b/Documentation/snippets/creating-slurs-across-voices.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, keyboards, unfretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 En determinadas situaciones es necesario crear ligaduras de
 expresión entre notas que están en voces distintas.
diff --git a/Documentation/snippets/creating-text-spanners.ly b/Documentation/snippets/creating-text-spanners.ly
index e6670dddc6..c815d24342 100644
--- a/Documentation/snippets/creating-text-spanners.ly
+++ b/Documentation/snippets/creating-text-spanners.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las instrucciones @code{\\startTextSpan} y @code{\\stopTextSpan}
 permiten la creación de elementos de extensión textuales tan
diff --git a/Documentation/snippets/cross-staff-tremolos.ly b/Documentation/snippets/cross-staff-tremolos.ly
index a78027e027..c62bdf8eb4 100644
--- a/Documentation/snippets/cross-staff-tremolos.ly
+++ b/Documentation/snippets/cross-staff-tremolos.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: a5bde6d51a5c88e952d95ae36c61a5efc22ba441
+  lsrtags = "repeats, keyboards"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
@@ -17,9 +19,6 @@ dentro de llaves curvas junto a su instrucción @code{\\change Staff}.
 
   doctitlees = "Trémolos de pentagrama cruzado"
 
-  lsrtags = "repeats, keyboards"
-
-
 %% Translation of GIT committish: a5bde6d51a5c88e952d95ae36c61a5efc22ba441
   texidocfr = "
 Dans la mesure où @code{\\repeat tremolo} requiert deux arguments
diff --git a/Documentation/snippets/custodes.ly b/Documentation/snippets/custodes.ly
index c43d834aef..ce7ba7486f 100644
--- a/Documentation/snippets/custodes.ly
+++ b/Documentation/snippets/custodes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "ancient-notation, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden tipografiar «custos» en diferentes estilos.
 
diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index 25edb88985..909b87da27 100644
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -1,43 +1,12 @@
-% Do not edit this file; it is automatically
-% generated from Documentation/snippets/new
-% This file is in the public domain.
-%% Note: this file works from version 2.13.31
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
-  texidoces = "
-Se pueden establecer las propiedades de los diagramas de
-posiciones de acordes por medio de @code{'fret-diagram-details}.
-Para los diagramas de posiciones de FretBoard, se aplican los
-overrides (sobreescrituras) al objeto @code{FretBoards.FretBoard}.
-Como @code{Voice}, @code{FretBoards} es un contexto del nivel
-inferior, y por tanto se puede omitir su nombre en la
-sobreescritura de propiedades.
-
-"
-  doctitlees = "Personalizar los diagramas de posiciones"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  texidocde = "
-Eigenschaften von Bunddiagrammen können in
-@code{'fret-diagram-details} verändert werden.  Einstellungen mit
-dem @code{\\override}-Befehl werden dem @code{FretBoards.FretBoard}-Objekt
-zugewiesen.  Genauso wie @code{Voice} ist auch @code{FretBoards} ein
-Kontext der niedrigsten Ebene, weshalb der Kontext auch in dem Befehl
-weggelassen werden kann.
-
-"
-  doctitlede = "Bunddiagramme anpassen"
-
   lsrtags = "fretted-strings, tweaks-and-overrides"
 
-
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 47c3d16c5044555afa49637310a7ee324b06af51
   texidoces = "
 Se pueden establecer las propiedades de los diagramas de
 posiciones de acordes por medio de @code{'fret-diagram-details}.
diff --git a/Documentation/snippets/customizing-markup-fret-diagrams.ly b/Documentation/snippets/customizing-markup-fret-diagrams.ly
index 737f2923ec..ff857f9955 100644
--- a/Documentation/snippets/customizing-markup-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-markup-fret-diagrams.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden establecer las propiedades de los diagramas de
 posiciones a través de @code{'fret-diagram-details}.  Para los
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 6c62cf9da9..4a9ea5a4ba 100644
--- a/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
+++ b/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La dirección predeterminada de las plicas sobre la tercera línea
 del pentagrama está determinada por la propiedad
diff --git a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
index b54d3f601b..d8b8b7daec 100644
--- a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
+++ b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.15
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Este ejemplo demuestra cómo se puede definir el grabador de ámbito en
diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
index 06ffef58a3..302df08a9f 100644
--- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
+++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings"
 
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+%% Translation of GIT committish: cde045f4e833aa491fb63f2222e14bef49507577
   texidoces = "
 
 Se pueden añadir diagramas de posiciones predefinidas para
diff --git a/Documentation/snippets/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
index b282d48194..95dbf6efef 100644
--- a/Documentation/snippets/demo-midiinstruments.ly
+++ b/Documentation/snippets/demo-midiinstruments.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "midi"
diff --git a/Documentation/snippets/demonstrating-all-headers.ly b/Documentation/snippets/demonstrating-all-headers.ly
index 4db4865c4d..f56a7a259c 100644
--- a/Documentation/snippets/demonstrating-all-headers.ly
+++ b/Documentation/snippets/demonstrating-all-headers.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
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 b84c5a8f51..225420c6ed 100644
--- a/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Si hay un solo pentagrama en un de los tipos de sistema
 @code{ChoirStaff} o @code{StaffGroup}, el comportamiento
diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 61bcfd6f35..839fa5bf0b 100644
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.1
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 He aquí una forma de imprimir un acorde en el que suena la misma nota
diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index a13e955230..15e8bdf4b9 100644
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.10
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Al trabajar con los callbacks de un grob, puede ser de mucha ayuda
diff --git a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
index 9e21edc34c..873ef25ce8 100644
--- a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Alteraciones de estilo dodecafónico para todas las notas incluidas las naturales"
   texidoces = "
 En las obras de principios del s.XX, empezando por Schoenberg, Berg y
diff --git a/Documentation/snippets/dotted-harmonics.ly b/Documentation/snippets/dotted-harmonics.ly
index 8de8d01f4d..6d52041de1 100644
--- a/Documentation/snippets/dotted-harmonics.ly
+++ b/Documentation/snippets/dotted-harmonics.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "unfretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/double-glissando.ly b/Documentation/snippets/double-glissando.ly
index 200d0de0d5..0049906948 100644
--- a/Documentation/snippets/double-glissando.ly
+++ b/Documentation/snippets/double-glissando.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, simultaneous-notes"
diff --git a/Documentation/snippets/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
index 8fd0c0c690..51bf750a1f 100644
--- a/Documentation/snippets/drawing-boxes-around-grobs.ly
+++ b/Documentation/snippets/drawing-boxes-around-grobs.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
diff --git a/Documentation/snippets/drawing-circles-around-note-heads.ly b/Documentation/snippets/drawing-circles-around-note-heads.ly
new file mode 100644
index 0000000000..c56b4f6e5b
--- /dev/null
+++ b/Documentation/snippets/drawing-circles-around-note-heads.ly
@@ -0,0 +1,26 @@
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.13.39"
+
+\header {
+  lsrtags = "editorial-annotations"
+
+  texidoc = "
+Here is how to circle a note.
+
+"
+  doctitle = "Drawing circles around note heads"
+} % begin verbatim
+
+circle =
+\once \override NoteHead #'stencil = #(lambda (grob)
+    (let* ((note (ly:note-head::print grob))
+           (combo-stencil (ly:stencil-add
+               note
+               (circle-stencil note 0.1 0.8))))
+          (ly:make-stencil (ly:stencil-expr combo-stencil)
+            (ly:stencil-extent note X)
+            (ly:stencil-extent note Y))))
+
+{ \circle c' }
diff --git a/Documentation/snippets/drawing-circles-around-various-objects.ly b/Documentation/snippets/drawing-circles-around-various-objects.ly
index 25d25dd187..3d1472f23a 100644
--- a/Documentation/snippets/drawing-circles-around-various-objects.ly
+++ b/Documentation/snippets/drawing-circles-around-various-objects.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
@@ -22,6 +22,7 @@ strategies for rehearsal marks and measure numbers.
     #(lambda (mark context)
              (make-circle-markup (format-mark-numbers mark context)))
   \mark \default
+
   c2 d^\markup {
     \override #'(thickness . 3) {
       \circle \finger 2
diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
index 73582ab227..ceb5497087 100644
--- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.8
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Funciones postfijas para la creación de objetos de extensión de texto
diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly
index 24c94d618b..7e64f908e3 100644
--- a/Documentation/snippets/dynamics-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.20
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Los objetos de extensión \cresc, \dim y \decresc ahora se pueden
diff --git a/Documentation/snippets/editorial-annotations.snippet-list b/Documentation/snippets/editorial-annotations.snippet-list
index de40435fbb..a45083730e 100644
--- a/Documentation/snippets/editorial-annotations.snippet-list
+++ b/Documentation/snippets/editorial-annotations.snippet-list
@@ -12,6 +12,7 @@ creating-a-delayed-turn.ly
 creating-blank-staves.ly
 default-direction-of-stems-on-the-center-line-of-the-staff.ly
 drawing-boxes-around-grobs.ly
+drawing-circles-around-note-heads.ly
 drawing-circles-around-various-objects.ly
 embedding-native-postscript-in-a--markup-block.ly
 grid-lines--changing-their-appearance.ly
diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly
index 6efcdb489d..879ff98284 100644
--- a/Documentation/snippets/editorial-headword.ly
+++ b/Documentation/snippets/editorial-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
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 275181734a..e1df8cd871 100644
--- a/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
+++ b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede insertar códico PostScript directamente dentro de un
 bloque @code{\\markup}.
diff --git a/Documentation/snippets/engravers-one-by-one.ly b/Documentation/snippets/engravers-one-by-one.ly
index ab13df1e79..72cc670dbc 100644
--- a/Documentation/snippets/engravers-one-by-one.ly
+++ b/Documentation/snippets/engravers-one-by-one.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Del problema central de la notación, esto es, crear un determinado
 símbolo, se encargan los «plugins» o complementos añadidos.  Cada
@@ -134,7 +134,6 @@ MyStaff = \context {
 
   \consists "Pitch_squash_engraver"
 
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
   localKeySignature = #'()
 
   % explicitly set instrumentName, so we don't get
diff --git a/Documentation/snippets/engraving-ties-manually.ly b/Documentation/snippets/engraving-ties-manually.ly
index c9cc746e1d..9d5c482965 100644
--- a/Documentation/snippets/engraving-ties-manually.ly
+++ b/Documentation/snippets/engraving-ties-manually.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Grabado manual de las ligaduras"
  texidoces = "
 Se pueden grabar a mano las ligaduras modificando la propiedad
diff --git a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
index a270b45123..3fba2c4a61 100644
--- a/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
+++ b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, repeats"
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 e668cce3d7..1ff014cc16 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
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Escribir varios grupos especiales usando una sola instrucción \\times"
  texidoces = "
 La propiedad @code{tupletSpannerDuration} establece cuánto debe durar
diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly
index b7bbe4d9ae..cd3f74edb1 100644
--- a/Documentation/snippets/expressive-headword.ly
+++ b/Documentation/snippets/expressive-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
index e293383964..4c7ad81a97 100644
--- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly
+++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Se puede simular un @qq{hammer} o ligado ascendente con ligaduras de
diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index 7b05b2990b..599c127b4c 100644
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f
diff --git a/Documentation/snippets/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
index ca2655b590..a504c410a9 100644
--- a/Documentation/snippets/fine-tuning-pedal-brackets.ly
+++ b/Documentation/snippets/fine-tuning-pedal-brackets.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards, tweaks-and-overrides"
diff --git a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
index 2bb4ab192f..f95dc11fd7 100644
--- a/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
+++ b/Documentation/snippets/fingering-symbols-for-wind-instruments.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
+  lsrtags = "winds"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
   texidoces = "
 Se pueden conseguir símbolos especiales combinando glifos existentes,
 lo que es de utilidad para la notación de instrumentos de viento.
@@ -12,7 +14,6 @@ lo que es de utilidad para la notación de instrumentos de viento.
 "
   doctitlees = "Símbolos de digitación para instrumentos de viento"
 
-
 %% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
   texidocfr = "
 Des sumboles spécifiques peuvent être obtenus en combinant les glyphes
@@ -22,8 +23,6 @@ disponibles, ce qui est tout à fait indiqué en matière d'instrument à vent.
   doctitlefr = "Symboles de doigtés pour instruments à vent"
 
 
-  lsrtags = "winds"
-
   texidoc = "
 Special symbols can be achieved by combining existing glyphs, which is
 useful for wind instruments.
diff --git a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
index e6fde26f49..76a137c2e8 100644
--- a/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
+++ b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 En este ejemplo se combinan las digitaciones de la mano izquierda,
 indicaciones del número de cuerda y digitaciones de la mano
diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index e10b507039..14994c4cd9 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.10
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 
diff --git a/Documentation/snippets/flat-flags-and-beam-nibs.ly b/Documentation/snippets/flat-flags-and-beam-nibs.ly
index 60b8c704d0..74bddd3ac6 100644
--- a/Documentation/snippets/flat-flags-and-beam-nibs.ly
+++ b/Documentation/snippets/flat-flags-and-beam-nibs.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Son posibles tanto los corchetes rectos sobre notas sueltas como
 extremos de barra sueltos en figuras unidas, con una combinación de
diff --git a/Documentation/snippets/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
index 9d5842a451..93f6bdb883 100644
--- a/Documentation/snippets/flute-slap-notation.ly
+++ b/Documentation/snippets/flute-slap-notation.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "winds"
@@ -19,19 +19,25 @@ slap =
 #(define-music-function (parser location music) (ly:music?)
 #{
   \override NoteHead #'stencil =
-    #(lambda (grob)
-       (grob-interpret-markup grob
-        (markup #:musicglyph "scripts.sforzato")))
+  #(lambda (grob)
+     (grob-interpret-markup grob
+      (markup #:musicglyph "scripts.sforzato")))
   \override NoteHead #'stem-attachment =
-    #(lambda (grob)
-       (let ((thickness (ly:staff-symbol-line-thickness grob)))
-         (cons 1 (/ thickness 2))))
+  #(lambda (grob)
+     (let* ((thickness (ly:staff-symbol-line-thickness grob))
+            (stem (ly:grob-object grob 'stem))
+            (dir (ly:grob-property stem 'direction UP)))
+       (cons 1 (+ (if (= dir DOWN)
+                      0.5
+                      0)
+                  (/ thickness 2)))))
   $music
   \revert NoteHead #'stencil
   \revert NoteHead #'stem-attachment
 #})
 
 \relative c' {
-  c4 \slap c d r \slap { g a } b r
+  c4 \slap c d r
+  \slap { g4 a } b r
 }
 
diff --git a/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
new file mode 100644
index 0000000000..b227ee5340
--- /dev/null
+++ b/Documentation/snippets/forcing-a-clef-symbol-to-be-displayed.ly
@@ -0,0 +1,29 @@
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.13.39"
+
+\header {
+  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
+ignored by LilyPond, since it is not a change of clef.  It is possible
+to force the clef to be redisplayed using the command @code{\\set
+Staff.forceClef = ##t}.
+
+"
+  doctitle = "Forcing a clef symbol to be displayed"
+} % begin verbatim
+
+\relative c' {
+  \clef treble
+  c1
+  \clef treble
+  c1
+  \set Staff.forceClef = ##t
+  c1
+  \clef treble
+  c1
+}
diff --git a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
index f033d57fec..cd677dc6e7 100644
--- a/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
+++ b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
  doctitlees = "Forzar el desplazamiento horizontal de las notas"
 
diff --git a/Documentation/snippets/forcing-hyphens-to-be-shown.ly b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
index 3514068946..894863a226 100644
--- a/Documentation/snippets/forcing-hyphens-to-be-shown.ly
+++ b/Documentation/snippets/forcing-hyphens-to-be-shown.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Si LilyPond no cree que haya sitio suficiente para un guión separador
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 4ff880d2b7..1edf1e7009 100644
--- a/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly
+++ b/Documentation/snippets/forcing-measure-width-to-adapt-to-metronomemarks-width.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation"
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 872f955401..98de56b031 100644
--- a/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+++ b/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
index 6e89fc7ab2..5c9904065f 100644
--- a/Documentation/snippets/formatting-lyrics-syllables.ly
+++ b/Documentation/snippets/formatting-lyrics-syllables.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/Documentation/snippets/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
index 7b5f61573c..3e32ecb668 100644
--- a/Documentation/snippets/fret-diagrams-explained-and-developed.ly
+++ b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/fretboards-alternate-tables.ly b/Documentation/snippets/fretboards-alternate-tables.ly
index 25b9b07cc1..0e227f7c3a 100644
--- a/Documentation/snippets/fretboards-alternate-tables.ly
+++ b/Documentation/snippets/fretboards-alternate-tables.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.36
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings"
@@ -14,6 +14,9 @@ order to have alternate fretboards for a given chord.
 In order to use an alternate fretboard table, the table must first
 be created.  Fretboards are then added to the table.
 
+The created fretboard table can be blank, or it can be copied
+from an existing table.
+
 The table to be used in displaying predefined fretboards is selected
 by the property @code{\\predefinedDiagramTable}.
 "
@@ -24,15 +27,19 @@ by the property @code{\\predefinedDiagramTable}.
 
 \include "predefined-guitar-fretboards.ly"
 
-#(define custom-fretboard-table-one (make-hash-table 101))
+% Make a blank new fretboard table
+#(define custom-fretboard-table-one (make-fretboard-table))
 
-#(define custom-fretboard-table-two (make-hash-table 101))
+% Make a new fretboard table as a copy of default-fret-table
+#(define custom-fretboard-table-two (make-fretboard-table default-fret-table))
 
+% Add a chord to custom-fretboard-table-one
 \storePredefinedDiagram #custom-fretboard-table-one
                         \chordmode{c}
                         #guitar-tuning
                         "3-(;3;5;5;5;3-);"
 
+% Add a chord to custom-fretboard-table-two
 \storePredefinedDiagram #custom-fretboard-table-two
                         \chordmode{c}
                         #guitar-tuning
@@ -40,27 +47,34 @@ by the property @code{\\predefinedDiagramTable}.
 
 <<
   \chords {
-    c1 |
-    c1 |
-    c1
+    c1 | d1 |
+    c1 | d1 |
+    c1 | d1 |
   }
   \new FretBoards {
     \chordmode {
       \set predefinedDiagramTable = #default-fret-table
-      c1
+      c1 | d1 |
       \set predefinedDiagramTable = #custom-fretboard-table-one
-      c1
+      c1 | d1 |
       \set predefinedDiagramTable = #custom-fretboard-table-two
-      c1
+      c1 | d1 |
     }
   }
   \new Staff {
     \clef "treble_8"
-    \chordmode {
-      c1 |
-      c1 |
-      c1
-    }
+    <<
+      \chordmode {
+        c1 | d1 |
+        c1 | d1 |
+        c1 | d1 |
+      }
+      {
+        s1_\markup "Default table" | s1 |
+        s1_\markup \column {"New table" "from empty"} | s1 |
+        s1_\markup \column {"New table" "from default"} | s1 |
+      }
+    >>
   }
 >>
 
diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly
index 3c96cf7dc6..155da19c8a 100644
--- a/Documentation/snippets/fretted-headword.ly
+++ b/Documentation/snippets/fretted-headword.ly
@@ -1,13 +1,13 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
+%% Note: this file works from version 2.13.36
 % INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings %
 % Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17"   %
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.13.31"
+\version "2.13.39"
 
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/generating-custom-flags.ly b/Documentation/snippets/generating-custom-flags.ly
index 180e27e14c..ad0f771e2c 100644
--- a/Documentation/snippets/generating-custom-flags.ly
+++ b/Documentation/snippets/generating-custom-flags.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
index 1e0b905874..edef2c8249 100644
--- a/Documentation/snippets/generating-random-notes.ly
+++ b/Documentation/snippets/generating-random-notes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este fragmento de código basado en Scheme genera
 24 notas aleatorias (o tantas como se necesiten), basándose en la
diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
index 17be850f09..d298d3c786 100644
--- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
+++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.31
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
+%%%    Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 En muchos casos, las llaves que no están en la columna central se
diff --git a/Documentation/snippets/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly
index f8db68760a..56fb6623ca 100644
--- a/Documentation/snippets/grid-lines--changing-their-appearance.ly
+++ b/Documentation/snippets/grid-lines--changing-their-appearance.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede cambiar el aspecto de las líneas de rejilla
 sobreescribiendo algunas de sus propiedades.
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 f99911e000..544074da62 100644
--- a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+++ b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden trazar líneas verticales normales entre pentagramas para
 mostrar la relación entre notas; sin embargo, en caso de música
diff --git a/Documentation/snippets/grouping-beats.ly b/Documentation/snippets/grouping-beats.ly
index 9b1ac2276d..1d6d3dc653 100644
--- a/Documentation/snippets/grouping-beats.ly
+++ b/Documentation/snippets/grouping-beats.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los patrones de barrado se pueden alterar con la propiedad
 @code{beatGrouping}:
diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly
index 5fd9890013..f83994ab72 100644
--- a/Documentation/snippets/guitar-slides.ly
+++ b/Documentation/snippets/guitar-slides.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
 
   texidoces = "
diff --git a/Documentation/snippets/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly
index a5b7ae3139..427f93f7bd 100644
--- a/Documentation/snippets/guitar-strum-rhythms.ly
+++ b/Documentation/snippets/guitar-strum-rhythms.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, fretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para la música de guitarra, es posible mostrar los ritmos de rasgueo,
 además de las notas de la melodía, acordes y diagramas de posiciones.
diff --git a/Documentation/snippets/hairpins-with-different-line-styles.ly b/Documentation/snippets/hairpins-with-different-line-styles.ly
index 4b7fb5e028..4cfff48ada 100644
--- a/Documentation/snippets/hairpins-with-different-line-styles.ly
+++ b/Documentation/snippets/hairpins-with-different-line-styles.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los reguladores pueden imprimirse en uno cualquiera de los estilos de
 @code{line-interface}: discontinuo, punteado, línea, trino o zig-zag.
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index ab6121087a..9221e59f7a 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
index 4a8da7fa8b..7b4bbc659b 100644
--- a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
+++ b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
@@ -1,10 +1,10 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.26
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \header {
-%% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 Aquí se muestra la manera de ocultar las alteraciones de las notas
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 d710eb2c49..93a66ae9ee 100644
--- a/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
+++ b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0c1494d93d3ac391fe549a02e8198fe628edac17
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los cambios de dinámica con estilo de texto (como cresc. y dim.)
 se imprimen con una línea intermitente que muestra su alcance.
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 8b6c7490c4..a2271dceb9 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
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
index 0cf18e1246..c61827e37a 100644
--- a/Documentation/snippets/how-to-change-fret-diagram-position.ly
+++ b/Documentation/snippets/how-to-change-fret-diagram-position.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings, tweaks-and-overrides"
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 230180158e..14471ae131 100644
--- a/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
+++ b/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, vocal-music"
diff --git a/Documentation/snippets/hymn-template.ly b/Documentation/snippets/hymn-template.ly
index d84c431708..080b78a651 100644
--- a/Documentation/snippets/hymn-template.ly
+++ b/Documentation/snippets/hymn-template.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+  lsrtags = "vocal-music, template"
+
+%% Translation of GIT committish: 8b9a694a483632437fb5110b3531074ddb31c04a
   texidoces = "
   Este fragmento de código muestra una forma de preparar un himno cuando
 cada línea comienza con un compás parcial.  También muestra cómo
@@ -13,9 +15,6 @@ añadir los versos como texto independiente debajo de la música.
 "
 
   doctitlees = "Plantilla para himnos"
-
-  lsrtags = "vocal-music, template"
-
 %%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly
index 27d526d1fa..66bc238d86 100644
--- a/Documentation/snippets/incipit.ly
+++ b/Documentation/snippets/incipit.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los «incipit» se pueden escribir utilizando el grob del nombre del
 instruemento, pero manteniendo independientes las definiciones del
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 99437379db..363e967fcf 100644
--- a/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
+++ b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Un corchete de arpegio puede indicar que se tienen que tocar con la
 misma mano notas que están en dos pentagramas distintos. Para hacerlo,
diff --git a/Documentation/snippets/inserting-a-caesura.ly b/Documentation/snippets/inserting-a-caesura.ly
index 99094ca10b..93ebf24e47 100644
--- a/Documentation/snippets/inserting-a-caesura.ly
+++ b/Documentation/snippets/inserting-a-caesura.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las marcas de cesura se pueden crear sobreescribiendo la propiedad
 @code{'text} del objeto @code{BreathingSign}.  También está disponible
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 11c00fbcaa..2b9daa3321 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
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/Documentation/snippets/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly
index 202c3f65f9..a6561527b8 100644
--- a/Documentation/snippets/isolated-percent-repeats.ly
+++ b/Documentation/snippets/isolated-percent-repeats.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 También se pueden imprimir símbolos de porcentaje sueltos.
 
diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
index 5273310de7..d296fc213e 100644
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards, percussion, fretted-strings, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Ésta es una plantilla bastante avanzada, para un conjunto de
 jazz. Observe que la notación de todos los instrumentos está en
diff --git a/Documentation/snippets/keep-change-clefs-full-sized.ly b/Documentation/snippets/keep-change-clefs-full-sized.ly
index d74d062691..dbe655bee0 100644
--- a/Documentation/snippets/keep-change-clefs-full-sized.ly
+++ b/Documentation/snippets/keep-change-clefs-full-sized.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Cuando se produce un cambio de clave, el símbolo de clave se imprime a
 un tamaño menor que la clave inicial.  Esto se puede ajustar con
diff --git a/Documentation/snippets/keyboard-headword.ly b/Documentation/snippets/keyboard-headword.ly
index 97f405b56c..5bca543267 100644
--- a/Documentation/snippets/keyboard-headword.ly
+++ b/Documentation/snippets/keyboard-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 
 #(set-global-staff-size 15)
diff --git a/Documentation/snippets/laissez-vibrer-ties.ly b/Documentation/snippets/laissez-vibrer-ties.ly
index aeb4f2fc66..ebf1c8949d 100644
--- a/Documentation/snippets/laissez-vibrer-ties.ly
+++ b/Documentation/snippets/laissez-vibrer-ties.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, keyboards, fretted-strings"
diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
index 4e277e4c6b..fd1d46ab2f 100644
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.10
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La tablatura se puede formatear utilizando letras en lugar de números.
 
diff --git a/Documentation/snippets/line-arrows.ly b/Documentation/snippets/line-arrows.ly
index e8cd2a33a2..b5149c0f5d 100644
--- a/Documentation/snippets/line-arrows.ly
+++ b/Documentation/snippets/line-arrows.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden aplicar puntas de flecha a los elementos de extensión de
 texto y de línea (como el Glissando).
diff --git a/Documentation/snippets/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
index 2fcfec919b..6d85d9eecd 100644
--- a/Documentation/snippets/lyrics-alignment.ly
+++ b/Documentation/snippets/lyrics-alignment.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, vocal-music"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La alineación horizontal de la letra se puede ajustar sobreescribiendo
 la propiedad @code{self-alignment-X} del objeto @code{LyricText}.
diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly
index 916c5a7198..43b45bb2b3 100644
--- a/Documentation/snippets/makam-example.ly
+++ b/Documentation/snippets/makam-example.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El «Makam» es un tipo de melodía de Turquía que
 utiliza alteraciones microtonales de 1/9 de tono.  Consulte el
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 7a6a27fdb2..f769f76024 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
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index cec17e80ec..f4dbe618ce 100644
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.1
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Las ligaduras de expresión se pueden construir con patrones de
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 466118b4f6..1ade793d52 100644
--- a/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
+++ b/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede engrosar una línea del pentagrama con fines pedagógicos
 (p.ej. la tercera línea o la de la clave de Sol).  Esto se puede
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 4e4fafddd3..dc761e1734 100644
--- a/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
+++ b/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
diff --git a/Documentation/snippets/manually-controlling-beam-positions.ly b/Documentation/snippets/manually-controlling-beam-positions.ly
index 5bd7000637..9b57c6bed4 100644
--- a/Documentation/snippets/manually-controlling-beam-positions.ly
+++ b/Documentation/snippets/manually-controlling-beam-positions.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
index 2c8a6d3e4c..9bcbb35a77 100644
--- a/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+++ b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, vocal-music"
diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 5185ea4e9f..54585ef8a4 100644
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
diff --git a/Documentation/snippets/measure-counter.ly b/Documentation/snippets/measure-counter.ly
index bee37cd337..0feabc1f3b 100644
--- a/Documentation/snippets/measure-counter.ly
+++ b/Documentation/snippets/measure-counter.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, staff-notation, editorial-annotations"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este fragmento de código proporciona una solución alternativa a la
 producción de contadores de compás utilizando repeticiones
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 114e3f804e..26cf952d3c 100644
--- a/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, ancient-notation, contexts-and-engravers, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La disposición «mensurstriche» en que las líneas divisorias no
 están dibujadas sobre los pentagramas, sino entre ellos, se puede
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 4f94c71779..53b57eb39a 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
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/modern-tab-text-clef.ly b/Documentation/snippets/modern-tab-text-clef.ly
index caf014be42..a3c56d3e64 100644
--- a/Documentation/snippets/modern-tab-text-clef.ly
+++ b/Documentation/snippets/modern-tab-text-clef.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Utilice un texto de marcado para sustituir el glifo de clave (TAB) con
 una fuente tipográfica moderna.
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 c593d71cd1..32658b9b35 100644
--- a/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las abreviaturas se encuentran definidas dentro del archivo
 @code{ly/script-init.ly}, donde las variables @code{dashHat},
diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly
index c4f0d23498..9d891a8992 100644
--- a/Documentation/snippets/modifying-tuplet-bracket-length.ly
+++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
index d3cfb31921..491b02ef14 100644
--- a/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
+++ b/Documentation/snippets/moving-dotted-notes-in-polyphony.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, simultaneous-notes, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Cuando se puede una nota en la voz superior para evitar la colisión
 con una nota de otra voz, el comportamiento predeterminado es
diff --git a/Documentation/snippets/moving-slur-positions-vertically.ly b/Documentation/snippets/moving-slur-positions-vertically.ly
index 7fe14ba019..be0a59073a 100644
--- a/Documentation/snippets/moving-slur-positions-vertically.ly
+++ b/Documentation/snippets/moving-slur-positions-vertically.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede ajustar la posición vertical de una ligadura de
 expresiónutilizando la propiedad @code{positions} del objeto
diff --git a/Documentation/snippets/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
index 111c084049..8a7103e101 100644
--- a/Documentation/snippets/multi-measure-rest-markup.ly
+++ b/Documentation/snippets/multi-measure-rest-markup.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 texidoces = "
 Los elementos de marcado aplicados a un silencio multicompás se
 centran encima o debajo de éste.  Los elementos de marcado extensos
diff --git a/Documentation/snippets/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
index 1799dfe638..84f1ea2978 100644
--- a/Documentation/snippets/nesting-staves.ly
+++ b/Documentation/snippets/nesting-staves.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede utilizar la propiedad
 @code{systemStartDelimiterHierarchy} para crear grupos de
diff --git a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly
deleted file mode 100644
index 162a9d4a28..0000000000
--- a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly
+++ /dev/null
@@ -1,79 +0,0 @@
-\version "2.13.36"
-
-\header {
-  lsrtags="vocal-music, staff-notation"
-  texidoc="
-  This shows one approach to simplify adding many orchestral cues to
-the piano reduction in a vocal score.  The music function
-@code{\cueWhile} takes four arguments: the music from which the cue
-is to be taken, as defined by @code{\addQuote}, the name to be
-inserted before the cue notes, then either @code{#UP} or @code{#DOWN}
-to specify either @code{\voiceOne} with the name above the staff or
-@code{\voiceTwo} with the name below the staff, and finally the piano
-music in parallel with which the cue notes are to appear.  The name
-of the quoted instrument is positioned to the left of the cue notes.
-Many passages can be cued, but they cannot overlap each other in time.
-"
-  doctitle = "Adding orchestral cues to a vocal score"
-}
-
-cueWhile =
-  #(define-music-function
-    (parser location instrument name dir music)
-    (string? string? ly:dir? ly:music?)
-    #{
-      \cueDuring $instrument #$dir {
-        \once \override TextScript #'self-alignment-X = #RIGHT
-        \once \override TextScript #'direction = $dir
-        s1*0-\markup { \tiny $name }
-        $music
-      }
-    #}
-  )
-
-flute = \relative c'' { 
-  \transposition c'
-  s4 s4 e g
-}
-\addQuote "flute" { \flute }
-
-clarinet = \relative c' {
-  \transposition bes
-  fis4 d d c
-}
-\addQuote "clarinet" { \clarinet }
-
-singer = \relative c'' { c4. g8 g4 bes4 }
-words = \lyricmode { here's the lyr -- ics }
-
-pianoRH = \relative c'' {
-  \transposition c'
-  \cueWhile "clarinet" "Clar." #DOWN { c4. g8 }
-  \cueWhile "flute" "Flute" #UP { g4 bes4 }
-}
-pianoLH = \relative c { c4 <c' e> e, <g c> }
-
-\score {
-  <<
-    \new Staff {
-      \new Voice = "singer" {
-        \singer
-      }
-    }
-    \new Lyrics {
-      \lyricsto "singer"
-      \words
-    }
-    \new PianoStaff <<
-      \new Staff {
-        \new Voice {
-          \pianoRH
-        }
-      }
-      \new Staff {
-        \clef "bass"
-        \pianoLH
-      }
-    >>
-  >>
-}
\ No newline at end of file
diff --git a/Documentation/snippets/new/anglican-psalm-template.ly b/Documentation/snippets/new/anglican-psalm-template.ly
deleted file mode 100644
index 70e615fbb7..0000000000
--- a/Documentation/snippets/new/anglican-psalm-template.ly
+++ /dev/null
@@ -1,128 +0,0 @@
-\version "2.13.36"
-
-\header {
-  lsrtags = "vocal-music, template"
-  texidoc = "
-This template shows one way of setting out an Anglican psalm chant. It
-also shows how the verses may be added as stand-alone text under the
-music.  The two verses are coded in different styles to demonstrate
-more possibilities.
-"
-  doctitle = "Anglican psalm template"
-}
-
-SopranoMusic = \relative g' {
-  g1 | c2 b | a1 | \bar "||"
-  a1 | d2 c | c b | c1 | \bar "||"
-}
-
-AltoMusic = \relative c' {
-  e1 | g2 g | f1 |
-  f1 | f2 e | d d | e1 |
-}
-
-TenorMusic = \relative a {
-  c1 | c2 c | c1 |
-  d1 | g,2 g | g g | g1 |
-}
-
-BassMusic =  \relative c {
-  c1 | e2 e | f1 |
-  d1 | b2 c | g' g | c,1 |
-}
-
-global = {
-  \time 2/2
-}
-
-dot = \markup {
-  \raise #0.7 \musicglyph #"dots.dot"
-}
-
-tick = \markup {
-  \raise #1 \fontsize #-5 \musicglyph #"scripts.rvarcomma"
-}
-
-% Use markup to center the chant on the page
-\markup {
-  \fill-line {
-    \score {  % centered
-      <<
-        \new ChoirStaff <<
-          \new Staff <<
-            \global
-            \clef "treble"
-            \new Voice = "Soprano" <<
-              \voiceOne
-              \SopranoMusic
-            >>
-            \new Voice = "Alto" <<
-              \voiceTwo
-              \AltoMusic
-            >>
-          >>
-          \new Staff <<
-            \clef "bass"
-            \global
-            \new Voice = "Tenor" <<
-              \voiceOne
-              \TenorMusic
-            >>
-            \new Voice = "Bass" <<
-              \voiceTwo
-              \BassMusic
-            >>
-          >>
-        >>
-      >>
-      \layout {
-        \context {
-          \Score
-          \override SpacingSpanner
-          #'base-shortest-duration = #(ly:make-moment 1 2)
-        }
-        \context {
-          \Staff
-          \remove "Time_signature_engraver"
-        }
-      }
-    }  % End score
-  }
-}  % End markup
-
-\markup {
-  \fill-line {
-    \column {
-      \left-align {
-        \null \null \null
-        \line {
-          \fontsize #5 O
-          \fontsize #3 come
-          let us \bold sing | unto \dot the | Lord : let
-        }
-        \line {
-          us heartily
-          \concat { re \bold joice }
-          in the | strength of | our
-        }
-        \line {
-          sal | vation.
-        }
-        \null
-        \line {
-          \hspace #2.5 8. Today if ye will hear his voice *
-        }
-        \line {
-          \concat { \bold hard en }
-          \tick not your \tick hearts : as in the pro-
-        }
-        \line {
-          vocation * and as in the \bold day of tempt- \tick
-        }
-        \line {
-          -ation \tick in the \tick wilderness.
-        }
-      }
-    }
-  }
-}
diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
index 302820e731..84cfba611e 100644
--- a/Documentation/snippets/non-default-tuplet-numbers.ly
+++ b/Documentation/snippets/non-default-tuplet-numbers.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.1
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 LilyPond también proporciona funciones de formato para imprimir
 números de grupo especial diferentes a la propia fracción, así
diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly
index a140ee0c30..1df670e345 100644
--- a/Documentation/snippets/non-traditional-key-signatures.ly
+++ b/Documentation/snippets/non-traditional-key-signatures.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Armaduras de tonalidad no tradicionales"
   texidoces = "
 
diff --git a/Documentation/snippets/numbers-as-easy-note-heads.ly b/Documentation/snippets/numbers-as-easy-note-heads.ly
index c1ea51e7cf..1f9336cb65 100644
--- a/Documentation/snippets/numbers-as-easy-note-heads.ly
+++ b/Documentation/snippets/numbers-as-easy-note-heads.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.11
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Las cabezas de nota de notación fácil utilizan la propiedad
diff --git a/Documentation/snippets/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
index 141cccca84..e63e213cd2 100644
--- a/Documentation/snippets/orchestra,-choir-and-piano-template.ly
+++ b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-  lsrtags = "template"
+  lsrtags = "pitches, staff-notation, vocal-music, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Esta plantilla muestra el uso de contextos @code{StaffGroup} y
@@ -51,91 +51,75 @@ d'être transposées puis affectées à une variable.
   texidoc = "
 This template demonstrates the use of nested @code{StaffGroup} and
 @code{GrandStaff} contexts to sub-group instruments of the same type
-together, and the use of @code{\\transpose} for transposing
-instruments.  All music in variables is stored in C.  Music may be
-entered in C or, alternatively, entered in the instrument key and
-transposed to C before being assigned to a variable.
+together, and a way to use @code{\\transpose} so that variables hold
+music for transposing instruments at concert pitch.
 
 "
   doctitle = "Orchestra choir and piano template"
 } % begin verbatim
 
 #(set-global-staff-size 17)
-
 \paper {
-  indent = 3.0\cm
-  short-indent = 1.5\cm
+  indent = 3.0\cm  % space for instrumentName
+  short-indent = 1.5\cm  % space for shortInstrumentName
 }
 
-fluteMusic = \relative c { \key c \major c'1 d }
-oboeMusic = \relative c { \key c \major c'1 d }
-clarinetMusic = \relative c { \key c \major c'1 d }
-bassoonMusic = \relative c { \clef bass \key c \major c1 d }
-trumpetMusic = \relative c { \key c \major c''1 d }
-tromboneMusic = \relative c { \key c \major c1 d }
-hornIMusic = \relative c { c'1 d }
-hornIIMusic = \relative c { c1 d }
-percussionMusic = \relative c { \key c \major c1 d }
-sopranoMusic = \relative c'' { \key c \major c1 d }
-sopranoLyrics = \lyricmode { Sop -- ra }
-altoIMusic = \relative c' { \key c \major c1 d }
-altoILyrics = \lyricmode { A -- one }
-altoIIMusic = \relative c' { \key c \major c1 d }
-altoIILyrics = \lyricmode { A -- two }
-tenorMusic = \relative c' { \key c \major c1 d }
-tenorLyrics = \lyricmode { Ten -- or }
-pianoRHMusic = \relative c { \key c \major c'1 d }
-pianoLHMusic = \relative c { \key c \major c1 d }
-violinIMusic = \relative c { \key c \major c'1 d }
-violinIIMusic = \relative c { \key c \major c'1 d }
-violaMusic = \relative c { \clef alto \key c \major c'1 d }
-celloMusic = \relative c { \clef bass \key c \major c1 d }
-bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
+fluteMusic = \relative c' { \key g \major g'1 b }
+% Pitches as written on a manuscript for Clarinet in A
+% are transposed to concert pitch.
+clarinetMusic = \transpose c' a
+  \relative c'' { \key bes \major bes1 d }
+trumpetMusic = \relative c { \key g \major g''1 b }
+% Key signature is often omitted for horns
+hornMusic = \transpose c' f
+  \relative c { d'1 fis }
+percussionMusic = \relative c { \key g \major g1 b }
+sopranoMusic = \relative c'' { \key g \major g'1 b }
+sopranoLyrics = \lyricmode { Lyr -- ics }
+altoIMusic = \relative c' { \key g \major g'1 b }
+altoIIMusic = \relative c' { \key g \major g'1 b }
+altoILyrics =  \sopranoLyrics
+altoIILyrics = \lyricmode { Ah -- ah }
+tenorMusic = \relative c' { \clef "treble_8" \key g \major g1 b }
+tenorLyrics = \sopranoLyrics
+pianoRHMusic = \relative c { \key g \major g''1 b }
+pianoLHMusic = \relative c { \clef bass \key g \major g1 b }
+violinIMusic = \relative c' { \key g \major g'1 b }
+violinIIMusic = \relative c' { \key g \major g'1 b }
+violaMusic = \relative c { \clef alto \key g \major g'1 b }
+celloMusic = \relative c { \clef bass \key g \major g1 b }
+bassMusic = \relative c { \clef "bass_8" \key g \major g,1 b }
 
 \score {
-  \new GrandStaff = "GrandStaff_score" <<
+  <<
     \new StaffGroup = "StaffGroup_woodwinds" <<
       \new Staff = "Staff_flute" {
         \set Staff.instrumentName = #"Flute"
+        % shortInstrumentName, midiInstrument, etc.
+        % may be set here as well
         \fluteMusic
       }
-      \new Staff = "Staff_oboe" {
-        \set Staff.instrumentName = #"Oboe"
-        \oboeMusic
-      }
       \new Staff = "Staff_clarinet" {
-        \set Staff.instrumentName = \markup \concat { "Clarinet in B" \flat }
+        \set Staff.instrumentName =
+        \markup { \concat { "Clarinet in B" \flat } }
+        % Declare that written Middle C in the music
+        %  to follow sounds a concert B flat, for
+        %  output using sounded pitches such as MIDI.
         \transposition bes
+        % Print music for a B-flat clarinet
         \transpose bes c' \clarinetMusic
       }
-      \new Staff = "Staff_bassoon" {
-        \set Staff.instrumentName = #"Bassoon"
-        \bassoonMusic
-      }
     >>
     \new StaffGroup = "StaffGroup_brass" <<
-      \new GrandStaff <<
-        \new Staff = "Staff_hornI" {
-          \set Staff.instrumentName = #"Horn I"
-          \transposition f
-          \transpose f c' \hornIMusic
-        }
-        \new Staff = "Staff_hornII" {
-          \set Staff.instrumentName = #"Horn II"
-          \clef bass
-          \transposition f'
-          \transpose f c \hornIIMusic
-        }
-      >>
+      \new Staff = "Staff_hornI" {
+        \set Staff.instrumentName = #"Horn in F"
+        \transposition f
+        \transpose f c' \hornMusic
+      }
       \new Staff = "Staff_trumpet" {
-        \set Staff.instrumentName = #"Trumpet in C"
+        \set Staff.instrumentName = #"Trumpet in  C"
         \trumpetMusic
       }
-      \new Staff = "Staff_trombone" {
-        \set Staff.instrumentName = #"Trombone"
-        \clef bass
-        \tromboneMusic
-      }
     >>
     \new RhythmicStaff = "RhythmicStaff_percussion" <<
       \set RhythmicStaff.instrumentName = #"Percussion"
@@ -144,10 +128,7 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
     \new PianoStaff <<
       \set PianoStaff.instrumentName = #"Piano"
       \new Staff { \pianoRHMusic }
-      \new Staff {
-        \clef bass
-        \pianoLHMusic
-      }
+      \new Staff { \pianoLHMusic }
     >>
     \new ChoirStaff = "ChoirStaff_choir" <<
       \new Staff = "Staff_soprano" {
@@ -156,7 +137,8 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
         \sopranoMusic
       }
       \new Lyrics \lyricsto "soprano" { \sopranoLyrics }
-      \new GrandStaff = "GrandStaff_altos" \with { \accepts Lyrics } <<
+      \new GrandStaff = "GrandStaff_altos"
+      \with { \accepts Lyrics } <<
         \new Staff = "Staff_altoI"  {
           \set Staff.instrumentName = #"Alto I"
           \new Voice = "altoI"
@@ -172,7 +154,6 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
       >>
       \new Staff = "Staff_tenor" {
         \set Staff.instrumentName = #"Tenor"
-        \clef "treble_8"
         \new Voice = "tenor"
         \tenorMusic
       }
@@ -203,4 +184,5 @@ bassMusic = \relative c { \clef "bass_8" \key c \major c,1 d }
       }
     >>
   >>
+  \layout { }
 }
diff --git a/Documentation/snippets/ottava-text.ly b/Documentation/snippets/ottava-text.ly
index 647f511491..60883b5eaa 100644
--- a/Documentation/snippets/ottava-text.ly
+++ b/Documentation/snippets/ottava-text.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Internamente, @code{\\ottava} establece las propiedades
diff --git a/Documentation/snippets/outputting-the-version-number.ly b/Documentation/snippets/outputting-the-version-number.ly
index 4af357c65c..cbe108fe75 100644
--- a/Documentation/snippets/outputting-the-version-number.ly
+++ b/Documentation/snippets/outputting-the-version-number.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, titles"
diff --git a/Documentation/snippets/page-label.ly b/Documentation/snippets/page-label.ly
index 94b09852b0..0d7d0bbe9e 100644
--- a/Documentation/snippets/page-label.ly
+++ b/Documentation/snippets/page-label.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "spacing"
diff --git a/Documentation/snippets/partcombine-and-autobeamoff.ly b/Documentation/snippets/partcombine-and-autobeamoff.ly
index 0c42434715..98cf687f4b 100644
--- a/Documentation/snippets/partcombine-and-autobeamoff.ly
+++ b/Documentation/snippets/partcombine-and-autobeamoff.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
+  lsrtags = "rhythms"
+
+%%   Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
@@ -42,9 +44,6 @@ necesario hacer tres llamadas a @code{\\autoBeamOff}.
 
 "
   doctitlees = "Partcombine y autoBeamOff"
-
-  lsrtags = "rhythms"
-
 %%   Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
 
   texidocde = "
diff --git a/Documentation/snippets/percent-repeat-count-visibility.ly b/Documentation/snippets/percent-repeat-count-visibility.ly
index adc3422be2..357ae5ccac 100644
--- a/Documentation/snippets/percent-repeat-count-visibility.ly
+++ b/Documentation/snippets/percent-repeat-count-visibility.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden mostrar los contadores de las repeticiones del tipo
 porcentaje a intervalos regulares mediante el establecimiento de
diff --git a/Documentation/snippets/percent-repeat-counter.ly b/Documentation/snippets/percent-repeat-counter.ly
index 5afe6e559a..0e9e229e81 100644
--- a/Documentation/snippets/percent-repeat-counter.ly
+++ b/Documentation/snippets/percent-repeat-counter.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats"
 
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
   texidoces = "
 Las repeticiones de compases completos de más de dos repeticiones
 pueden llevar un contador si se activa la propiedad adecuada, como se
diff --git a/Documentation/snippets/percussion-beaters.ly b/Documentation/snippets/percussion-beaters.ly
index 88ad3a56ea..c4ef598dec 100644
--- a/Documentation/snippets/percussion-beaters.ly
+++ b/Documentation/snippets/percussion-beaters.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "percussion"
diff --git a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
index ef732372f5..7c45880523 100644
--- a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
+++ b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Permitir saltos de línea dentro de grupos especiales con barra"
  texidoces = "
 Este ejemplo artificial muestra cómo se pueden permitir tanto los
diff --git a/Documentation/snippets/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
index 1483584ee5..1a26f93cf5 100644
--- a/Documentation/snippets/piano-template-simple.ly
+++ b/Documentation/snippets/piano-template-simple.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "keyboards, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Presentamos a continuación una plantilla de piano sencilla con algunas
 notas.
diff --git a/Documentation/snippets/piano-template-with-centered-dynamics.ly b/Documentation/snippets/piano-template-with-centered-dynamics.ly
index 56e2b7aee2..ea28cfd078 100644
--- a/Documentation/snippets/piano-template-with-centered-dynamics.ly
+++ b/Documentation/snippets/piano-template-with-centered-dynamics.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Muchas partituras de piano tienen las indicaciones dinámicas centradas
 entre los dos pentagramas.  El contexto @code{Dynamics}, si se sitúa
diff --git a/Documentation/snippets/piano-template-with-centered-lyrics.ly b/Documentation/snippets/piano-template-with-centered-lyrics.ly
index c79c46a4cd..50f03de360 100644
--- a/Documentation/snippets/piano-template-with-centered-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-centered-lyrics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, keyboards, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 En lugar de tener un pentagrama dedicado a la melodía y la letra, ésta
 se puede centrar entre los pentagramas de un sistema de piano.
diff --git a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
index 2fc6138fd8..5b73621468 100644
--- a/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
+++ b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 He aquí el típico formato dde una canción: un pentagrama con la
 melodía y la letra, y el acompañamiento de piano por debajo.
diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly
index e81b0c1196..f0a253640f 100644
--- a/Documentation/snippets/pitches-headword.ly
+++ b/Documentation/snippets/pitches-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list
index bf4ff52ab0..47a78e3584 100644
--- a/Documentation/snippets/pitches.snippet-list
+++ b/Documentation/snippets/pitches.snippet-list
@@ -9,12 +9,14 @@ clefs-can-be-transposed-by-arbitrary-amounts.ly
 coloring-notes-depending-on-their-pitch.ly
 creating-a-sequence-of-notes-on-various-pitches.ly
 dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+forcing-a-clef-symbol-to-be-displayed.ly
 generating-random-notes.ly
 hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
 keep-change-clefs-full-sized.ly
 makam-example.ly
 non-traditional-key-signatures.ly
 numbers-as-easy-note-heads.ly
+orchestra,-choir-and-piano-template.ly
 ottava-text.ly
 preventing-extra-naturals-from-being-automatically-added.ly
 preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
diff --git a/Documentation/snippets/placement-of-right-hand-fingerings.ly b/Documentation/snippets/placement-of-right-hand-fingerings.ly
index 0743c02446..d5fdd9c1a6 100644
--- a/Documentation/snippets/placement-of-right-hand-fingerings.ly
+++ b/Documentation/snippets/placement-of-right-hand-fingerings.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Es posible ejercer un mayor control sobre la colocación de las
 digitaciones de la mano derecha estableciendo el valor de una
diff --git a/Documentation/snippets/polyphony-in-tablature.ly b/Documentation/snippets/polyphony-in-tablature.ly
index d869914ae1..ec30ce7e7f 100644
--- a/Documentation/snippets/polyphony-in-tablature.ly
+++ b/Documentation/snippets/polyphony-in-tablature.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "fretted-strings"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La polifonía se crea de la misma forma en un @code{TabStaff} que
 en una pauta normal.
diff --git a/Documentation/snippets/positioning-arpeggios.ly b/Documentation/snippets/positioning-arpeggios.ly
index ff73680049..600589be08 100644
--- a/Documentation/snippets/positioning-arpeggios.ly
+++ b/Documentation/snippets/positioning-arpeggios.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Si necesitamos alargar o acortar un símbolo de arpegio, podemos
 modificar independientemente los extremos superior e inferior.
diff --git a/Documentation/snippets/positioning-fingering-indications-precisely.ly b/Documentation/snippets/positioning-fingering-indications-precisely.ly
index 48e32a2cb9..88d853d8bb 100644
--- a/Documentation/snippets/positioning-fingering-indications-precisely.ly
+++ b/Documentation/snippets/positioning-fingering-indications-precisely.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations"
diff --git a/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly b/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
index ee2893c3d4..9548684304 100644
--- a/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
+++ b/Documentation/snippets/positioning-grace-note-beams-at-the-height-of-normal-note-beams.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Cuando se colocan figuras sobre líneas adicionales, sus barras se
diff --git a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
index d9f7b29f2d..bb0849e06c 100644
--- a/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
+++ b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Al establecer la propiedad @code{'strict-grace-spacing} hacemos que
diff --git a/Documentation/snippets/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly
index 3bd979aeae..e8520a4afe 100644
--- a/Documentation/snippets/positioning-multi-measure-rests.ly
+++ b/Documentation/snippets/positioning-multi-measure-rests.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Posicionar los silencios multicompás"
  texidoces = "
 A diferencia de los silencios normales, no existe una instrucción
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 b5306d0553..cca9fc6d2d 100644
--- a/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
+++ b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, breaks"
diff --git a/Documentation/snippets/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
index f6e2e2f123..27ca860939 100644
--- a/Documentation/snippets/positioning-text-markups-inside-slurs.ly
+++ b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Los elementos de marcado de texto deben tener la propiedad
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 7bfa09004c..49192e87ab 100644
--- a/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 doctitlees = "Evitar que se añadan becuadros adicionales automáticamente"
 
 texidoces = "
diff --git a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
index 6b12b2dbab..9d3af43154 100644
--- a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
+++ b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
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 258958a5cd..9820abaaae 100644
--- a/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
+++ b/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 doctitlees = "Evitar que se impriman becuadros cuando cambia la armadura"
 
 texidoces = "
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 ac94d2e94a..f9a1c852f6 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
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede imprimir una línea divisoria de la forma @code{|:} al
 principio de la pieza, sobreescribiendo la propiedad correspondiente:
diff --git a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
index 592e391d99..0ec6795729 100644
--- a/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
+++ b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Se pueden imprimir los números de compás a intervalos regulares
diff --git a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
index b470e056ca..0e0e4dde21 100644
--- a/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
+++ b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Los números de compás también se pueden imprimir dentro de rectángulos o de circunferencias.
diff --git a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
index cc3f8e2432..23b4ee2fce 100644
--- a/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
+++ b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden imprimir reguladores con un círculo en la punta (notación
 «al niente») estableciendo la propiedad @code{circled-tip} del objeto
diff --git a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
index 2d553a83ac..4e95292632 100644
--- a/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
+++ b/Documentation/snippets/printing-marks-at-the-end-of-a-line.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 4ab2514496ac3d88a9f3121a76f890c97cedcf4e
+  lsrtags = "text"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
@@ -14,9 +16,6 @@ alinear el borde derecho de la marca con la línea divisoria.
 
 "
   doctitlees = "Imprimir marcas al final de una línea"
-  lsrtags = "text"
-
-
 %% Translation of GIT committish: 4ab2514496ac3d88a9f3121a76f890c97cedcf4e
   texidocfr = "
 Les indications textuelles peuvent être imprimées à la fin d'une ligne
diff --git a/Documentation/snippets/printing-marks-on-every-staff.ly b/Documentation/snippets/printing-marks-on-every-staff.ly
index 812186d01d..02d2698ef7 100644
--- a/Documentation/snippets/printing-marks-on-every-staff.ly
+++ b/Documentation/snippets/printing-marks-on-every-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Aunque normalmente las marcas de texto sólo se imprimen sobre el
 pentagrama superior, también se pueden imprimir en otro pentagrama
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 2239a17966..cf91d61acc 100644
--- a/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
+++ b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 De forma predeterminada, las indicaciones metronómicas y las
 letras de ensayo se imprimen encima del pentagrama.  Para
diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
index f4f5ec1cad..e56d0269aa 100644
--- a/Documentation/snippets/printing-music-with-different-time-signatures.ly
+++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, percussion"
diff --git a/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly b/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
index fa806890d9..261f198913 100644
--- a/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
+++ b/Documentation/snippets/printing-note-names-with-and-without-an-octave-marker.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede usar el contexto @code{NoteNames} para imprimir el valor
 textual de las notas.  La propiedad @code{printOctaveNames} activa o
diff --git a/Documentation/snippets/printing-text-from-right-to-left.ly b/Documentation/snippets/printing-text-from-right-to-left.ly
index bf7177c49f..17e774a6f8 100644
--- a/Documentation/snippets/printing-text-from-right-to-left.ly
+++ b/Documentation/snippets/printing-text-from-right-to-left.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, text, world-music"
diff --git a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
index 275fc1fd6d..8b32b93de5 100644
--- a/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
+++ b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 De forma predeterminada se suprime el número del primer compás de una
diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
index 89517ada1a..839620e8b7 100644
--- a/Documentation/snippets/proportional-strict-notespacing.ly
+++ b/Documentation/snippets/proportional-strict-notespacing.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
diff --git a/Documentation/snippets/putting-lyrics-inside-the-staff.ly b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
new file mode 100644
index 0000000000..88f4de8b73
--- /dev/null
+++ b/Documentation/snippets/putting-lyrics-inside-the-staff.ly
@@ -0,0 +1,31 @@
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.13.39"
+
+\header {
+  lsrtags = "staff-notation, text, vocal-music"
+
+  texidoc = "
+Lyrics can be moved vertically to place them inside the staff.  The
+lyrics are moved with @code{\\override LyricText #'extra-offset = #'(0
+. dy)} and there are similar commands to move the extenders and
+hyphens.  The offset needed is established with trial and error.
+
+
+
+
+"
+  doctitle = "Putting lyrics inside the staff"
+} % begin verbatim
+
+<<
+  \new Staff <<
+    \new Voice = "voc" \relative c' { \stemDown a bes c8 b c4 }
+>>
+  \new Lyrics \with {
+    \override LyricText #'extra-offset = #'(0 . 8.6)
+    \override LyricExtender #'extra-offset = #'(0 . 8.6)
+    \override LyricHyphen #'extra-offset = #'(0 . 8.6)
+  } \lyricsto "voc" { La la -- la __ _ la }
+>>
diff --git a/Documentation/snippets/quoting-another-voice-with-transposition.ly b/Documentation/snippets/quoting-another-voice-with-transposition.ly
index 5dc74ff4a0..af3e7e83c6 100644
--- a/Documentation/snippets/quoting-another-voice-with-transposition.ly
+++ b/Documentation/snippets/quoting-another-voice-with-transposition.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, staff-notation"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los pasajes citados tienen en cuenta la transposición de la fuente
 tanto como la del destino.  En este ejemplo, todos los
diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
index e35a801723..db4e5e1bf1 100644
--- a/Documentation/snippets/quoting-another-voice.ly
+++ b/Documentation/snippets/quoting-another-voice.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 La propiedad @code{quotedEventTypes} determina los tipos de eventos
diff --git a/Documentation/snippets/recorder-fingering-chart.ly b/Documentation/snippets/recorder-fingering-chart.ly
index e5178544c8..45275a57c1 100644
--- a/Documentation/snippets/recorder-fingering-chart.ly
+++ b/Documentation/snippets/recorder-fingering-chart.ly
@@ -1,9 +1,11 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
+  lsrtags = "winds"
+
 %% Translation of GIT committish: 496c48f1f2e4d345ae3637b2c38ec748a55cda1d
   texidocfr = "
 Cet exemple illustre la manière de créer et afficher des indications de 
@@ -13,8 +15,6 @@ doigté pour instrument à vent.
   doctitlefr = "Doigtés pour flûte à bec"
 
 
-  lsrtags = "winds"
-
   texidoc = "
 The following example demonstrates how fingering charts for wind
 instruments can be realized.
diff --git a/Documentation/snippets/redefining-grace-note-global-defaults.ly b/Documentation/snippets/redefining-grace-note-global-defaults.ly
index 811798f260..9d492fefc8 100644
--- a/Documentation/snippets/redefining-grace-note-global-defaults.ly
+++ b/Documentation/snippets/redefining-grace-note-global-defaults.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Los valores predeterminados para las notas de adorno están
diff --git a/Documentation/snippets/removing-bar-numbers-from-a-score.ly b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
index 744b59b9c9..b9ccaabf70 100644
--- a/Documentation/snippets/removing-bar-numbers-from-a-score.ly
+++ b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Se pueden eliminar completamente los números de compás quitando el
diff --git a/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly b/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
index 274de89b55..34a06af814 100644
--- a/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
+++ b/Documentation/snippets/removing-connecting-bar-lines-on-staffgroup,-pianostaff,-or-grandstaff.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 De forma predeterminada, las líneas divisorias en los grupos
 StaffGroup, PianoStaff o GrandStaff se conectan entre los pentagramas.
diff --git a/Documentation/snippets/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
index 46c6471ff8..9860646e0a 100644
--- a/Documentation/snippets/removing-the-first-empty-line.ly
+++ b/Documentation/snippets/removing-the-first-empty-line.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, breaks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El primer pentagrama vacío también se puede suprimir de la
 partitura estableciendo la propiedad @code{remove-first} de
diff --git a/Documentation/snippets/repeats-headword.ly b/Documentation/snippets/repeats-headword.ly
index e703c067d3..7358594f1d 100644
--- a/Documentation/snippets/repeats-headword.ly
+++ b/Documentation/snippets/repeats-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index b33d63c596..63b049b43f 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, ancient-notation, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Estilos de silencios"
   texidoces = "
 Los silencios se pueden imprimir en distintos estilos.
diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly
index 6905849c0f..86e535fd64 100644
--- a/Documentation/snippets/reverting-default-beam-endings.ly
+++ b/Documentation/snippets/reverting-default-beam-endings.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Para tipografiar las barras agrupadas en la forma @code{3-4-3-2} sólo
 es necesario modificar la estructura de pulsos:
diff --git a/Documentation/snippets/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly
index d40b745501..6cacb72850 100644
--- a/Documentation/snippets/rhythmic-slashes.ly
+++ b/Documentation/snippets/rhythmic-slashes.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly
index 1fea62052f..d52d09ecc2 100644
--- a/Documentation/snippets/rhythms-headword.ly
+++ b/Documentation/snippets/rhythms-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly
index 4bc0d0e175..10503623d8 100644
--- a/Documentation/snippets/satb-choir-template---four-staves.ly
+++ b/Documentation/snippets/satb-choir-template---four-staves.ly
@@ -1,9 +1,20 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
+  lsrtags = "vocal-music, template"
+
+%% Translation of GIT committish:  144cd434d02e6d90b2fb738eeee99119a7c5e1d2
+
+  texidocde = "
+SATB-Chorvorlage auf vier Systemen
+
+"
+  doctitlede = "SATB-Chorvorlage auf vier Systemen"
+
+
 %% Translation of GIT committish: 092f85605dcea69efff5ef31de4ff100346d6ef8
 
   texidocfr = "
@@ -14,8 +25,6 @@ portée.
   doctitlefr = "Modèle pour chœur SATB sur quatre portées"
 
 
-  lsrtags = "vocal-music, template"
-
   texidoc = "
 SATB choir template (four staves)
 
@@ -26,38 +35,57 @@ SATB choir template (four staves)
 global = {
   \key c \major
   \time 4/4
+  \dynamicUp
+}
+sopranonotes = \relative c'' {
+  c2 \p \< d c d \f
 }
-sopranonotes = \relative c'' {c2 d2}
-sopranowords = \lyricmode { do do }
-altonotes = \relative c'' {c2 d2}
-altowords = \lyricmode { re re }
+sopranowords = \lyricmode { do do do do }
+altonotes = \relative c'' {
+  c2\p d c d
+}
+altowords = \lyricmode { re re re re }
 tenornotes = {
-  \clef "G_8" c2 d2}
-tenorwords = \lyricmode { mi mi }
+  \clef "G_8"
+  c2\mp d c d
+}
+tenorwords = \lyricmode { mi mi mi mi }
 bassnotes = {
-  \clef bass c2 d2}
-basswords = \lyricmode { mi mi }
-
-\score{
-  \context ChoirStaff
-  <<
-    \context Staff = soprano <<
-      \context Voice = sop { << \global \sopranonotes >> }
-      \lyricsto "sop" \new Lyrics \sopranowords
+  \clef bass
+  c2\mf d c d
+}
+basswords = \lyricmode { mi mi mi mi }
+
+\score {
+  \new ChoirStaff <<
+    \new Staff <<
+      \new Voice = "soprano" <<
+        \global
+        \sopranonotes
+      >>
+      \lyricsto "soprano" \new Lyrics \sopranowords
     >>
-    \context Staff = alto <<
-      \context Voice = alt { << \global \altonotes >> }
-      \lyricsto "alt" \new Lyrics \altowords
+    \new Staff <<
+      \new Voice = "alto" <<
+        \global
+        \altonotes
+      >>
+      \lyricsto "alto" \new Lyrics \altowords
     >>
-    \context Staff = tenor <<
-      \context Voice = ten { << \global \tenornotes >> }
-      \lyricsto "ten" \new Lyrics \tenorwords
+    \new Staff <<
+      \new Voice = "tenor" <<
+        \global
+        \tenornotes
+      >>
+      \lyricsto "tenor" \new Lyrics \tenorwords
     >>
-    \context Staff = bass <<
-      \context Voice = bas { << \global \bassnotes >> }
-      \lyricsto "bas" \new Lyrics \basswords
+    \new Staff <<
+      \new Voice = "bass" <<
+        \global
+        \bassnotes
+      >>
+      \lyricsto "bass" \new Lyrics \basswords
     >>
   >>
 }
 
-
diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly
index b346ae3184..be01ba6b73 100644
--- a/Documentation/snippets/score-for-diatonic-accordion.ly
+++ b/Documentation/snippets/score-for-diatonic-accordion.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "template"
diff --git a/Documentation/snippets/screech-boink.ly b/Documentation/snippets/screech-boink.ly
index 536429d378..7bc93ece76 100644
--- a/Documentation/snippets/screech-boink.ly
+++ b/Documentation/snippets/screech-boink.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \header {
   lsrtags = "headwords"
   texidoc = "Random complex notation"
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 b599999a2f..babbd302c7 100644
--- a/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
+++ b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, tweaks-and-overrides"
diff --git a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
index c5204ba8f4..508d14fc0c 100644
--- a/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
+++ b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Si la nota que da fin a un regulador cae sobre la primera parte de
 un compás, el regulador se detiene en la línea divisoria
diff --git a/Documentation/snippets/setting-system-separators.ly b/Documentation/snippets/setting-system-separators.ly
index e988a12ea0..2ffeb079f3 100644
--- a/Documentation/snippets/setting-system-separators.ly
+++ b/Documentation/snippets/setting-system-separators.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden insertar separadores sistema entre los sistemas de una
 página.  Se puede usar cualquier elemento de marcado, pero
diff --git a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
index 5cd98ee800..633b2b4aa4 100644
--- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
+++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
@@ -1,10 +1,10 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.26
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \header {
-%% Translation of GIT committish: 158658dc75b6f6553e77ff53119ac802eb91f50c
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
diff --git a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
index c1fc671781..f7727b9a3c 100644
--- a/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
+++ b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Si los reguladores son demasiado cortos, se pueden alargar
 modificando la propiedad @code{minimum-length} del objeto
diff --git a/Documentation/snippets/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly
index 505285f62b..09e6be2179 100644
--- a/Documentation/snippets/shortening-volta-brackets.ly
+++ b/Documentation/snippets/shortening-volta-brackets.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 De forma predeterminada, los corchetes de primera y segunda vez se
 trazan encima de los finales alternativos completos, pero es posible
diff --git a/Documentation/snippets/showing-chords-at-changes.ly b/Documentation/snippets/showing-chords-at-changes.ly
index fc753f8947..8a44adeb7f 100644
--- a/Documentation/snippets/showing-chords-at-changes.ly
+++ b/Documentation/snippets/showing-chords-at-changes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se pueden imprimir los acordes exclusivamente al comienzo de las
 líneas y cuando cambia el acorde.
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 b92baa8777..877386b232 100644
--- a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+++ b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.27
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
diff --git a/Documentation/snippets/simple-lead-sheet.ly b/Documentation/snippets/simple-lead-sheet.ly
index ab4f880297..5cdf054156 100644
--- a/Documentation/snippets/simple-lead-sheet.ly
+++ b/Documentation/snippets/simple-lead-sheet.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Al juntar nombres de acorde en cifrado americano, melodía y letra,
 obtenemos una hoja guía de acordes o «lead sheet»:
diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index d81490500a..019f655f20 100644
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
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 6f3e043911..1a5d5f2501 100644
--- a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, chords, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Esta plantilla facilita la preparación de una canción con melodía,
 letra y acordes.
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 a6b6450fef..b57604957c 100644
--- a/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
+++ b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, chords, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Presentamos a continuación un ejemplo de plantilla para una hoja
 guía de acordes con melodía, letra, acordes y diagramas de
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 81333dd9b3..c200bbebb2 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 ¿Quiere preparar una hoja guía de acordes (o «lead sheet») con
 melodía y acordes?  ¡No busque más!
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 08938eb63d..e78889a5bb 100644
--- a/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
+++ b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Esta pequeña plantilla muestra una melodía sencilla con letra. Córtela
 y péguela, escriba las notas y luego la letra. Este ejemplo desactiva
diff --git a/Documentation/snippets/single-staff-template-with-only-notes.ly b/Documentation/snippets/single-staff-template-with-only-notes.ly
index ee88a2b3ef..7ec07c004b 100644
--- a/Documentation/snippets/single-staff-template-with-only-notes.ly
+++ b/Documentation/snippets/single-staff-template-with-only-notes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Esta plantilla simple prepara un pentagrama con notas, adecuado para
 un instrumento solista o un fragmento melódico. Córtelo y péguelo en
diff --git a/Documentation/snippets/skips-in-lyric-mode-2.ly b/Documentation/snippets/skips-in-lyric-mode-2.ly
index b2cf748365..91360fa154 100644
--- a/Documentation/snippets/skips-in-lyric-mode-2.ly
+++ b/Documentation/snippets/skips-in-lyric-mode-2.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, vocal-music"
diff --git a/Documentation/snippets/skips-in-lyric-mode.ly b/Documentation/snippets/skips-in-lyric-mode.ly
index f427a46ffc..84d8ce774f 100644
--- a/Documentation/snippets/skips-in-lyric-mode.ly
+++ b/Documentation/snippets/skips-in-lyric-mode.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, vocal-music"
diff --git a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
index 8688746169..802fbead98 100644
--- a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
+++ b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Marca de pizzicato de chasquido (`pizzicato de Bartók')"
   texidoces = "
 El pizzicato de chasquido (también llamado @q{Pizzicato de Bartók}) es un
diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly
index d450fd0357..cd7826e856 100644
--- a/Documentation/snippets/staff-headword.ly
+++ b/Documentation/snippets/staff-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "catalan.ly"
 #(set-global-staff-size 15)
 \paper{
diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
index 6d256b9d3a..d0148c8da0 100644
--- a/Documentation/snippets/staff-notation.snippet-list
+++ b/Documentation/snippets/staff-notation.snippet-list
@@ -17,6 +17,8 @@ mensurstriche-layout-bar-lines-between-the-staves.ly
 modern-tab-text-clef.ly
 nesting-staves.ly
 non-traditional-key-signatures.ly
+orchestra,-choir-and-piano-template.ly
+putting-lyrics-inside-the-staff.ly
 quoting-another-voice-with-transposition.ly
 quoting-another-voice.ly
 removing-the-first-empty-line.ly
diff --git a/Documentation/snippets/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly
index 198b1c0b8b..9b499eba83 100644
--- a/Documentation/snippets/stand-alone-two-column-markup.ly
+++ b/Documentation/snippets/stand-alone-two-column-markup.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Los textos independientes se pueden disponer en varias columnas
 utilizando instrucciones @code{\\markup}:
diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
index c21d261d14..45d0bd37a0 100644
--- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
+++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.4
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 La dirección de las plicas se contola de la misma forma en la
 tablatura que en la notación tradicional. Las barras se pueden
diff --git a/Documentation/snippets/stemlets.ly b/Documentation/snippets/stemlets.ly
index bb804fc862..077427ea7d 100644
--- a/Documentation/snippets/stemlets.ly
+++ b/Documentation/snippets/stemlets.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
diff --git a/Documentation/snippets/string-number-extender-lines.ly b/Documentation/snippets/string-number-extender-lines.ly
index c2da70bda1..758a444a40 100644
--- a/Documentation/snippets/string-number-extender-lines.ly
+++ b/Documentation/snippets/string-number-extender-lines.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, text, fretted-strings, tweaks-and-overrides"
diff --git a/Documentation/snippets/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
index 4e0b26834f..1684536830 100644
--- a/Documentation/snippets/string-quartet-template-simple.ly
+++ b/Documentation/snippets/string-quartet-template-simple.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "unfretted-strings, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Esta plantilla muestra un cuarteto de cuerda normal. También utiliza
 una sección @code{\\global} para el compás y la armadura
diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
index 942d927aea..3d2739054f 100644
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "unfretted-strings, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 El fragmento de código @qq{Plantilla de cuarteto de cuerda} produce un
 resultado satisfactorio para el cuarteto, pero ¿y si tenemos que
diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index d55ef22a3f..384e3bd3b2 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.29
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 882fad9e56..71c2cf8594 100644
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
diff --git a/Documentation/snippets/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
index ae9bde8d6d..484f926997 100644
--- a/Documentation/snippets/table-of-contents.ly
+++ b/Documentation/snippets/table-of-contents.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "paper-and-layout"
diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly
index 6f96e8f774..e26cf88053 100644
--- a/Documentation/snippets/text-headword.ly
+++ b/Documentation/snippets/text-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {
diff --git a/Documentation/snippets/text.snippet-list b/Documentation/snippets/text.snippet-list
index b7ff443e5b..9599ad506d 100644
--- a/Documentation/snippets/text.snippet-list
+++ b/Documentation/snippets/text.snippet-list
@@ -25,6 +25,7 @@ piano-template-with-centered-lyrics.ly
 printing-marks-at-the-end-of-a-line.ly
 printing-marks-on-every-staff.ly
 printing-text-from-right-to-left.ly
+putting-lyrics-inside-the-staff.ly
 stand-alone-two-column-markup.ly
 string-number-extender-lines.ly
 three-sided-box.ly
diff --git a/Documentation/snippets/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly
index ccf1668de0..93ec02f359 100644
--- a/Documentation/snippets/three-sided-box.ly
+++ b/Documentation/snippets/three-sided-box.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, text"
diff --git a/Documentation/snippets/tick-bar-lines.ly b/Documentation/snippets/tick-bar-lines.ly
index 9375fb7e64..891f3ee5bf 100644
--- a/Documentation/snippets/tick-bar-lines.ly
+++ b/Documentation/snippets/tick-bar-lines.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation"
diff --git a/Documentation/snippets/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
index 140448af49..00e6eff9e0 100644
--- a/Documentation/snippets/time-signature-in-parentheses.ly
+++ b/Documentation/snippets/time-signature-in-parentheses.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
diff --git a/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly b/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
index be2fa84069..4046ae3ec5 100644
--- a/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
+++ b/Documentation/snippets/time-signature-printing-only-the-numerator-as-a-number-instead-of-the-fraction.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
+  lsrtags = "rhythms, tweaks-and-overrides"
+
+%% Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
   texidoces = "
 
 A veces, la indicación de compás no debe imprimir la fracción completa
@@ -19,9 +21,6 @@ se puede revertir el cambio.  Para aplicar el estilo de un dígito
 "
   doctitlees = "Indicación de compás imprimiendo sólo el numerador (en lugar de la fracción)"
 
-  lsrtags = "rhythms, tweaks-and-overrides"
-
-
 %% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
 
   texidocfr = "
diff --git a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
index 990637a94d..479360a904 100644
--- a/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
+++ b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "ancient-notation, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 A modo de alternativa para obtener auténticos «incipit»
 independientes de la partitura principal, se incluyen como
diff --git a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 53fd25b9a5..f559506720 100644
--- a/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 doctitlees = "Transportar música con el menor número de alteraciones"
 texidoces = "
 Este ejemplo utiliza código de Scheme para forzar las
diff --git a/Documentation/snippets/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
index 0dbac3aa45..af510877aa 100644
--- a/Documentation/snippets/tweaking-clef-properties.ly
+++ b/Documentation/snippets/tweaking-clef-properties.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "pitches, staff-notation, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   doctitlees = "Trucaje de las propiedades de clave"
   texidoces = "
 La instrucción @code{\\clef \"treble_8\"} equivale a un ajuste de
diff --git a/Documentation/snippets/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
index ea885ab546..471439e892 100644
--- a/Documentation/snippets/tweaking-grace-layout-within-music.ly
+++ b/Documentation/snippets/tweaking-grace-layout-within-music.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 La disposición de las expresiones de adorno se puede cambiar a lo
diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 137c1bddf7..1167e5c1ba 100644
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -1,7 +1,7 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
+%% Note: this file works from version 2.13.36
 % #!lilypond lcp-extract.ly -*- coding: utf-8; -*-
 
 %%%
@@ -33,7 +33,7 @@
 
 
 
-\version "2.13.31"
+\version "2.13.39"
 #(set-global-staff-size 15)
 
 %%%
diff --git a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
index 34529e3167..0ae477c5c5 100644
--- a/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
+++ b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Se puede usar el delimitador de comienzo de un sistema
 @code{SystemStartSquare} estableciéndolo explícitamente dentro de
diff --git a/Documentation/snippets/using-alternative-flag-styles.ly b/Documentation/snippets/using-alternative-flag-styles.ly
index 4704ac6048..b45322426c 100644
--- a/Documentation/snippets/using-alternative-flag-styles.ly
+++ b/Documentation/snippets/using-alternative-flag-styles.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Se pueden imprimir estilos alternativos del corchete o gancho de las
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 342e71f2d7..1f0134c376 100644
--- a/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
+++ b/Documentation/snippets/using-arpeggiobracket-to-make-divisi-more-visible.ly
@@ -1,10 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
+  lsrtags = "expressive-marks, vocal-music"
+
+%% Translation of GIT committish: 8b9a694a483632437fb5110b3531074ddb31c04a
   texidoces = "
 El corchete de arpegios @code{arpeggioBracket} se puede usar para
 indicar la división de voces cuando no hay plicas que puedan ofrecer
@@ -15,8 +17,6 @@ esta información. Se suele encontrar en la música coral.
   doctitlees = "Uso de arpeggioBracket para hacer más visible un divisi"
 
 
-  lsrtags = "expressive-marks, vocal-music"
-
   texidoc = "
 The @code{arpeggioBracket} can be used to indicate the division of
 voices where there are no stems to provide the information. This is
diff --git a/Documentation/snippets/using-double-slurs-for-legato-chords.ly b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
index 2a257da424..3bb1663d22 100644
--- a/Documentation/snippets/using-double-slurs-for-legato-chords.ly
+++ b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Algunos compositores escriben dos ligaduras cuando quieren acordes
 legato.  Esto se puede conseguir estableciendo @code{doubleSlurs}.
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 0484386659..f41bd73091 100644
--- a/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
+++ b/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Es posible aplicar la barrita que cruza la barra de las
diff --git a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
index 4061da16f0..12efa1da8e 100644
--- a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
+++ b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.10
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   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 100fe26395..1a33183d5b 100644
--- a/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
+++ b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "editorial-annotations, tweaks-and-overrides"
diff --git a/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly b/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
index 3f844580d3..7dcb33eadd 100644
--- a/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "tweaks-and-overrides"
diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly
index c0ba9a9db3..a52b9cf1ae 100644
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.10
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 
diff --git a/Documentation/snippets/using-ties-with-arpeggios.ly b/Documentation/snippets/using-ties-with-arpeggios.ly
index 8c44135141..f161cfd76c 100644
--- a/Documentation/snippets/using-ties-with-arpeggios.ly
+++ b/Documentation/snippets/using-ties-with-arpeggios.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
  doctitlees = "Uso de ligaduras en los arpegios"
  texidoces = "
 En ocasiones se usan ligaduras de unión para escribir los arpegios.
diff --git a/Documentation/snippets/utf-8.ly b/Documentation/snippets/utf-8.ly
index 0cd3aa4966..663f5b03e0 100644
--- a/Documentation/snippets/utf-8.ly
+++ b/Documentation/snippets/utf-8.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text"
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 dc371855c7..f39af8bbb3 100644
--- a/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
+++ b/Documentation/snippets/vertical-line-as-a-baroque-articulation-mark.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks, ancient-notation"
diff --git a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
index 65d0f951f9..de2dea5510 100644
--- a/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
+++ b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Mediante el establecimiento de la propiedad @code{'Y-extent} a un valor
 adecuado, todos los objetos @code{DynamicLineSpanner} (reguladores e
diff --git a/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
index a2f5efd13f..502f515338 100644
--- a/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
+++ b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "expressive-marks"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Las expresiones dinámicas que se comienzan, terminan o se producen
 en la misma nota se alinean verticalmente.  Para asegurar que las
diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
index a19710874f..9e0bd3d795 100644
--- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
+++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, tweaks-and-overrides, spacing"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Este fragmento de código muestra el uso de las propiedades de
 contexto @code{alignBelowContext} y @code{alignAboveContext} para
diff --git a/Documentation/snippets/vertically-centered-common-lyrics.ly b/Documentation/snippets/vertically-centered-common-lyrics.ly
index bc1ca27ef6..c6fc954c1e 100644
--- a/Documentation/snippets/vertically-centered-common-lyrics.ly
+++ b/Documentation/snippets/vertically-centered-common-lyrics.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music"
diff --git a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
index 966e42f0d8..5e68a12edb 100644
--- a/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
+++ b/Documentation/snippets/vertically-centering-paired-figured-bass-extenders.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "chords, tweaks-and-overrides"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Allí donde se utilicen líneas extensoras para el bajo cifrado mediante
 el establecimiento de @code{useBassFigureExtenders} al valor
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 f81577a829..c2989a6328 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, keyboards, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 
 Esta plantilla añade una reducción de piano automática a la partitura
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 0c80dcf5ff..a4bbc993cb 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, vocal-music, contexts-and-engravers, template"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Esta plantilla es, básicamente, la misma que la sencilla plantilla
 @qq{Conjunto vocal}, excepto que aquí todas las líneas de letra se
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 442d3d2b47..f60815c316 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.21
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
 
   texidoces = "
 Esta plantilla crea una partitura que comienza con una estrofa para
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index 331e2c2eee..dd5088bf53 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "vocal-music, template"
 
-%% Translation of GIT committish: bfc88203ac2572737480e78ef2635ed35b458441
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 He aquí una partitura vocal estándar para cuatro voces SATB. Con
 grupos mayores, suele ser útil incluir una sección que aparezca en
diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
index 5f5ee829ec..1c8f51e2a2 100644
--- a/Documentation/snippets/vocal-music.snippet-list
+++ b/Documentation/snippets/vocal-music.snippet-list
@@ -14,7 +14,9 @@ how-to-put-ties-between-syllables-in-lyrics.ly
 hymn-template.ly
 lyrics-alignment.ly
 marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
+orchestra,-choir-and-piano-template.ly
 piano-template-with-melody-and-lyrics.ly
+putting-lyrics-inside-the-staff.ly
 satb-choir-template---four-staves.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
 single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
diff --git a/Documentation/snippets/volta-below-chords.ly b/Documentation/snippets/volta-below-chords.ly
index a118e243ce..fa174df890 100644
--- a/Documentation/snippets/volta-below-chords.ly
+++ b/Documentation/snippets/volta-below-chords.ly
@@ -1,12 +1,12 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, staff-notation, chords"
 
-%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+%% Translation of GIT committish: 5160eccb26cee0bfd802d844233e4a8d795a1e94
   texidoces = "
 Mediante la adición del grabador @code{Volta_engraver} al
 pentagrama pertinente, se pueden poner los corchetes de primera y
diff --git a/Documentation/snippets/volta-multi-staff.ly b/Documentation/snippets/volta-multi-staff.ly
index 5a36390c73..9cfa9728fd 100644
--- a/Documentation/snippets/volta-multi-staff.ly
+++ b/Documentation/snippets/volta-multi-staff.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, staff-notation"
diff --git a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
index 64a39c4ef9..abc31a26c4 100644
--- a/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
+++ b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.39"
 
 \header {
   lsrtags = "repeats, text"
@@ -11,6 +11,7 @@ Though volte are best specified using @code{\\repeat volta}, the
 context property @code{repeatCommands} must be used in cases where the
 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
diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly
index b6fa2bd14c..5fb6bbc898 100644
--- a/Documentation/snippets/wind-headword.ly
+++ b/Documentation/snippets/wind-headword.ly
@@ -1,8 +1,8 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.31"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 #(set-global-staff-size 15)
 \paper {
   line-width = 16\cm
diff --git a/Documentation/snippets/woodwind-diagrams-key-lists.ly b/Documentation/snippets/woodwind-diagrams-key-lists.ly
index 26f82e2b0a..589f4ffaf9 100644
--- a/Documentation/snippets/woodwind-diagrams-key-lists.ly
+++ b/Documentation/snippets/woodwind-diagrams-key-lists.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.24
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
+%%%    Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
 
   texidoces = "
 
diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly
index 1360bf6e19..24649f5f89 100644
--- a/Documentation/snippets/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/woodwind-diagrams-listing.ly
@@ -1,11 +1,11 @@
 % Do not edit this file; it is automatically
 % generated from Documentation/snippets/new
 % This file is in the public domain.
-%% Note: this file works from version 2.13.31
-\version "2.13.36"
+%% Note: this file works from version 2.13.36
+\version "2.13.39"
 
 \header {
-%%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506
+%%%    Translation of GIT committish: 298a2c322d7e4f437f3dd1a24db2839e3f35acce
   texidoces = "
 El fragmento de música que aparece a continuación presenta todos los
 diagramas de viento madera que se encuentran definidos en LilyPond por
diff --git a/Documentation/usage/external.itely b/Documentation/usage/external.itely
index 2b00222b34..95f7e86481 100644
--- a/Documentation/usage/external.itely
+++ b/Documentation/usage/external.itely
@@ -339,8 +339,7 @@ convert pitches in absolute mode.
 print usage and option summary.
 
 @item -l, --language=LANG
-use a different language file 'LANG.ly' and corresponding pitch names,
-e.g. 'deutsch' for deutsch.ly and German note names.
+use LANG for pitch names, e.g. 'deutsch' for note names in German.
 
 @item --lxml
 use the lxml.etree Python package for XML-parsing; uses less memory and cpu time.
diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely
index 51b5013e9d..80ed297ea2 100644
--- a/Documentation/usage/lilypond-book.itely
+++ b/Documentation/usage/lilypond-book.itely
@@ -454,6 +454,7 @@ Music is entered using
 \key c \minor c4 es g2
 </lilypond>
 @end example
+
 @noindent
 @command{lilypond-book} then produces an HTML file with appropriate image
 tags for the music fragments:
@@ -469,13 +470,15 @@ are separated by a colon from the music, for example
 Some music in <lilypond relative=2: a b c/> a line of text.
 @end example
 
-
 To include separate files, say
 
 @example
 <lilypondfile @var{option1} @var{option2} ...>@var{filename}</lilypondfile>
 @end example
 
+For a list of options to use with the @code{lilypond} or
+@code{lilypondfile} tags, see @ref{Music fragment options}.
+
 Additionally, @code{<lilypondversion/>} displays the current version
 of lilypond.
 
diff --git a/Documentation/web/ly-examples/cary-layout.ily b/Documentation/web/ly-examples/cary-layout.ily
index 740a025086..480426c48c 100644
--- a/Documentation/web/ly-examples/cary-layout.ily
+++ b/Documentation/web/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.12.0"
+\version "2.13.39"
 
 \layout {
   indent = #0
@@ -35,6 +35,7 @@
   printfirst-page-number = ##t
   print-page-number = ##t
   ragged-last-bottom = ##t
+  markup-system-spacing #'minimum-distance = #25
 }
 
 #(set-global-staff-size 14)
diff --git a/Documentation/web/ly-examples/cary.ly b/Documentation/web/ly-examples/cary.ly
index 9de0de0e4e..1b10e17bb2 100644
--- a/Documentation/web/ly-examples/cary.ly
+++ b/Documentation/web/ly-examples/cary.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.13.39"
 % the example header file caused the head to be chopped off
 %\include "example-header.ily"
 
@@ -39,7 +39,6 @@
 			\override TupletBracket #'direction = #down
 			\override TupletBracket #'staff-padding = #5
 			\override TupletBracket #'padding = #2.25
-			\override VerticalAxisGroup #'minimum-Y-extent = #'(10 . 10)
 		} <<
 			
 			\new Voice {
@@ -101,7 +100,6 @@
 			\override Stem #'direction = #down
 			\override TupletBracket #'staff-padding = #5
 			\override TupletBracket #'padding = #2.25
-			\override VerticalAxisGroup #'minimum-Y-extent = #'(10 . 10)
 		} <<
 			
 			\new Voice \with {
diff --git a/Documentation/web/ly-examples/orchestra.ly b/Documentation/web/ly-examples/orchestra.ly
index edcdcc64ce..0b43811af3 100644
--- a/Documentation/web/ly-examples/orchestra.ly
+++ b/Documentation/web/ly-examples/orchestra.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
   tagline = ##f
@@ -49,35 +49,8 @@ offCr = {
   \revert DynamicTextSpanner #'style
 }
 
-%% Layout to produce piano dynamics context
+%% Layout for piano dynamics
 \layout {
-  \context {
-    \type "Engraver_group"
-    \name Dynamics
-    \alias Voice
-    \consists "Output_property_engraver"
-    \consists "Axis_group_engraver"
-    \consists "Piano_pedal_engraver"
-    pedalSustainStrings = #'("Ped." "*Ped." "*")
-    pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-    \consists "Script_engraver"
-    \consists "New_dynamic_engraver"
-    \consists "Dynamic_align_engraver"
-    \consists "Text_engraver"
-    \consists "Text_spanner_engraver"
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-    \override DynamicLineSpanner #'Y-offset = #0
-    \override TextScript #'font-size = #2
-    \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER
-    \override TextScript #'font-shape = #'italic
-    \override TextSpanner #'breakable = ##t
-    \override DynamicLineSpanner #'breakable = ##t
-    \override DynamicTextSpanner #'breakable = ##t
-  }
-  \context {
-    \PianoStaff
-    \accepts "Dynamics"
-  }
   \context {
     \Voice
     \override Glissando #'breakable = ##t
@@ -134,7 +107,9 @@ offCr = {
     \consists "Text_engraver"
     \consists "Text_spanner_engraver"
     \consists "Font_size_engraver"
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-2 . 2 )
+    \override VerticalAxisGroup #'staff-affinity = #DOWN
+    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #2
+    \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #5
     \override TextSpanner #'breakable = ##t
   }
   \context {
diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 369dd454da..730c86c591 100644
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,6 +9,21 @@
 @c used for news about the upcoming release; see CG 10.2
 
 
+@newsItem
+@subsubheading LilyPond 2.13.40 released!  @emph{Nov 21, 2010}
+
+We are happy to announce the release of LilyPond 2.13.40.  This
+release contains the usual number of bugfixes.  However, a number
+of critical issues still remain, so this release is intended for
+developers only.
+
+Please note that this is @strong{not} the second beta test.  Due
+to a number of untested changes to our build process, we cannot be
+at all confident about the quality of this release.
+
+@newsEnd
+
+
 @newsItem
 @subsubheading Beta test one of 2.14 -- LilyPond 2.13.39 released! @emph{Nov 15, 2010}
 
diff --git a/VERSION b/VERSION
index 7b1993b2d1..d77b08e3fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=13
-PATCH_LEVEL=40
+PATCH_LEVEL=41
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.12.3
-VERSION_DEVEL=2.13.39
+VERSION_DEVEL=2.13.40
diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 6674e53e43..d7ed6e05d4 100644
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -2,7 +2,7 @@
 \version "2.12.0"
 
 
-    
+
 \header {
 
      texidoc = "This shows how different settings on \paper modify the
@@ -10,9 +10,9 @@ general page layout. Basically \paper will set the values for the
 whole paper while \layout for each \score block.
 
 This file is best viewed outside the collated files document.
-" 
+"
+
 
- 
     title = "Title"
     subtitle = "(and (the) subtitle)"
     subsubtitle = "Sub sub title"
@@ -29,8 +29,6 @@ This file is best viewed outside the collated files document.
     %paper-height = 2\cm
     top-margin = 2\cm
     bottom-margin = 2\cm
-    %heap-separation = 7\cm
-    %foot-separation = 7\cm
     ragged-bottom = ##t
     ragged-last-bottom = ##t
     left-margin = 3\cm
@@ -41,7 +39,7 @@ This file is best viewed outside the collated files document.
     annotate-spacing = ##t
 
 
-    
+
   }
 
 
diff --git a/input/regression/paper-default-margins-a6.ly b/input/regression/paper-default-margins-a6.ly
index ae1b8085d4..d813e59de9 100644
--- a/input/regression/paper-default-margins-a6.ly
+++ b/input/regression/paper-default-margins-a6.ly
@@ -1,10 +1,10 @@
 \version "2.13.7"
 
 \header {
-  texidoc = "Default margin values are accessible in paper-defaults-init.ly
-and apply to the default paper size returned by (ly:get-option
-'paper-size). For other paper sizes, they are scaled linearly.
-This also affects head- and foot-separation as well as indents."
+  texidoc = "Default values for margins, indents, and offsets are
+accessible in paper-defaults-init.ly and apply to the default
+paper size returned by (ly:get-option 'paper-size).  For other
+paper sizes, they are scaled linearly."
 }
 
 someNotes = \repeat unfold 20 { c4 d e f }
diff --git a/input/regression/paper-default-margins-def.ly b/input/regression/paper-default-margins-def.ly
index 8e2222901f..55954c79b9 100644
--- a/input/regression/paper-default-margins-def.ly
+++ b/input/regression/paper-default-margins-def.ly
@@ -1,10 +1,10 @@
 \version "2.13.7"
 
 \header {
-  texidoc = "Default margin values are accessible in paper-defaults-init.ly
-and apply to the default paper size returned by (ly:get-option
-'paper-size). For other paper sizes, they are scaled linearly.
-This also affects head- and foot-separation as well as indents."
+  texidoc = "Default values for margins, indents, and offsets are
+accessible in paper-defaults-init.ly and apply to the default
+paper size returned by (ly:get-option 'paper-size).  For other
+paper sizes, they are scaled linearly."
 }
 
 someNotes = \repeat unfold 30 { c4 d e f }
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index eb1947509d..f3618daf49 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -566,7 +566,7 @@ format_single_argument (SCM arg, int precision, bool escape = false)
     return (ly_symbol2string (arg));
   else
     {
-      ly_progress (scm_from_locale_string ("Unsupported SCM value for format: ~a"),
+      ly_progress (scm_from_locale_string ("\nUnsupported SCM value for format: ~a"),
 		   scm_list_1 (arg));
     }
 
diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index 8acef86cd5..1a39ad51e8 100644
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -193,10 +193,11 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real inde
   extract_grob_set (align, "elements", all_elts);
   vector<Grob*> elts = filter_dead_elements (all_elts);
   vector<Real> minimum_offsets = Align_interface::get_minimum_translations_without_min_dist (align, elts, Y_AXIS);
+  vector<Real> minimum_offsets_with_min_dist = Align_interface::get_minimum_translations (align, elts, Y_AXIS);
 
   Skyline up_skyline (UP);
   Skyline down_skyline (DOWN);
-  build_system_skyline (elts, minimum_offsets, &up_skyline, &down_skyline);
+  build_system_skyline (elts, minimum_offsets_with_min_dist, &up_skyline, &down_skyline);
   up_skyline.shift (indent);
   down_skyline.shift (indent);
 
diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 8fbc6fdee8..cdb4968161 100644
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -3,7 +3,7 @@
   $Id$
 %}
 
-\version "2.12.0"
+\version "2.13.39"
 
 %
 % Declare memorable shortcuts for special unicode characters
@@ -293,7 +293,7 @@ neumeDemoLayout = \layout {
 	\override StaffSymbol #'transparent = ##t
 	\remove "Time_signature_engraver"
 	\remove "Bar_engraver"
-	\override VerticalAxisGroup #'minimum-Y-extent = ##f
+	\override VerticalAxisGroup #'staff-staff-spacing = #'()
     }
     \context {
 	\Voice
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index f3e3777785..82f5a91648 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -614,7 +614,6 @@ that they share a staff.")
    (make-part-combine-music parser
                             (list part1 part2)))
 
-#(define (symbol-or-boolean? x) (or (symbol? x) (boolean? x)))
 partcombineForce =
 #(define-music-function (location parser type once) (symbol-or-boolean? boolean?)
    (_i "Override the part-combiner.")
diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index be908e30fd..e18e12019d 100644
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -20,6 +20,8 @@
 \version "2.12.0"
 
 \paper {
+  #(set-paper-dimension-variables (current-module))
+
   %%% WARNING
   %%%
   %%% If you add any new dimensions, don't forget to update
@@ -31,31 +33,33 @@
   pt = #(/ in 72.27)
   cm = #(* 10 mm)
 
-  print-page-number = ##t
+  % 20pt staff, 5 pt = 1.75 mm
+  output-scale = #1.7573
 
-  %%
-  %% 20pt staff, 5 pt = 1.75 mm
-  %%
+  %% ugh. hard coded?
+  #(layout-set-absolute-staff-size (* 20.0 pt))
 
-  output-scale = #1.7573
 
-  #(define-public book-title (marked-up-title 'bookTitleMarkup))
-  #(define-public score-title (marked-up-title 'scoreTitleMarkup))
+  %% Automatic scaling to paper size:
+  %%
+  %% Margins, indents, and offsets marked "scaled to paper size"
+  %% below apply to the default paper format given by
+  %% (ly:get-option 'paper-size) and are scaled accordingly for
+  %% other formats.
+
 
   %%
-  %% ugh. hard coded?
+  %% Fixed vertical spacing
   %%
-
-  #(layout-set-absolute-staff-size (* 20.0 pt))
+  top-margin-default = 5\mm     % scaled to paper-size
+  bottom-margin-default = 6\mm  % scaled to paper-size
+  ragged-bottom = ##f
+  ragged-last-bottom = ##t  % best for shorter scores
 
 
-  #(define-public score-title-properties
-     '((is-title . #t)
-       (is-book-title . #f)))
-  #(define-public book-title-properties
-     '((is-title . #t)
-       (is-book-title . #t)))
-
+  %%
+  %% Flexible vertical spacing
+  %%
   %% Note: these are not scaled; they are in staff-spaces.
   system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1) (stretchability . 60))
   score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120))
@@ -66,61 +70,76 @@
   top-markup-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0))
   last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))
 
-  ragged-bottom = ##f
 
   %%
-  %% looks best for shorter scores.
+  %% Widths and (horizontal) margins
   %%
-  ragged-last-bottom = ##t
+  left-margin-default = 10\mm   % scaled to paper-size
+  right-margin-default = 10\mm  % scaled to paper-size
+  check-consistency = ##t
+
 
   %%
-  %% settings for the page breaker
+  %% Two-sided mode
+  %%
+  two-sided = ##f
+  inner-margin-default = 10\mm   % scaled to paper-size
+  outer-margin-default = 20\mm   % scaled to paper-size
+  binding-offset-default = 0\mm  % scaled to paper-size
+
+
+  %%
+  %% Indents
+  %%
+  indent-default = 15\mm       % scaled to paper-size
+  short-indent-default = 0\mm  % scaled to paper-size
+
+
+  %%
+  %% Page breaking
   %%
-  blank-last-page-force = 0
   blank-after-score-page-force = 2
+  blank-last-page-force = 0
   blank-page-force = 5
+  page-breaking = #ly:optimal-breaking
 
-  #(define font-defaults
-    '((font-family . feta) (font-encoding . fetaMusic)))
 
   %%
-  %% the font encoding `latin1' is a dummy value for Pango fonts
+  %% Page numbering
   %%
-  #(define text-font-defaults
-     `((font-encoding . latin1)
-       (baseline-skip . 3)
-       (word-space . 0.6)))
+  first-page-number = #1
+  print-first-page-number = ##f
+  print-page-number = ##t
 
-  #(define page-breaking ly:optimal-breaking)
 
+  %%
+  %% Headers, footers, and titles
+  %%
   #(define make-header (marked-up-headfoot 'oddHeaderMarkup 'evenHeaderMarkup))
   #(define make-footer (marked-up-headfoot 'oddFooterMarkup 'evenFooterMarkup))
-  #(set-paper-dimension-variables (current-module))
-
-  \include "titling-init.ly"
-
-  check-consistency = ##t
-  two-sided = ##f
-
-  % These margins apply to the default paper format given by (ly:get-option 'paper-size)
-  % and are scaled accordingly for other formats
 
-  top-margin-default = 5 \mm
-  bottom-margin-default = 6 \mm
+  #(define-public book-title (marked-up-title 'bookTitleMarkup))
+  #(define-public score-title (marked-up-title 'scoreTitleMarkup))
+  #(define-public score-title-properties
+     '((is-title . #t)
+       (is-book-title . #f)))
+  #(define-public book-title-properties
+     '((is-title . #t)
+       (is-book-title . #t)))
 
-  left-margin-default = 10 \mm
-  right-margin-default = 10 \mm
+  \include "titling-init.ly"
 
-  inner-margin-default = 10 \mm
-  outer-margin-default = 20 \mm
-  binding-offset-default = 0 \mm
 
-  head-separation-default = 4 \mm
-  foot-separation-default = 4 \mm
+  %%
+  %% Fonts
+  %%
+  #(define font-defaults
+    '((font-family . feta) (font-encoding . fetaMusic)))
 
-  indent-default = 15 \mm
-  short-indent-default = 0 \mm
+  % `latin1' is a dummy value for Pango fonts
+  #(define text-font-defaults
+     `((font-encoding . latin1)
+       (baseline-skip . 3)
+       (word-space . 0.6)))
 
-  first-page-number = #1
-  print-first-page-number = ##f
 }
diff --git a/python/convertrules.py b/python/convertrules.py
index d1d393ae5f..3ea4739db0 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3092,6 +3092,22 @@ def conv(str):
 
     return str
 
+@rule ((2, 13, 40),
+    _ ("Remove \\paper variables head-separation and foot-separation."))
+def conv(str):
+    if re.search(r'head-separation', str):
+        stderr_write("\n")
+        stderr_write(NOT_SMART % ("head-separation.\n"))
+        stderr_write(_ ("Adjust settings for top-system-spacing instead.\n"))
+        stderr_write(UPDATE_MANUALLY)
+    if re.search(r'foot-separation', str):
+        stderr_write("\n")
+        stderr_write(NOT_SMART % ("foot-separation.\n"))
+        stderr_write(_ ("Adjust settings for last-bottom-spacing instead.\n"))
+        stderr_write(UPDATE_MANUALLY);
+
+    return str
+
 
 # Guidelines to write rules (please keep this at the end of this file)
 #
diff --git a/scm/c++.scm b/scm/c++.scm
index bc518030ae..7f28900917 100644
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -55,6 +55,8 @@
 
 (define-public (scheme? x) #t)
 
+(define-public (symbol-or-boolean? x)
+  (or (symbol? x) (boolean? x)))
 
 ;; moved list to end of lily.scm: then all type-predicates are
 ;; defined.
diff --git a/scm/paper.scm b/scm/paper.scm
index 93566d5e45..2cd6513d1d 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -20,8 +20,6 @@
 		  '(blot-diameter
 		    bottom-margin
 		    cm
-		    foot-separation
-		    head-separation
 		    horizontal-shift
 		    in
 		    indent
@@ -251,8 +249,6 @@ size. SZ is in points"
 			   (("binding-offset" . ,w) . '())
 			   (("top-margin" . ,h) . '())
 			   (("bottom-margin" . ,h) . '())
-			   (("head-separation" . ,h) . '())
-			   (("foot-separation" . ,h) . '())
 			   (("indent" . ,w) . '())
 			   (("short-indent" . ,w) . '())))
        (scaled-values
@@ -337,7 +333,7 @@ size. SZ is in points"
      (lambda (v)
        (let* ((var (module-variable old-scope v))
 	      (val (if (variable? var) (variable-ref var) #f)))
-	 
+
 	 (if (number? val)
 	     (module-define! scope v (/ val scale))
 	     ;; Cannot warn for non-numbers, eg. for paper-width, paper-height.
diff --git a/scripts/auxiliar/lily-git.tcl b/scripts/auxiliar/lily-git.tcl
index 966ae823c7..09d71f1eb3 100755
--- a/scripts/auxiliar/lily-git.tcl
+++ b/scripts/auxiliar/lily-git.tcl
@@ -12,24 +12,69 @@ set translator 0
 # location of lilypond git
 set lily_dir $env(HOME)/lilypond-git
 
-
 if {$translator == 1} {
-        set windowTitle \
-          "LilyPond Translator's Git Interface version $version"
-        set updateButtonText "1. Update translation"
-        set initializeButtonText "1. Get translation"
-        set originHead "lilypond/translation"
-        set rebase 0
+    set windowTitle \
+        "LilyPond Translator's Git Interface version $version"
+    set updateButtonText "1. Update translation"
+    set initializeButtonText "1. Get translation"
+    set originHead "lilypond/translation"
+    set rebase 0
 } else {
-        set windowTitle \
-          "LilyPond Contributor's Git Interface version $version"
-        set updateButtonText "1. Update source"
-        set initializeButtonText "1. Get source"
-        set originHead "master"
-        set rebase 1
+    set windowTitle \
+        "LilyPond Contributor's Git Interface version $version"
+    set updateButtonText "1. Update source"
+    set initializeButtonText "1. Get source"
+    set originHead "master"
+    set rebase 1
 }
 package require Tk
 
+##  Submits the user data collected using the git config command
+
+proc submituserdata {} {
+    exec git config --global user.name "$::username"
+    exec git config --global user.email "$::useremail"
+    destroy .b
+    return 0
+}
+
+##  Request name and email from user
+
+proc requestuserdata {} {
+    toplevel .b
+    grab .b
+    wm geometry .b -300-300
+    wm title .b "Contributor details"
+    grid [frame .b.c ] -column 0 -row 0 -sticky nwes
+    grid columnconfigure . 0 -weight 1; grid rowconfigure . 0 -weight 1
+
+    grid [entry .b.c.username -width 20 -textvariable username] -column 2 -row 2 -sticky we
+    grid [entry .b.c.useremail -width 20 -textvariable useremail] -column 2 -row 3 -sticky we
+    grid [button .b.c.submituserdata -text "Submit" -command submituserdata] -column 2 -row 4
+
+    grid [label .b.c.explbl -text "Please enter your name and email for future commits:"] -column 1 -row 1 -columnspan 3 -sticky we
+    grid [label .b.c.nmlbl -text "Name:"] -column 1 -row 2  -sticky w
+    grid [label .b.c.emlbl -text "Email:"] -column 1 -row 3 -sticky w
+
+    foreach w [winfo children .b.c] {grid configure $w -padx 5 -pady 5}
+    focus .b.c.username
+    bind .b <Return> {submituserdata}
+}
+
+##  Checks the user's global .gitconfig for name and email and executes requestuserdata if either is not found
+
+if {![file exists "$env(HOME)/.gitconfig"]} {
+    set fileholder [open "$env(HOME)/.gitconfig" a+]
+} else {
+    set fileholder [open "$env(HOME)/.gitconfig" r]
+}
+
+set usercheck [split [read $fileholder] "\n"]
+close $fileholder
+if {![regexp "name" $usercheck] || ![regexp "email" $usercheck]} then {
+    requestuserdata
+    tkwait window .b
+}
 
 ##  Entry limit routine from jeff at hobbs org, downloaded from
 ##  http://www.purl.org/net/hobbs/tcl/tclet/entrylimit.html
@@ -42,10 +87,13 @@ proc forceLen {len name el op} {
     if [string comp $el {}] {
         set old  ${name}_len\($el)
         set name $name\($el)
-    } else { set old ${name}_len }
+    } else {
+        set old ${name}_len
+    }
     if {[string length [set $name]] > $len} {
         set $name [set $old]
-        bell; return
+        bell;
+        return
     }
     set $old [set $name]
 }
@@ -71,266 +119,266 @@ set commit_header {}
 # Helper functions
 
 if {[file exists $lily_dir]} {
-	cd $lily_dir
+    cd $lily_dir
 }
 
 set abort_dir "./aborted_edits"
 
 proc write_to_output {s} {
-	.output.text insert insert $s
-	.output.text see end
+    .output.text insert insert $s
+    .output.text see end
 }
 
 proc write_file_to_output {f} {
-	if {[eof $f]} {
-		global git_command
-		fconfigure $f -blocking true
-		if {[catch {close $f} err]} {
-			tk_messageBox -type ok -message \
-                          "Command returned an error: $err\n\nCheck output text for details"
-		}
-		unset git_command
-	} else {
-		write_to_output [read $f 24]
-	}
+    if {[eof $f]} {
+        global git_command
+        fconfigure $f -blocking true
+        if {[catch {close $f} err]} {
+            tk_messageBox -type ok -message \
+                "Command returned an error: $err\n\nCheck output text for details"
+        }
+        unset git_command
+    } else {
+        write_to_output [read $f 24]
+    }
 }
 
 proc git {args} {
-	global lily_dir git_command
-	set git_command [linsert $args 0 "|git" "--git-dir=$lily_dir/.git"]
-	set git_command "$git_command 2>@1"
-	.output.text insert end "$git_command\n"
-	set git [open $git_command r]
-	fconfigure $git -blocking false
-	fileevent $git readable [list write_file_to_output $git]
-	vwait git_command
+    global lily_dir git_command
+    set git_command [linsert $args 0 "|git" "--git-dir=$lily_dir/.git"]
+    set git_command "$git_command 2>@1"
+    .output.text insert end "$git_command\n"
+    set git [open $git_command r]
+    fconfigure $git -blocking false
+    fileevent $git readable [list write_file_to_output $git]
+    vwait git_command
 }
 
 proc config {args} {
-	global lily_dir
-	set p [open [linsert $args 0 "|git" --git-dir=$lily_dir/.git config] r]
-	set result [regsub "\n\$" [read $p] ""]
-	if {[catch {close $p} err]} {
-		tk_messageBox -type ok -message "config failed: $err"
-	}
-	return $result
+    global lily_dir
+    set p [open [linsert $args 0 "|git" --git-dir=$lily_dir/.git config] r]
+    set result [regsub "\n\$" [read $p] ""]
+    if {[catch {close $p} err]} {
+        tk_messageBox -type ok -message "config failed: $err"
+    }
+    return $result
 }
 
 proc config_quiet {args} {
-	global lily_dir
-	set p [open [linsert $args 0 "|git" --git-dir=$lily_dir/.git config] r]
-	set result [regsub "\n\$" [read $p] ""]
-	if {[catch {close $p} err]} {
-		set result ""
-	}
-	return $result
+    global lily_dir
+    set p [open [linsert $args 0 "|git" --git-dir=$lily_dir/.git config] r]
+    set result [regsub "\n\$" [read $p] ""]
+    if {[catch {close $p} err]} {
+        set result ""
+    }
+    return $result
 }
 
 proc update_lilypond_rebase {} {
-  update_lilypond 1
+    update_lilypond 1
 }
 
 proc commit {} {
-  global commit_message
-  global commit_canceled
-  set commit_canceled 0
-  get_commit_message
-  tkwait visibility .commitMessage
-  tkwait window .commitMessage
-  if {$commit_canceled != 1} {
-    if {$commit_message == ""} {
-      tk_messageBox -message "You must enter a commit message!" \
-      -type ok -icon error
-    } else {
-      git commit -a -m $commit_message
-      git rebase --whitespace=fix HEAD^
-      set commit_message ""
+    global commit_message
+    global commit_canceled
+    set commit_canceled 0
+    get_commit_message
+    tkwait visibility .commitMessage
+    tkwait window .commitMessage
+    if {$commit_canceled != 1} {
+        if {$commit_message == ""} {
+            tk_messageBox -message "You must enter a commit message!" \
+                -type ok -icon error
+        } else {
+            git commit -a -m $commit_message
+            git rebase --whitespace=fix HEAD^
+            set commit_message ""
+        }
     }
-  }
 }
 
 proc commit_amend {} {
-  git commit -a --amend -C HEAD
-  git rebase --whitespace=fix HEAD^
+    git commit -a --amend -C HEAD
+    git rebase --whitespace=fix HEAD^
 }
 
 proc update_lilypond_norebase {} {
-  update_lilypond 0
+    update_lilypond 0
 }
 
 proc update_lilypond_with_rebase {} {
-  global rebase
-  update_lilypond $rebase
+    global rebase
+    update_lilypond $rebase
 }
 
 proc update_lilypond {rebase} {
-	global lily_dir
-        global originHead
-        global translator
-	. config -cursor watch
-	if {![file exists $lily_dir]} {
-		write_to_output "Cloning LilyPond (this can take some time) ...\n"
-		file mkdir $lily_dir
-		cd $lily_dir
-		git init
-		git config core.bare false
-		git remote add -t $originHead \
-			origin git://git.sv.gnu.org/lilypond.git
-                if {$translator == 1} {
-                  git fetch
-                } else {
-                  git fetch --depth 1
-                }
-		git reset --hard origin/$originHead
-		git config branch.$originHead.remote origin
-		git config branch.$originHead.merge refs/heads/$originHead
-                .buttons.commitFrame.commit configure -state normal
-                .buttons.commitFrame.amend configure -state normal
-                .buttons.update configure -text buttonUpdateText
-                .buttons.patch configure -state normal
-                .buttons.panic configure -state normal
-                toggle_rebase
-	} else {
-		write_to_output "Updating LilyPond...\n"
-		git fetch origin
-		if {$rebase} {
-			git rebase origin/$originHead
-		} else {
-			git merge origin/$originHead
-		}
-	}
-	write_to_output "Done.\n"
-	. config -cursor ""
+    global lily_dir
+    global originHead
+    global translator
+    . config -cursor watch
+    if {![file exists $lily_dir]} {
+        write_to_output "Cloning LilyPond (this can take some time) ...\n"
+        file mkdir $lily_dir
+        cd $lily_dir
+        git init
+        git config core.bare false
+        git remote add -t $originHead \
+            origin git://git.sv.gnu.org/lilypond.git
+        if {$translator == 1} {
+            git fetch
+        } else {
+            git fetch --depth 1
+        }
+        git reset --hard origin/$originHead
+        git config branch.$originHead.remote origin
+        git config branch.$originHead.merge refs/heads/$originHead
+        .buttons.commitFrame.commit configure -state normal
+        .buttons.commitFrame.amend configure -state normal
+        .buttons.update configure -text buttonUpdateText
+        .buttons.patch configure -state normal
+        .buttons.panic configure -state normal
+        toggle_rebase
+    } else {
+        write_to_output "Updating LilyPond...\n"
+        git fetch origin
+        if {$rebase} {
+            git rebase origin/$originHead
+        } else {
+            git merge origin/$originHead
+        }
+    }
+    write_to_output "Done.\n"
+    . config -cursor ""
 }
 
 proc patch_from_origin {} {
-  global rebase
-  make_patch_from_origin $rebase
-  if {![llength [glob -nocomplain 0*.patch]]} {
-	tk_messageBox -type ok -message \
-		"No patches created; did you make a local commit?"
-  }
+    global rebase
+    make_patch_from_origin $rebase
+    if {![llength [glob -nocomplain 0*.patch]]} {
+        tk_messageBox -type ok -message \
+            "No patches created; did you make a local commit?"
+    }
 }
 
 proc make_patch_from_origin {rebase} {
-  global lily_dir
-  global originHead
-  . config -cursor watch
-  update_lilypond $rebase
-  write_to_output "Creating patch...\n"
-  git format-patch origin/$originHead
-  write_to_output "Done.\n"
-  . config -cursor ""
+    global lily_dir
+    global originHead
+    . config -cursor watch
+    update_lilypond $rebase
+    write_to_output "Creating patch...\n"
+    git format-patch origin/$originHead
+    write_to_output "Done.\n"
+    . config -cursor ""
 }
 
 proc abort_changes {} {
-  global abort_dir
-  global originHead
-  set answer [tk_messageBox -type okcancel \
-               -message "This will copy all changed files to $abort_dir and reset the repository." \
-               -default cancel]
-  switch -- $answer {
-    ok {
-      write_to_output "abort_dir: $abort_dir \n"
-      if {![file exists $abort_dir]} {
-        set return_code [exec mkdir $abort_dir]
-      }
-      set return_code [catch {exec git diff origin/$originHead} gitdiff]
-      set return_code [regexp {diff --git a/(\S*)} $gitdiff match modified_file]
-      while {$return_code != 0} {
-        write_to_output "Copying $modified_file to $abort_dir.\n"
-        set return_code [catch {exec cp $modified_file $abort_dir} result]
-        set return_code [regsub {diff --git a/(\S*)} $gitdiff "" gitdiff]
-        set return_code [regexp {diff --git a/(\S*)} $gitdiff match modified_file]
-      }
-      set return_code [git reset --hard origin/$originHead]
-      write_to_output "Repository reset. \n"
+    global abort_dir
+    global originHead
+    set answer [tk_messageBox -type okcancel \
+                    -message "This will copy all changed files to $abort_dir and reset the repository." \
+                    -default cancel]
+    switch -- $answer {
+        ok {
+            write_to_output "abort_dir: $abort_dir \n"
+            if {![file exists $abort_dir]} {
+                set return_code [exec mkdir $abort_dir]
+            }
+            set return_code [catch {exec git diff origin/$originHead} gitdiff]
+            set return_code [regexp {diff --git a/(\S*)} $gitdiff match modified_file]
+            while {$return_code != 0} {
+                write_to_output "Copying $modified_file to $abort_dir.\n"
+                set return_code [catch {exec cp $modified_file $abort_dir} result]
+                set return_code [regsub {diff --git a/(\S*)} $gitdiff "" gitdiff]
+                set return_code [regexp {diff --git a/(\S*)} $gitdiff match modified_file]
+            }
+            set return_code [git reset --hard origin/$originHead]
+            write_to_output "Repository reset. \n"
+        }
     }
-  }
 }
 
 proc toggle_rebase {} {
-	global rebase
-        global lily_dir
-        global originHead
-        global updateButtonText
-        global initializeButtonText
-        if {[file exists $lily_dir]} {
-	  config --bool branch.$originHead.rebase $rebase
-          .buttons.update configure -text $updateButtonText
-        } else {
-          .buttons.update configure -text $initializeButtonText
-        }
+    global rebase
+    global lily_dir
+    global originHead
+    global updateButtonText
+    global initializeButtonText
+    if {[file exists $lily_dir]} {
+        config --bool branch.$originHead.rebase $rebase
+        .buttons.update configure -text $updateButtonText
+    } else {
+        .buttons.update configure -text $initializeButtonText
+    }
 }
 
 proc clear_rebase {} {
-  global rebase
-  set rebase 0
-  toggle_rebase
+    global rebase
+    set rebase 0
+    toggle_rebase
 }
 
 proc set_rebase {} {
-  global rebase
-  set rebase 1
-  toggle_rebase
+    global rebase
+    set rebase 1
+    toggle_rebase
 }
 
 proc commitMessageOK {} {
-  global commit_message
-  global commit_header
-  set commit_body [.commitMessage.bottomFrame.commit_body get 1.0 end]
-  set commit_message "$commit_header\n\n$commit_body"
-  destroy .commitMessage
+    global commit_message
+    global commit_header
+    set commit_body [.commitMessage.bottomFrame.commit_body get 1.0 end]
+    set commit_message "$commit_header\n\n$commit_body"
+    destroy .commitMessage
 }
 
 proc commitMessageCancel {} {
-  global commit_message
-  global commit_canceled
-  set commit_message ""
-  set commit_canceled 1
-  destroy .commitMessage
+    global commit_message
+    global commit_canceled
+    set commit_message ""
+    set commit_canceled 1
+    destroy .commitMessage
 }
 
 
 # Commit message input window
 proc get_commit_message {} {
-  global commit_header
-  set commit_header ""
-  toplevel .commitMessage
-  frame .commitMessage.topFrame
-  label .commitMessage.topFrame.label \
-      -text "Enter commit message header:\n(50 chars max = width of box)"
-  entry .commitMessage.topFrame.commit_header \
-            -width 50 -relief solid -border 2 -textvariable commit_header
-  pack   .commitMessage.topFrame.label -side left
-  pack   .commitMessage.topFrame.commit_header -side left
-
-  frame  .commitMessage.bottomFrame
-  text   .commitMessage.bottomFrame.commit_body \
-            -width 75  -height 10 -relief solid -border 2 -wrap none
-
-  frame .commitMessage.bottomFrame.leftFrame
-  label .commitMessage.bottomFrame.leftFrame.label \
-      -text "Enter commit message body:\n(No limit -- Full description)"
-  button .commitMessage.bottomFrame.leftFrame.ok \
-           -text OK -default active -command commitMessageOK
-  button .commitMessage.bottomFrame.leftFrame.cancel -text Cancel -default active \
-          -command commitMessageCancel
-  wm withdraw .commitMessage
-  wm title .commitMessage "Git Commit Message"
-
-  pack .commitMessage.bottomFrame.leftFrame.label
-  pack .commitMessage.bottomFrame.leftFrame.ok
-  pack .commitMessage.bottomFrame.leftFrame.cancel
-
-  pack .commitMessage.bottomFrame.leftFrame -side left
-  pack .commitMessage.bottomFrame.commit_body -side left
-
-  pack .commitMessage.topFrame
-  pack .commitMessage.bottomFrame
-
-  wm transient .commitMessage .
-  wm deiconify .commitMessage
+    global commit_header
+    set commit_header ""
+    toplevel .commitMessage
+    frame .commitMessage.topFrame
+    label .commitMessage.topFrame.label \
+        -text "Enter commit message header:\n(50 chars max = width of box)"
+    entry .commitMessage.topFrame.commit_header \
+        -width 50 -relief solid -border 2 -textvariable commit_header
+    pack   .commitMessage.topFrame.label -side left
+    pack   .commitMessage.topFrame.commit_header -side left
+
+    frame  .commitMessage.bottomFrame
+    text   .commitMessage.bottomFrame.commit_body \
+        -width 75  -height 10 -relief solid -border 2 -wrap none
+
+    frame .commitMessage.bottomFrame.leftFrame
+    label .commitMessage.bottomFrame.leftFrame.label \
+        -text "Enter commit message body:\n(No limit -- Full description)"
+    button .commitMessage.bottomFrame.leftFrame.ok \
+        -text OK -default active -command commitMessageOK
+    button .commitMessage.bottomFrame.leftFrame.cancel -text Cancel -default active \
+        -command commitMessageCancel
+    wm withdraw .commitMessage
+    wm title .commitMessage "Git Commit Message"
+
+    pack .commitMessage.bottomFrame.leftFrame.label
+    pack .commitMessage.bottomFrame.leftFrame.ok
+    pack .commitMessage.bottomFrame.leftFrame.cancel
+
+    pack .commitMessage.bottomFrame.leftFrame -side left
+    pack .commitMessage.bottomFrame.commit_body -side left
+
+    pack .commitMessage.topFrame
+    pack .commitMessage.bottomFrame
+
+    wm transient .commitMessage .
+    wm deiconify .commitMessage
 }
 
 
@@ -349,20 +397,20 @@ pack .buttons.commitFrame.commit -fill x
 pack .buttons.commitFrame.amend -fill x
 
 button .buttons.update -text $updateButtonText \
-          -command update_lilypond_with_rebase
+    -command update_lilypond_with_rebase
 button .buttons.patch -text "3. Make patch set" \
-          -command patch_from_origin
+    -command patch_from_origin
 toggle_rebase
 button .buttons.panic -text "Abort changes -- Reset to origin" \
-          -command abort_changes -fg Blue -bg Red
+    -command abort_changes -fg Blue -bg Red
 label   .buttons.spacer -text "                         "
 if {![file exists $lily_dir]} {
-	.buttons.update configure \
-            -text $initializeButtonText
-        .buttons.commitFrame.commit configure -state disabled
-        .buttons.commitFrame.amend configure -state disabled
-        .buttons.patch configure -state disabled
-        .buttons.panic configure -state disabled
+    .buttons.update configure \
+        -text $initializeButtonText
+    .buttons.commitFrame.commit configure -state disabled
+    .buttons.commitFrame.amend configure -state disabled
+    .buttons.patch configure -state disabled
+    .buttons.panic configure -state disabled
 }
 
 #  Operating buttons
@@ -379,9 +427,9 @@ pack .buttons.panic -side right
 panedwindow .output
 label .output.label -text "Command output:"
 text .output.text -width 80 -height 15 \
-	-xscrollcommand [list .output.horizontal set] \
-	-yscrollcommand [list .output.vertical set] \
-        -relief solid -border 2
+    -xscrollcommand [list .output.horizontal set] \
+    -yscrollcommand [list .output.vertical set] \
+    -relief solid -border 2
 scrollbar .output.horizontal -orient h -command [list .output.text xview]
 scrollbar .output.vertical -orient v -command [list .output.text yview]
 pack .output.label -side left
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 2f4b807080..6f70baea07 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -2707,7 +2707,7 @@ information.""") % 'lilypond')
     p.add_option ('-l', '--language',
                   metavar = _ ("LANG"),
                   action = "store",
-                  help = _ ("use a different language file 'LANG.ly' and corresponding pitch names, e.g. 'deutsch' for deutsch.ly"))
+                  help = _ ("use LANG for pitch names, e.g. 'deutsch' for note names in German"))
 
     p.add_option ('--nd', '--no-articulation-directions',
                   action = "store_false",
@@ -3000,7 +3000,7 @@ def main ():
     if options.language:
         musicexp.set_pitch_language (options.language)
         needed_additional_definitions.append (options.language)
-        additional_definitions[options.language] = "\\include \"%s.ly\"\n" % options.language
+        additional_definitions[options.language] = "\\language \"%s\"\n" % options.language
     conversion_settings.ignore_beaming = not options.convert_beaming
     conversion_settings.convert_page_layout = options.convert_page_layout