From 0990302a9701a6a29132316b9302caacd35a8196 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Tue, 1 Apr 2008 10:06:24 -0700
Subject: [PATCH] LSR: update.

---
 ...a-figured-bass-above-or-below-the-notes.ly | 10 +--
 ...r-voice.ly => adding-ambitus-per-voice.ly} |  2 +-
 ... adding-an-extra-staff-at-a-line-break.ly} | 15 ++--
 input/lsr/adding-an-extra-staff.ly            | 31 +++----
 input/lsr/adding-drum-parts.ly                |  2 +-
 ...ing-volta-brackets-to-additional-staves.ly |  4 +-
 ...ngerings-to-be-printed-inside-the-staff.ly |  2 +-
 ...ces.ly => ambitus-with-multiple-voices.ly} |  0
 ...les-depending-on-the-step-of-the-scale.ly} | 10 +--
 input/lsr/automatic-beam-subdivisions.ly      | 31 +++++++
 input/lsr/breaks.snippet-list                 |  2 +-
 input/lsr/breathing-sign.ly                   | 56 ------------
 input/lsr/breathing-signs.ly                  | 35 ++++++++
 input/lsr/broken-crescendo-hairpin.ly         | 86 +++++++++----------
 .../lsr/center-text-below-hairpin-dynamics.ly | 30 +++----
 input/lsr/changing--flageolet-mark-size.ly    |  5 +-
 ...changing-a-single-notes-size-in-a-chord.ly |  8 +-
 .../changing-form-of-multi--measure-rests.ly  | 15 ++--
 ...polymetric-section-using--compressmusic.ly |  6 +-
 .../lsr/clefs-commonly-tweaked-properties.ly  |  8 +-
 .../combining-dynamics-with-markup-texts.ly   | 12 +--
 .../combining-two-parts-on-the-same-staff.ly  |  2 +-
 input/lsr/compound-time-signatures.ly         |  2 +-
 input/lsr/contemporary-glissando.ly           |  9 +-
 input/lsr/contexts-and-engravers.snippet-list |  5 +-
 .../controlling-tuplet-bracket-visibility.ly  | 12 +--
 ...-a-sequence-of-notes-on-various-pitches.ly |  6 +-
 input/lsr/creating-blank-staves.ly            | 22 ++---
 .../creating-real-parenthesized-dynamics.ly   |  6 +-
 ...bracket-with-only-one-staff-in-a-system.ly | 48 ++++++-----
 ...entals-for-each-note-including-naturals.ly |  4 +-
 ...editorial-and-educational-use.snippet-list |  2 +-
 ...l-tuplets-using-only-one--times-command.ly |  9 +-
 input/lsr/expressive-marks.snippet-list       |  6 +-
 input/lsr/generating-random-notes.ly          | 10 +--
 ...re-fragments-above-a-staff,-as-markups.ly} |  2 +-
 input/lsr/makam.ly                            | 37 ++++----
 ...invisible-with-the-transparent-property.ly | 58 +++++++------
 ...ome-staff-lines-thicker-than-the-others.ly | 12 ++-
 ...che-layout-bar-lines-between-the-staves.ly | 23 ++---
 input/lsr/non-traditional-key-signatures.ly   |  7 +-
 input/lsr/ottava-text.ly                      |  7 +-
 input/lsr/pitches.snippet-list                |  8 +-
 input/lsr/positioning-multi--measure-rests.ly | 51 ++++++-----
 ...itioning-segno-and-coda-with-line-break.ly |  2 +-
 ...ng-music-with-different-time-signatures.ly |  2 +-
 ...uoting-another-voice-with-transposition.ly | 45 +++++-----
 input/lsr/rest-styles.ly                      |  2 +-
 input/lsr/rhythms.snippet-list                |  1 +
 input/lsr/shortening-volta-brackets.ly        |  5 +-
 input/lsr/staff-notation.snippet-list         | 11 +--
 ...ith-minimum-accidentals-smart-transpose.ly | 53 +++++-------
 ...e-bracket-at-the-start-of-a-staff-group.ly | 19 ++++
 input/lsr/vocal-music.snippet-list            | 10 +--
 54 files changed, 436 insertions(+), 432 deletions(-)
 rename input/lsr/{adding-ambiti-per-voice.ly => adding-ambitus-per-voice.ly} (88%)
 rename input/lsr/{adding-and-extra-staff-at-a-line-break.ly => adding-an-extra-staff-at-a-line-break.ly} (68%)
 rename input/lsr/{ambiti-multiple-voices.ly => ambitus-with-multiple-voices.ly} (100%)
 rename input/lsr/{applying-notehead-styles-depending-on-the-step-of-the-scale.ly => applying-note-head-styles-depending-on-the-step-of-the-scale.ly} (83%)
 create mode 100644 input/lsr/automatic-beam-subdivisions.ly
 delete mode 100644 input/lsr/breathing-sign.ly
 create mode 100644 input/lsr/breathing-signs.ly
 rename input/lsr/{inserting-score-fragments-above-the-staff,-as-markups.ly => inserting-score-fragments-above-a-staff,-as-markups.ly} (92%)
 create mode 100644 input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly

diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
index b457150eae..154d7243af 100644
--- a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
+++ b/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
@@ -7,13 +7,13 @@
  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
-BassFigureAlignmentPositioning #'direction property (exclusively in a
-Staff context). Choices are #UP (or #1), #CENTER (or #0) and #DOWN (or
-#-1).
+@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 \\once \\override if you dont want the tweak to apply to the
-whole score.
+wish. Use @code{\\once \\override} if you don't want the tweak to apply
+to the whole score. 
 " }
 % begin verbatim
 bass = { \clef bass g4 b, c d e d8 c d2}
diff --git a/input/lsr/adding-ambiti-per-voice.ly b/input/lsr/adding-ambitus-per-voice.ly
similarity index 88%
rename from input/lsr/adding-ambiti-per-voice.ly
rename to input/lsr/adding-ambitus-per-voice.ly
index b4d3e34c11..8d130aa672 100644
--- a/input/lsr/adding-ambiti-per-voice.ly
+++ b/input/lsr/adding-ambitus-per-voice.ly
@@ -5,7 +5,7 @@
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
  texidoc = "
-Ambits can be added per voice. In this case, the ambitus must be moved
+Ambitus can be added per voice. In this case, the ambitus must be moved
 manually to prevent collisions. 
 " }
 % begin verbatim
diff --git a/input/lsr/adding-and-extra-staff-at-a-line-break.ly b/input/lsr/adding-an-extra-staff-at-a-line-break.ly
similarity index 68%
rename from input/lsr/adding-and-extra-staff-at-a-line-break.ly
rename to input/lsr/adding-an-extra-staff-at-a-line-break.ly
index 8f1472e42a..bb9a54b1aa 100644
--- a/input/lsr/adding-and-extra-staff-at-a-line-break.ly
+++ b/input/lsr/adding-an-extra-staff-at-a-line-break.ly
@@ -5,12 +5,15 @@
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, breaks"
  texidoc = "
-When adding a new Staff at a line break, LilyPond will unfortunately
+When adding a new staff at a line break, LilyPond will unfortunately
 add some extra space at the end of the line before the break (to fit in
 a key signature change, which  will never be printed anyway). The
-workaround is to add a setting of Staff.explicitKeySignatureVisibility
-as is shown in the example. In version 2.10 and earlier, you have to do
-a similar setting for the time signatures, see the example. 
+workaround is to add a setting of
+@code{Staff.explicitKeySignatureVisibility} as is shown in the example.
+In version 2.10 and earlier, you have to do a similar setting for the
+time signatures, see the example.
+
+
 " }
 % begin verbatim
 \score {
@@ -21,6 +24,7 @@ a similar setting for the time signatures, see the example.
     << { c1 c }
        \new Staff { 
          \key f \major
+         \once \override Staff.TimeSignature #'stencil = ##f
          c1 c 
        } 
     >>
@@ -30,7 +34,8 @@ a similar setting for the time signatures, see the example.
          \once \set Staff.explicitKeySignatureVisibility = #end-of-line-invisible 
          %The next line is not needed in 2.11.x or later:
          \once \override Staff.TimeSignature #'break-visibility = #end-of-line-invisible 
-        \key f \major
+         \key f \major
+         \once \override Staff.TimeSignature #'stencil = ##f
          c1 c 
        } 
     >>
diff --git a/input/lsr/adding-an-extra-staff.ly b/input/lsr/adding-an-extra-staff.ly
index ff9d5a2777..6cfd6cfc1d 100644
--- a/input/lsr/adding-an-extra-staff.ly
+++ b/input/lsr/adding-an-extra-staff.ly
@@ -10,25 +10,14 @@ of  a piece.
 " }
 % begin verbatim
 \score {
-	<<
-		\new Staff \relative c''{ c1 c c c c }
-		\new StaffGroup \relative c''{ 
-			\new Staff 
-			c1 c
-			<< c1 \new Staff { c1 } >>
-			c
-		}
-	>>
-  	\layout {
-		
-		\context{
-			\Score
-
-		}
-	}
+  <<
+    \new Staff \relative c'' { c1 c c c c }
+    \new StaffGroup \relative c'' {
+      \new Staff {
+        c1 c
+        << c1 \new Staff { \once \override Staff.TimeSignature #'stencil = ##f c1 } >>
+        c
+      }
+    }
+  >>
 }
-
-
-
-
-
diff --git a/input/lsr/adding-drum-parts.ly b/input/lsr/adding-drum-parts.ly
index d00ab08965..50bf6f554b 100644
--- a/input/lsr/adding-drum-parts.ly
+++ b/input/lsr/adding-drum-parts.ly
@@ -8,7 +8,7 @@
 LilyPond makes drums input quite easy, with powerful pre-configured
 tools such as the @code{\\drummode} function and the @code{DrumStaff}
 context: drums are placed at their own staff positions (with a special
-clef symbol) and have noteheads according to the drum. You can easily
+clef symbol) and have note heads according to the drum. You can easily
 attach an extra symbol to the drum, and restrict the number of lines. 
 " }
 % begin verbatim
diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/input/lsr/adding-volta-brackets-to-additional-staves.ly
index 4e8915f53c..3cca1471ba 100644
--- a/input/lsr/adding-volta-brackets-to-additional-staves.ly
+++ b/input/lsr/adding-volta-brackets-to-additional-staves.ly
@@ -15,6 +15,6 @@ brackets to appear; see also the \"Volta multi staff\" snippet.
 <<
   \new Staff { \repeat volta 2 { c'1 } \alternative { c' } }
   \new Staff { \repeat volta 2 { c'1 } \alternative { c' } }
-  \new Staff \with { \consists Volta_engraver } { c'2 g' e' a' }
+  \new Staff \with { \consists "Volta_engraver" } { c'2 g' e' a' }
   \new Staff { \repeat volta 2 { c'1 } \alternative { c' } }
- >>
+>>
diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
index 5e91f03137..8376bfe457 100644
--- a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
+++ b/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
@@ -6,7 +6,7 @@
   lsrtags = "editorial-and-educational-use, spacing"
  texidoc = "
 By default, fingering numbers will be printed outside the staff.
-However, this behavior can be cancelled.
+However, this behavior can be canceled.
 " }
 % begin verbatim
 \relative c' {
diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambitus-with-multiple-voices.ly
similarity index 100%
rename from input/lsr/ambiti-multiple-voices.ly
rename to input/lsr/ambitus-with-multiple-voices.ly
diff --git a/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
similarity index 83%
rename from input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly
rename to input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
index 2691f1e935..25c106192d 100644
--- a/input/lsr/applying-notehead-styles-depending-on-the-step-of-the-scale.ly
+++ b/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
@@ -6,18 +6,18 @@
   lsrtags = "pitches, editorial-and-educational-use"
  texidoc = "
 The @code{shapeNoteStyles} property gives you the ability to define
-various notehead styles for each step of the scale (as defined by the
+various note head styles for each step of the scale (as defined by the
 key signature or the \"tonic\" property). This property requires a set
 of symbols, which can be purely arbitrary (geometrical expressions such
 as @code{triangle}, @code{cross}, @code{xcircle} etc. are allowed) or
 based on old American engraving tradition (you can use some latin note
 names as well). That said, if you're trying to imitate old American
-song books, you may also want to try LilyPond's predefined notehead
+song books, you may also want to try LilyPond's predefined note head
 styles, through shortcut commands such as @code{\\aikenHeads} or
 @code{\\sacredHarpHeads}. This example shows different ways to obtain
-shape noteheads, and demonstrates the ability to transpose a melody
-without losing the correspondence between harmonic functions and
-notehead styles. 
+shape note heads, and demonstrates the ability to transpose a melody
+without losing the correspondence between harmonic functions and note
+head styles. 
 " }
 % begin verbatim
 fragment = {
diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly
new file mode 100644
index 0000000000..bfe06865f3
--- /dev/null
+++ b/input/lsr/automatic-beam-subdivisions.ly
@@ -0,0 +1,31 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
+
+\header {
+  lsrtags = "rhythms"
+ texidoc = "
+Beams can be subdivided automatically. By setting the property
+@code{subdivideBeams}, beams are subdivided at beat positions (as
+specified in @code{beatLength}). 
+" }
+% begin verbatim
+\score {
+  \new Staff \relative {
+    << {
+      \voiceOne
+      \set subdivideBeams = ##t
+      b'32[ a g f c' b a g b^"subdivision enabled" a g f c' b a g]
+      \oneVoice
+    }
+    \new Voice {
+      \voiceTwo
+      b32_"default"[ a g f c' b a g b a g f c' b a g]
+    } >>
+    \set beatLength = #(ly:make-moment 1 8)
+    b32^"beatLength 1 8"[ a g f c' b a g]
+    \set beatLength = #(ly:make-moment 1 16)
+    b32^"beatLength 1 16"[ a g f c' b a g]
+  }
+}
+
diff --git a/input/lsr/breaks.snippet-list b/input/lsr/breaks.snippet-list
index cffb62e0a2..42c01eb15a 100644
--- a/input/lsr/breaks.snippet-list
+++ b/input/lsr/breaks.snippet-list
@@ -1,3 +1,3 @@
 positioning-segno-and-coda-with-line-break.ly
-adding-and-extra-staff-at-a-line-break.ly
 beams-across-line-breaks.ly
+adding-an-extra-staff-at-a-line-break.ly
diff --git a/input/lsr/breathing-sign.ly b/input/lsr/breathing-sign.ly
deleted file mode 100644
index 07846dce76..0000000000
--- a/input/lsr/breathing-sign.ly
+++ /dev/null
@@ -1,56 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.11.38"
-
-\header {
-  lsrtags = "expressive-marks"
- texidoc = "
-Breathing signs are available in different tastes: commas (default),
-ticks, vees and \"railroad tracks\" (caesura).
-" }
-% begin verbatim
-{
-  %% Modern notation:
-  \new Staff {
-    \relative c'' {
-      \key es \major \time 3/4
-
-      %% this bar contains no \breathe
-      <<
-	{ g4 as g } \\
-	{ es4 bes es }
-      >> |
-
-      %% by default, \breathe uses the rcomma, just as if saying:
-      %% \override BreathingSign  #'text =
-				%	#(make-musicglyph-markup "scripts.rcomma")
-      <<
-	{ g4 as g } \\
-	{ es4 \breathe bes es }
-      >> |
-
-      %% rvarcomma and lvarcomma are variations of the default rcomma
-      %% and lcomma
-
-      %% N.B.: must use Staff context here, since we start a Voice below
-      \override Staff.BreathingSign  #'text =
-      #(make-musicglyph-markup "scripts.rvarcomma")
-      <<
-	{ g4 as g } \\
-	{ es4 \breathe bes es }
-      >> |
-
-      %% wedge
-      \override BreathingSign  #'text =
-      #(make-musicglyph-markup "scripts.upbow")
-      es8 d es f g8 \breathe f |
-
-      %% caesura
-      \override BreathingSign  #'text =
-      #(make-musicglyph-markup "scripts.caesura.curved")
-      es8[ d] \breathe  es[ f g f] |
-      es2 r4 \bar "||" \break
-    }
-  }
-}
-
diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly
new file mode 100644
index 0000000000..bd79587cb8
--- /dev/null
+++ b/input/lsr/breathing-signs.ly
@@ -0,0 +1,35 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
+
+\header {
+  lsrtags = "expressive-marks"
+ texidoc = "
+Breathing signs are available in different tastes: commas (default),
+ticks, vees and \"railroad tracks\" (caesura).
+" }
+% begin verbatim
+\new Staff \relative c'' {
+  \key es \major
+  \time 3/4
+  % this bar contains no \breathe
+  << { g4 as g } \\ { es4 bes es } >> |
+  % Modern notation:
+  % by default, \breathe uses the rcomma, just as if saying:
+  % \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rcomma")
+  << { g4 as g } \\ { es4 \breathe bes es } >> |
+  
+  % rvarcomma and lvarcomma are variations of the default rcomma and lcomma
+  % N.B.: must use Staff context here, since we start a Voice below
+  \override Staff.BreathingSign  #'text = #(make-musicglyph-markup "scripts.rvarcomma")
+  << { g4 as g } \\ { es4 \breathe bes es } >> |
+  
+  % vee
+  \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.upbow")
+  es8[ d es f g] \breathe f |
+  
+  % caesura
+  \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.caesura.curved")
+  es8[ d] \breathe  es[ f g f] |
+  es2 r4 \bar "||"
+}
diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly
index 373bc05069..44027924e8 100644
--- a/input/lsr/broken-crescendo-hairpin.ly
+++ b/input/lsr/broken-crescendo-hairpin.ly
@@ -1,45 +1,43 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
-
-\header {
-  lsrtags = "expressive-marks"
- texidoc = "
-In order to make parts of a crescendo hairpin invisible, the following
-method is used: A white rectangle is drawn on top of the respective
-part of the crescendo hairpin, making it invisible. The rectangle is
-defined as postscript code within a text markup.
-
-In order to fine-tune the position and size of the markup, the number
-preceding the \"setgray\" in the postscript definition can be set to a
-value <1 making it grey. The two numbes before the \"scale\" in the
-postscript code are responsible for the width and height of the
-rectangle, the two numbers before the \"translate\" change the x- and
-y-origin of the rectangle. 
-
-Make sure to put the Hairpin in a lower layer than the Text Markup to
-actually draw the rectangle above the hairpin. 
-" }
-% begin verbatim
-% Version specific to 2.10; fails under 2.11 due to rest position -np
-
-\score
-{
-    \relative c' {
-	<< {
-	    \dynamicUp
-	    \override DynamicLineSpanner #'staff-padding = #4
-	    r2 r16 c'8.\pp r4
-	} \\ {
-	    \override DynamicLineSpanner #'layer = #0
-	    des,2~\mf \<
-	    \override TextScript #'layer = #2
-	    des16_\markup { 
-              \postscript #"1.9 -4.5 translate 5 4 scale 1 setgray 0 0 moveto 0 1 
-              lineto 1 1 lineto 1 0 lineto 0 0 lineto fill" }
-	    r8. des4~ des16-> \sff
-	}
-       >>
-    }
-    \layout { ragged-right = ##t}
-}
+\version "2.11.38"
+
+\header {
+  doctitle = "Broken crescendo hairpin"
+  lsrtags = "expressive-marks"
+  texidoc = "
+In order to make parts of a crescendo hairpin invisible, the following
+method is used: A white rectangle is drawn on top of the respective
+part of the crescendo hairpin, making it invisible. The rectangle is
+defined as postscript code within a text markup.
+
+To fine-tune the position and size of the markup, the number
+preceding @code{setgray} in the postscript definition can be set to a
+value <1 making it grey. The two numbers before @code{scale} in the
+postscript code are responsible for the width and height of the
+rectangle, the two numbers before @code{translate} change the x- and
+y-origin of the rectangle. 
+
+Make sure to put the hairpin in a lower layer than the text markup to
+actually draw the rectangle above the hairpin. 
+" }
+
+\score {
+  \relative c' {
+    << {
+      \dynamicUp
+      \override DynamicLineSpanner #'staff-padding = #4
+      r2 r16 c'8.\pp r4
+    } \\ {
+      \override DynamicLineSpanner #'layer = #0
+      des,2\mf\< ~
+      \override TextScript #'layer = #2
+      des16_\markup {
+        \postscript #"1.9 -8 translate 5 4 scale 1 setgray 0 0 moveto 0 1
+        lineto 1 1 lineto 1 0 lineto 0 0 lineto fill"
+      }
+      r8. des4 ~ des16->\sff
+    } >>
+  }
+  \layout { ragged-right = ##t }
+}
diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly
index 2139970e70..4196d31069 100644
--- a/input/lsr/center-text-below-hairpin-dynamics.ly
+++ b/input/lsr/center-text-below-hairpin-dynamics.ly
@@ -11,26 +11,22 @@ example also illustrates how to modify the way an object is normally
 printed, using some Scheme code.  
 " }
 % begin verbatim
-hairpinWithCenteredText = #(define-music-function
-                          (parser location text) (markup?)
+hairpinWithCenteredText = #(define-music-function (parser location text) (markup?)
 #{
-\override Voice.Hairpin #'stencil = #(lambda (grob)
- (ly:stencil-aligned-to
-  (ly:stencil-combine-at-edge
-   (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
-   Y
-   DOWN
-   (ly:stencil-aligned-to (ly:text-interface::print grob) X CENTER))
-  X LEFT))
-\override Voice.Hairpin #'text = $text
+  \override Voice.Hairpin #'stencil = #(lambda (grob)
+  (ly:stencil-aligned-to
+   (ly:stencil-combine-at-edge
+    (ly:stencil-aligned-to (ly:hairpin::print grob) X CENTER)
+    Y DOWN
+    (ly:stencil-aligned-to (ly:text-interface::print grob) X CENTER))
+   X LEFT))
+  \override Voice.Hairpin #'text = $text
 #})
 
-
 hairpinMolto = \hairpinWithCenteredText \markup { \italic "molto" }
-hairpinMore  = \hairpinWithCenteredText \markup { \bigger "moltissimo" }
+hairpinMore = \hairpinWithCenteredText \markup { \bigger "moltissimo" }
 
-\new Staff {
-   \hairpinMolto c'2\< c'2\f
-   \hairpinMore  c'2\< c'2\f
+{
+  \hairpinMolto c'2\< c'2\f
+  \hairpinMore  c'2\< c'2\f
 }
-
diff --git a/input/lsr/changing--flageolet-mark-size.ly b/input/lsr/changing--flageolet-mark-size.ly
index 5bc4e29fa5..3f8ad3251f 100644
--- a/input/lsr/changing--flageolet-mark-size.ly
+++ b/input/lsr/changing--flageolet-mark-size.ly
@@ -16,6 +16,7 @@ smallFlageolet = #(let ((m (make-music 'ArticulationEvent
                     (ly:music-property m 'tweaks)))
        m)
 
-\relative c'' { d4^\flageolet_\markup { default size } d4_\flageolet
-  c4^\smallFlageolet_\markup { smaller } c4_\smallFlageolet 
+\relative c'' {
+  d4^\flageolet_\markup { default size } d4_\flageolet
+  c4^\smallFlageolet_\markup { smaller } c4_\smallFlageolet
 }
diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
index 7f71858787..465286b3bc 100644
--- a/input/lsr/changing-a-single-notes-size-in-a-chord.ly
+++ b/input/lsr/changing-a-single-notes-size-in-a-chord.ly
@@ -5,8 +5,9 @@
 \header {
   lsrtags = "simultaneous-notes, editorial-and-educational-use, tweaks-and-overrides"
  texidoc = "
-Individual noteheads in a chord can be modified with the @code{\\tweak}
-command inside a chord, by altering the @code{'font-size} property.
+Individual note heads in a chord can be modified with the
+@code{\\tweak} command inside a chord, by altering the
+@code{'font-size} property.
 
 
 Inside the chord (within the brackets @code{< >}), before the note to
@@ -18,8 +19,7 @@ notehead).
 The code for the chord example shown: @code{} 
 " }
 % begin verbatim
+\layout { ragged-right = ##t }
 \relative {
   <\tweak #'font-size #+2 c e g c \tweak #'font-size #-2 e>1^\markup { A tiny e }_\markup { A big c }
 }
-\layout { ragged-right = ##t }
-
diff --git a/input/lsr/changing-form-of-multi--measure-rests.ly b/input/lsr/changing-form-of-multi--measure-rests.ly
index bf9a0eba4b..163a91b6b1 100644
--- a/input/lsr/changing-form-of-multi--measure-rests.ly
+++ b/input/lsr/changing-form-of-multi--measure-rests.ly
@@ -6,17 +6,16 @@
   doctitle = "Changing form of multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
-If there are 10 or fewer measures of rest, LilyPond prints
+If there are ten or fewer measures of rests, LilyPond prints
 a series of longa and breve rests (called in German
-Kirchenpausen - church rests) within the staff and
-prints a simple line otherwise.  This default number of 10
+\"Kirchenpausen\" - church rests) within the staff and
+prints a simple line otherwise.  This default number of ten
 may be changed by an override:
 "}
 % begin verbatim
 \relative c'' {
-\compressFullBarRests
-R1*2 | R1*5 | R1*9
-\override MultiMeasureRest #'expand-limit = 3
-R1*2 | R1*5 | R1*9
+  \compressFullBarRests
+  R1*2 | R1*5 | R1*9
+  \override MultiMeasureRest #'expand-limit = 3
+  R1*2 | R1*5 | R1*9
 }
-
diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
index da81799a09..eee7f5b234 100644
--- a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
+++ b/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
@@ -6,12 +6,12 @@
   lsrtags = "rhythms, contexts-and-engravers"
  texidoc = "
 The @code{measureLength} property, together with
-@code{measurePosition}, determines when a barline is needed. However,
+@code{measurePosition}, determines when a bar line is needed. However,
 when using @code{\\compressMusic}, the scaling of durations makes it
 difficult to change time signatures without making a mess of it.
 Therefore, @code{measureLength} has to be set manually, using the
-@code{ly:make-moment} callback. The second argument has to be the same
-as the second argument of @code{\\compressMusic}. 
+@code{ly:make-moment} callback. The second argument must be the same as
+the second argument of @code{\\compressMusic}. 
 " }
 % begin verbatim
 \layout {
diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly
index fe0a4ea9eb..af753c7f6c 100644
--- a/input/lsr/clefs-commonly-tweaked-properties.ly
+++ b/input/lsr/clefs-commonly-tweaked-properties.ly
@@ -14,8 +14,8 @@ printed when any of these properties are changed.
 Note that changing the glyph, the position of the clef, or the
 octavation, does not in itself change the position of subsequent notes
 on the staff: the position of middle C must also be specified to do
-this. The positional parameters are relative to the staff centre line,
-positive numbers displacing upwards, counting 1 for each line and
+this. The positional parameters are relative to the staff center line,
+positive numbers displacing upwards, counting one for each line and
 space. The @code{clefOctavation} value would normally be set to 7, -7,
 15 or -15, but other values are valid.
 
@@ -25,7 +25,7 @@ printed at both the end of the previous line and the beginning of the
 new line by default. If the warning clef at the end of the previous
 line is not required it can be suppressed by setting the @code{Staff}
 property @code{explicitClefVisibility} to the value
-@code{end-of-line-invisible}. The default behaviour can be recovered
+@code{end-of-line-invisible}. The default behavior can be recovered
 with  @code{\\unset Staff.explicitClefVisibility}.
 
 The following examples show the possibilities when setting these
@@ -77,6 +77,6 @@ line, they do not.
   
   % Here we go back to the normal clef:
 
-  \set Staff.middleCPosition = #4
+  \set Staff.middleCPosition = #0
   c'
 }
diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/input/lsr/combining-dynamics-with-markup-texts.ly
index ed927bf6bd..9f9092b29a 100644
--- a/input/lsr/combining-dynamics-with-markup-texts.ly
+++ b/input/lsr/combining-dynamics-with-markup-texts.ly
@@ -5,17 +5,13 @@
 \header {
   lsrtags = "expressive-marks, text"
  texidoc = "
-Some dynamics may involve text indications (such as \"più forte\",
-\"piano subito\", etc.). They can be produced using a @code{\\markup}
-block.
+Some dynamics may involve text indications (such as \"più forte\" or
+\"piano subito\"). They can be produced using a @code{\\markup} block.
 " }
 % begin verbatim
-\layout { ragged-right = ##t }
-
-piuf = \markup { \italic "più" \dynamic "f" }
+piuF = \markup { \italic "più" \dynamic "f" }
 
 \relative c'' {
-  c2
-  c-\piuf
+  c2 c-\piuF
 }
 
diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly
index b180f3b5a7..ef63f1f01d 100644
--- a/input/lsr/combining-two-parts-on-the-same-staff.ly
+++ b/input/lsr/combining-two-parts-on-the-same-staff.ly
@@ -14,7 +14,7 @@ be switched off. However, you'd better not use it if there are any
 solos, as they won't be indicated. In such cases, you may simply want
 to use standard LilyPond polyphony. This snippet presents the three
 ways two parts can be printed on a same staff: standard polyphony,
-@code{\\partcombine} whitout texts, and @code{\\partcombine} with texts.
+@code{\\partcombine} without texts, and @code{\\partcombine} with texts.
 
 
 
diff --git a/input/lsr/compound-time-signatures.ly b/input/lsr/compound-time-signatures.ly
index 7877ee704b..aaa0da4218 100644
--- a/input/lsr/compound-time-signatures.ly
+++ b/input/lsr/compound-time-signatures.ly
@@ -9,7 +9,7 @@ Odd 20th century time signatures (such as \"5/8\") can often be played
 as compound time signatures (e.g. \"3/8 + 2/8\"), which combine two or
 more inequal metrics. LilyPond can make such music quite easy to read
 and play, by explicitly printing the compound time signatures and
-adapting the automatic beaming behaviour. (You can even add graphic
+adapting the automatic beaming behavior. (You can even add graphic
 measure grouping indications; see the appropriate snippet in this
 database.) 
 " }
diff --git a/input/lsr/contemporary-glissando.ly b/input/lsr/contemporary-glissando.ly
index 1821f37809..1a6e92f266 100644
--- a/input/lsr/contemporary-glissando.ly
+++ b/input/lsr/contemporary-glissando.ly
@@ -5,17 +5,14 @@
 \header {
   lsrtags = "expressive-marks"
  texidoc = "
-Use a glissando without final note. Contemporary glissando!
+A contemporary glissando without a final note can be typeset using a
+hidden note and cadenza timing.
 " }
 % begin verbatim
 \relative c'' {
   \time 3/4
   \override Glissando #'style = #'zigzag
   c4 c
-  \cadenzaOn  c\glissando \hideNotes c,, \unHideNotes \cadenzaOff
+  \cadenzaOn c\glissando \hideNotes c,, \unHideNotes \cadenzaOff
   \bar "|"
 }
-
-\addlyrics { Use cadenzaOn glissando hideNotes }
-\addlyrics { unHideNotes cadenzaOff, skip_and_\bar \skip 4 }
-
diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list
index 0e9125fcdd..670a7a75fe 100644
--- a/input/lsr/contexts-and-engravers.snippet-list
+++ b/input/lsr/contexts-and-engravers.snippet-list
@@ -1,10 +1,11 @@
 creating-blank-staves.ly
 chant-or-psalms-notation.ly
-adding-and-extra-staff-at-a-line-break.ly
+adding-a-figured-bass-above-or-below-the-notes.ly
+adding-an-extra-staff-at-a-line-break.ly
 adding-an-extra-staff.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 engravers-one-by-one.ly
-adding-a-figured-bass-above-or-below-the-notes.ly
+use-square-bracket-at-the-start-of-a-staff-group.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 nesting-staves.ly
diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/input/lsr/controlling-tuplet-bracket-visibility.ly
index 54853bdb5e..c88c7ea531 100644
--- a/input/lsr/controlling-tuplet-bracket-visibility.ly
+++ b/input/lsr/controlling-tuplet-bracket-visibility.ly
@@ -5,12 +5,12 @@
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
  texidoc = "
-The default behaviour of tuplet-bracket visibility is to print a
-bracket unless there is a beam of the same length as the tuplet. To
-control the visibility of tuplet brackets, you can set the property
-@code{TupletBracket #'bracket-visibility} to either @code{##t} (always
-print a bracket), @code{##f} (never print a bracket) or
-@code{#'if-no-beam} (only print a bracket if there is no beam). 
+The default behavior of tuplet-bracket visibility is to print a bracket
+unless there is a beam of the same length as the tuplet. To control the
+visibility of tuplet brackets, set the property @code{TupletBracket
+#'bracket-visibility} to either @code{##t} (always print a bracket),
+@code{##f} (never print a bracket) or @code{#'if-no-beam} (only print a
+bracket if there is no beam). 
 " }
 % begin verbatim
 mus = \relative c'' {
diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
index 726cf8422a..08d03b1dce 100644
--- a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
+++ b/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
@@ -8,9 +8,9 @@
 In music that contains many occurrences of the same sequence of notes
 at different pitches, you can use the following music function. It
 takes a note, of which the pitch is used. The supporting Scheme
-functions were borrowed from the Tips and Tricks document in the
-manual. This example creates the rhythm used throughout Mars, from
-Gustav Holst's The Planets. 
+functions were borrowed from the \"Tips and tricks\" document in the
+manual for version 2.10. This example creates the rhythm used
+throughout Mars, from Gustav Holst's The Planets. 
 " }
 % begin verbatim
 #(define (make-note-req p d)
diff --git a/input/lsr/creating-blank-staves.ly b/input/lsr/creating-blank-staves.ly
index deb6622518..ac0c6d32a8 100644
--- a/input/lsr/creating-blank-staves.ly
+++ b/input/lsr/creating-blank-staves.ly
@@ -11,10 +11,6 @@ the @code{Staff} context the @code{Time_signature_engraver}, the
 @code{Clef_engraver} and the @code{Bar_engraver}. 
 " }
 % begin verbatim
-\header {
-  tagline = ""
-}
-
 #(set-global-staff-size 20)
 
 \score {
@@ -25,22 +21,22 @@ the @code{Staff} context the @code{Time_signature_engraver}, the
     indent = 0\in
     \context {
       \Staff
-      \remove Time_signature_engraver
-      \remove Clef_engraver
-      \remove Bar_engraver
+      \remove "Time_signature_engraver"
+      \remove "Clef_engraver"
+      \remove "Bar_engraver"
     }
     \context {
       \Score
-      \remove Bar_number_engraver
+      \remove "Bar_number_engraver"
     }
   }
 }
 
 \paper {
   #(set-paper-size "letter")
-  raggedlastbottom = ##f
-  linewidth = 7.5\in
-  leftmargin = 0.5\in
-  bottommargin = 0.25\in
-  topmargin = 0.25\in
+  ragged-last-bottom = ##f
+  line-width = 7.5\in
+  left-margin = 0.5\in
+  bottom-margin = 0.25\in
+  top-margin = 0.25\in
 }
diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly
index 6406707e90..69ce5da881 100644
--- a/input/lsr/creating-real-parenthesized-dynamics.ly
+++ b/input/lsr/creating-real-parenthesized-dynamics.ly
@@ -24,8 +24,6 @@ parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic
            #:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text #:italic
            #:fontsize 2 ")"
           )))
-
-\score {
-  { c''\parenF c'' c'' \dynamicUp c''\parenF }
+{
+  c''4\parenF c'' c'' \dynamicUp c''\parenF
 }
-
diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
index b9b7d2779e..d6799fe1be 100644
--- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
+++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
@@ -8,7 +8,7 @@
 If there is only one staff in one of the staff types @code{ChoirStaff},
 @code{InnerChoirStaff}, @code{InnerStaffGroup} or @code{StaffGroup},
 the bracket and the starting bar line will not be displayed as standard
-behaviour. This can be changed with:
+behavior. This can be changed with:
 
 
 @code{\\override [staffcontext].SystemStartBracket #'collapse-height =
@@ -30,26 +30,28 @@ For staff contexts with @code{'SystemStartBrace}, such as
 
 " }
 % begin verbatim
-\score {
-\new StaffGroup <<
-   % Must be lower than your actual amount off staff lines
-   \override StaffGroup.SystemStartBracket #'collapse-height = #1
-   \override Score.SystemStartBar #'collapse-height = #1
-   \new Staff {
-     c'4 d' e' f'
-   }
- >>
- }
- {
- \new PianoStaff <<
-   \override PianoStaff.SystemStartBrace #'collapse-height = #1
-   \override Score.SystemStartBar #'collapse-height = #1
-   \new Staff {
-     c'4 d' e' f'
-   }
- >>
-  } 
-  \layout { 
-    ragged-right = ##t 
-    indent = 0\cm
+\layout {
+  ragged-right = ##t
+  indent = 0\cm
+}
+\book {
+  \score {
+    \new StaffGroup <<
+      % Must be lower than your actual amount off staff lines
+      \override StaffGroup.SystemStartBracket #'collapse-height = #1
+      \override Score.SystemStartBar #'collapse-height = #1
+      \new Staff {
+        c'4 d' e' f'
+      }
+    >>
   }
+  \score {
+    \new PianoStaff <<
+      \override PianoStaff.SystemStartBrace #'collapse-height = #1
+      \override Score.SystemStartBar #'collapse-height = #1
+      \new Staff {
+        c'4 d' e' f'
+      }
+    >>
+  }
+}
diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
index e26193bc03..721ad91a1d 100644
--- a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ b/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
@@ -5,13 +5,13 @@
 \header {
   lsrtags = "pitches"
  texidoc = "
-In early 20th century works, starting with Schönberg, Berg and Webern
+In early 20th century works, starting with Schoenberg, Berg and Webern
 (the \"Second\" Viennese school), every pitch in the twelve-tone scale
 has to be regarded as equal, without any hierarchy such as the
 classical (tonal) degrees. Therefore, these composers print one
 accidental for each note, even at natural pitches, to emphasize their
 new approach to music theory and language. This snippet shows how to
-achieve such notation rules with LilyPond. 
+achieve such notation rules. 
 " }
 % begin verbatim
 webernAccidentals = {
diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list
index 3600f47a4b..595fd0ae16 100644
--- a/input/lsr/editorial-and-educational-use.snippet-list
+++ b/input/lsr/editorial-and-educational-use.snippet-list
@@ -1,5 +1,6 @@
 creating-blank-staves.ly
 making-some-staff-lines-thicker-than-the-others.ly
+applying-note-head-styles-depending-on-the-step-of-the-scale.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 default-direction-of-stems-on-the-center-line-of-the-staff.ly
 changing-a-single-notes-size-in-a-chord.ly
@@ -7,5 +8,4 @@ grid-lines-emphasizing-rhythms-and-notes-synchronization.ly
 controlling-the-placement-of-chord-fingerings.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 blanking-staff-lines-using-the--whiteout-command.ly
-applying-notehead-styles-depending-on-the-step-of-the-scale.ly
 grid-lines-changing-their-appearance.ly
diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
index ce945363c4..be11a8303a 100644
--- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
+++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly
@@ -5,10 +5,10 @@
 \header {
   lsrtags = "rhythms"
  texidoc = "
-This example shows how to specify how long each of the tuplets
-contained within the brackets after @code{\\times} should last. Many
-consecutive tuplets can then be placed within a single @code{\\times @{
-... @}} expression, thus saving typing.
+The property @code{tupletSpannerDuration} sets how long each of the
+tuplets contained within the brackets after @code{\\times} should last.
+Many consecutive tuplets can then be placed within a single
+@code{\\times @{ ... @}} expression, thus saving typing.
 
 In the example, two triplets are shown, while @code{\\times} was
 entered only once.
@@ -19,6 +19,7 @@ administration\".
 " }
 % begin verbatim
 \relative {
+  \time 2/4
   \set tupletSpannerDuration = #(ly:make-moment 1 4)
   \times 2/3 { c8 c c c c c }
 }
diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index 9c8d90af6b..c769bd2a9d 100644
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -2,13 +2,13 @@ combining-dynamics-with-markup-texts.ly
 creating-text-spanners.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
-caesura-railtracks-with-fermata.ly
-breathing-sign.ly
+breathing-signs.ly
 creating-real-parenthesized-dynamics.ly
-center-text-below-hairpin-dynamics.ly
+caesura-railtracks-with-fermata.ly
 contemporary-glissando.ly
 adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
 line-arrows.ly
 changing--flageolet-mark-size.ly
 piano-template-with-centered-dynamics.ly
 broken-crescendo-hairpin.ly
+center-text-below-hairpin-dynamics.ly
diff --git a/input/lsr/generating-random-notes.ly b/input/lsr/generating-random-notes.ly
index 54720e2eab..d39ed0bfca 100644
--- a/input/lsr/generating-random-notes.ly
+++ b/input/lsr/generating-random-notes.ly
@@ -5,11 +5,11 @@
 \header {
   lsrtags = "pitches"
  texidoc = "
-This Scheme-based snippet allows you to generate 24 random notes (or as
-many as you want), based on the current time (or any randomish number
-you might wish to specify instead, so you can obtain the same random
-notes each time): i.e. to get different random notes patterns, just
-change this number.
+This Scheme-based snippet generates 24 random notes (or as many as
+required), based on the current time (or any randomish number you might
+wish to specify instead, so you can obtain the same random notes each
+time): i.e., to get different random notes patterns, just change this
+number.
 " }
 % begin verbatim
 \score {
diff --git a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
similarity index 92%
rename from input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly
rename to input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
index dd315c926b..a0953a64d2 100644
--- a/input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly
+++ b/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
@@ -11,7 +11,7 @@ contains a @code{\\score} block instead of texts or marks.
 % begin verbatim
 tuning = \markup {
   \score {
-    \new Staff \with { \remove Time_signature_engraver }
+    \new Staff \with { \remove "Time_signature_engraver" }
     {
       \clef bass  <c, g, d g>1
     }
diff --git a/input/lsr/makam.ly b/input/lsr/makam.ly
index 74c7218e4b..a333f7b917 100644
--- a/input/lsr/makam.ly
+++ b/input/lsr/makam.ly
@@ -1,11 +1,11 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
 \version "2.11.38"
-\layout { ragged-right= ##t }
+\layout { ragged-right = ##t }
 \header {
   doctitle = "Makam"
   lsrtags = "pitches"
-  texidoc = "Makam is Turkish type of melody that uses 1/9 tone
+  texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
   microtonal alterations."
 }
 % begin verbatim
@@ -35,7 +35,7 @@ makamPitchNames = #`(
   (gc . ,(ly:make-pitch -1 4 KOMA))
   (ac . ,(ly:make-pitch -1 5 KOMA))
   (bc . ,(ly:make-pitch -1 6 KOMA))
-
+  
   (cb . ,(ly:make-pitch -1 0 BAKIYE))
   (db . ,(ly:make-pitch -1 1 BAKIYE))
   (eb . ,(ly:make-pitch -1 2 BAKIYE))
@@ -43,7 +43,7 @@ makamPitchNames = #`(
   (gb . ,(ly:make-pitch -1 4 BAKIYE))
   (ab . ,(ly:make-pitch -1 5 BAKIYE))
   (bb . ,(ly:make-pitch -1 6 BAKIYE))
-
+  
   (ck . ,(ly:make-pitch -1 0 KUCUK))
   (dk . ,(ly:make-pitch -1 1 KUCUK))
   (ek . ,(ly:make-pitch -1 2 KUCUK))
@@ -51,7 +51,7 @@ makamPitchNames = #`(
   (gk . ,(ly:make-pitch -1 4 KUCUK))
   (ak . ,(ly:make-pitch -1 5 KUCUK))
   (bk . ,(ly:make-pitch -1 6 KUCUK))
-
+  
   (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB))
   (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB))
   (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB))
@@ -59,7 +59,7 @@ makamPitchNames = #`(
   (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB))
   (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB))
   (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB))
-
+  
   ;; f for flat.
   (cfc . ,(ly:make-pitch -1 0 (- KOMA)))
   (dfc . ,(ly:make-pitch -1 1 (- KOMA)))
@@ -76,7 +76,7 @@ makamPitchNames = #`(
   (gfb . ,(ly:make-pitch -1 4 (- BAKIYE)))
   (afb . ,(ly:make-pitch -1 5 (- BAKIYE)))
   (bfb . ,(ly:make-pitch -1 6 (- BAKIYE)))
-
+  
   (cfk . ,(ly:make-pitch -1 0 (- KUCUK)))
   (dfk . ,(ly:make-pitch -1 1 (- KUCUK)))
   (efk . ,(ly:make-pitch -1 2 (- KUCUK)))
@@ -84,7 +84,7 @@ makamPitchNames = #`(
   (gfk . ,(ly:make-pitch -1 4 (- KUCUK)))
   (afk . ,(ly:make-pitch -1 5 (- KUCUK)))
   (bfk . ,(ly:make-pitch -1 6 (- KUCUK)))
-
+  
   (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB)))
   (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB)))
   (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB)))
@@ -92,14 +92,14 @@ makamPitchNames = #`(
   (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB)))
   (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB)))
   (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB)))
-
 )
 
-%% set pitch names.
-pitchnames = \makamPitchNames 
+% Set pitch names.
+pitchnames = \makamPitchNames
 #(ly:parser-set-note-names parser makamPitchNames)
 
-makamGlyphs = #'((1 . "accidentals.doublesharp")
+makamGlyphs = #'(
+       (1 . "accidentals.doublesharp")
        (8/9 . "accidentals.sharp.slashslashslash.stemstem")
        (5/9 . "accidentals.sharp.slashslashslash.stem")
        (4/9 . "accidentals.sharp")
@@ -113,7 +113,7 @@ makamGlyphs = #'((1 . "accidentals.doublesharp")
        )
 
 \relative {
-
+  
   %{ define alteration <-> symbol mapping. The following glyphs are available.
   accidentals.sharp 
   accidentals.sharp.slashslash.stem 
@@ -130,13 +130,12 @@ makamGlyphs = #'((1 . "accidentals.doublesharp")
   accidentals.flatflat.slash 
   accidentals.doublesharp 
   %}
-
-  \override Accidental #'glyph-name-alist =  \makamGlyphs
   
+  \override Accidental #'glyph-name-alist =  \makamGlyphs
   \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs
-  \set Staff.keySignature =  #'(
-    (3 .  4/9)
-    (6 . -1/9))
+  \set Staff.keySignature =  #'((3 .  4/9) (6 . -1/9))
   
-  c cc db fk gbm gfc gfb efk dfbm
+  c cc db fk
+  gbm gfc gfb efk
+  fk db cc c
 }
diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
index d9208f04fb..037ccbddb2 100644
--- a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
+++ b/input/lsr/making-an-object-invisible-with-the-transparent-property.ly
@@ -1,28 +1,34 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
-\layout { ragged-right= ##t }
-\header {
-  doctitle = "Making an object invisible with the transparent property"
-  lsrtags = "rhythms,tweaks-and-overrides"
-  texidoc = "
-Setting the @code{transparent} property will cause an object to be
-printed in `invisible ink': the object is not printed, but all its
-other behavior is retained.  The object still takes up space, it takes
-part in collisions, and slurs, and ties and beams can be attached to it.
-
-
-The snippet demonstrates how to connect different voices using ties. 
-Normally, ties only connect two notes in the same voice.  By
-introducing a tie in a different voice, and blanking the first up-stem
-in that voice, the tie appears to cross voices. 
-" }
-% begin verbatim
-\relative c'' <<
-  {
-    \once \override Stem #'transparent = ##t
-    b8~ b8\noBeam
-  } \\ {
-    b[ g8]
-  }
->>
+\version "2.11.38"
+\layout { ragged-right = ##t }
+\header {
+  doctitle = "Making an object invisible with the transparent property"
+  lsrtags = "rhythms,tweaks-and-overrides"
+  texidoc = "
+Setting the @code{transparent} property will cause an object to be
+printed in \"invisible ink\": the object is not printed, but all its
+other behavior is retained.  The object still takes up space, it takes
+part in collisions, and slurs, ties and beams can be attached to it.
+
+
+The snippet demonstrates how to connect different voices using ties. 
+Normally, ties only connect two notes in the same voice.  By
+introducing a tie in a different voice, and blanking the first up-stem
+in that voice, the tie appears to cross voices.  To prevent the blanked stem's
+flag from interfering with tie positioning, the stem is extended.
+" }
+
+\relative c'' {
+  \time 2/4
+  << {
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    b8 ~ b\noBeam
+    \once \override Stem #'transparent = ##t
+    \once \override Stem #'length = #8
+    g ~ g\noBeam
+  } \\ {
+    b g g e
+  } >>
+}
diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
index 26b89af142..46aa771349 100644
--- a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
+++ b/input/lsr/making-some-staff-lines-thicker-than-the-others.ly
@@ -8,13 +8,11 @@
 For pedagogical purposes, you may want to make one staff line thicker
 (e.g. the middle line, to emphasize the line of the G clef). This can
 be achieved by adding extra lines very close to the line you want to
-make thicker, using the #'line-positions property in the StaffSymbol
-context.
+make thicker, using the @code{'line-positions} property of the
+@code{StaffSymbol} object. 
 " }
 % begin verbatim
-\score {
-     \new Staff{
-     \override Staff.StaffSymbol #'line-positions =#'(-4 -2 -0.2 0 0.2 2 4 )
-         d'4 e' f' g'
-     }
+{
+  \override Staff.StaffSymbol #'line-positions = #'(-4 -2 -0.2 0 0.2 2 4)
+  d'4 e' f' g'
 }
diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
index 70a055cf84..676462deca 100644
--- a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
+++ b/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
@@ -11,13 +11,16 @@ a @code{ChoirStaff}. The bar line on staves is blanked out with an
 @code{\\override} command.
 " }
 % begin verbatim
-global = {\override Staff.BarLine #'transparent = ##t
-          s1 s
-          %the final bar line is not interupted
-          \once \override Staff.BarLine #'transparent = ##f
-          \bar "|."}
-\new StaffGroup
-\relative c'' <<
-  \new Staff {<< \global { c1 c } >>}
-  \new Staff {<< \global { c c } >>}
->>
+global = {
+  \override Staff.BarLine #'transparent = ##t
+  s1 s
+  % the final bar line is not interrupted
+  \revert Staff.BarLine #'transparent
+  \bar "|."
+}
+\new StaffGroup \relative c'' {
+  <<
+    \new Staff { << \global { c1 c } >> }
+    \new Staff { << \global { c c } >> }
+  >>
+}
diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index 1d3b3a036f..dd350da1da 100644
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -8,8 +8,8 @@
 The commonly used @code{\\key} command sets the @code{keySignature}
 property, in the @code{Staff} context.
 
-However, non-standard key signatures can be specified by setting this
-property directly. The format of this command is a list:
+For non-standard key signatures, you can set this property directly.
+The format of this command is a list:
 
 @code{ \\set Staff.keySignature = #`(((octave . step) . alter) ((octave
 . step) . alter) ...) } where, for each element in the list,
@@ -30,6 +30,7 @@ whole-tone scale:
 % begin verbatim
 \relative c' {
   \set Staff.keySignature = #`(((0 .  3) . ,SHARP) ((0 . 5) . ,FLAT) ((0 . 6) . ,FLAT))
-  c d e fis aes bes c2
+  c4 d e fis
+  aes bes c2
 }
 
diff --git a/input/lsr/ottava-text.ly b/input/lsr/ottava-text.ly
index d601cb6656..43ad10f9d6 100644
--- a/input/lsr/ottava-text.ly
+++ b/input/lsr/ottava-text.ly
@@ -6,10 +6,9 @@
   lsrtags = "pitches, text"
  texidoc = "
 Internally, the @code{set-octavation} function sets the properties
-@code{ottavation} (e.g., to @code{\"8va\"} or @code{\"8vb\"}) and
-@code{middleCPosition}. To override the text of the bracket, set
-@code{ottavation} after invoking @code{set-octavation}, like in the
-following example.
+@code{ottavation} (for example, to @code{\"8va\"} or @code{\"8vb\"})
+and @code{middleCPosition}. To override the text of the bracket, set
+@code{ottavation} after invoking @code{set-octavation}.
 
 
 " }
diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list
index 9f3eea8056..978ea8cf1c 100644
--- a/input/lsr/pitches.snippet-list
+++ b/input/lsr/pitches.snippet-list
@@ -1,14 +1,14 @@
 makam.ly
-ambiti-multiple-voices.ly
-applying-notehead-styles-depending-on-the-step-of-the-scale.ly
+adding-ambitus-per-voice.ly
+applying-note-head-styles-depending-on-the-step-of-the-scale.ly
 transposing-pitches-with-minimum-accidentals-smart-transpose.ly
 ottava-text.ly
 preventing-extra-naturals-from-being-automatically-added.ly
+ambitus-with-multiple-voices.ly
 generating-random-notes.ly
-quoting-another-voice-with-transposition.ly
-adding-ambiti-per-voice.ly
 clefs-commonly-tweaked-properties.ly
 dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
+quoting-another-voice-with-transposition.ly
 creating-a-sequence-of-notes-on-various-pitches.ly
 non-traditional-key-signatures.ly
diff --git a/input/lsr/positioning-multi--measure-rests.ly b/input/lsr/positioning-multi--measure-rests.ly
index ecd9a9087c..13b40c3d7f 100644
--- a/input/lsr/positioning-multi--measure-rests.ly
+++ b/input/lsr/positioning-multi--measure-rests.ly
@@ -1,7 +1,7 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
 \version "2.11.42"
-\layout { ragged-right= ##t }
+\layout { ragged-right = ##t }
 \header {
   doctitle = "Positioning multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
@@ -15,29 +15,28 @@ of multi-measure rests can be controlled as follows:
  "}
 % begin verbatim
 \relative c'' {
-% Multi-measure rests by default are set under the 2nd line
-R1
-% They can be moved with an override
-\override MultiMeasureRest #'staff-position = #-2
-R1
-% A value of 0 is the default position;
-% the following trick moves the rest to the center line
-\override MultiMeasureRest #'staff-position = #-0.01
-R1
-% Multimeasure rests in odd-numbered voices are under the top line
-<< {R1} \\ {a1} >>
-% Multi-measure rests in even-numbered voices are under the bottom line
-<< {c1} \\ {R1} >>
-% They remain separated even in empty bars
-<< {R1} \\ {R1} >>
-% This brings them together even though there are two voices
-\compressFullBarRests
-<<
-  \revert MultiMeasureRest #'staff-position
-  {R1*3}
-\\
-  \revert MultiMeasureRest #'staff-position
-  {R1*3}
->>
+  % Multi-measure rests by default are set under the second line
+  R1
+  % They can be moved with an override
+  \override MultiMeasureRest #'staff-position = #-2
+  R1
+  % A value of 0 is the default position;
+  % the following trick moves the rest to the center line
+  \override MultiMeasureRest #'staff-position = #-0.01
+  R1
+  % Multi-measure rests in odd-numbered voices are under the top line
+  << { R1 } \\ { a1 } >>
+  % Multi-measure rests in even-numbered voices are under the bottom line
+  << { c1 } \\ { R1 } >>
+  % They remain separated even in empty bars
+  << { R1 } \\ { R1 } >>
+  % This brings them together even though there are two voices
+  \compressFullBarRests
+  <<
+    \revert MultiMeasureRest #'staff-position
+    { R1*3 }
+    \\
+    \revert MultiMeasureRest #'staff-position
+    { R1*3 }
+  >>
 }
-
diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/input/lsr/positioning-segno-and-coda-with-line-break.ly
index a9604be799..26ccccc4e1 100644
--- a/input/lsr/positioning-segno-and-coda-with-line-break.ly
+++ b/input/lsr/positioning-segno-and-coda-with-line-break.ly
@@ -7,7 +7,7 @@
  texidoc = "
 If you want to place an exiting segno sign and add text like \"D.S. al
 Coda\" next to it where usually the staff lines are you can use this
-snippet. The coda will resume in a new line. Theres a variation
+snippet. The coda will resume in a new line. There is a variation
 documented in this snippet, where the coda will remain on the same
 line.
 " }
diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/input/lsr/printing-music-with-different-time-signatures.ly
index 65c2741883..2d5a075fc1 100644
--- a/input/lsr/printing-music-with-different-time-signatures.ly
+++ b/input/lsr/printing-music-with-different-time-signatures.ly
@@ -6,7 +6,7 @@
   lsrtags = "rhythms, percussion"
  texidoc = "
 In the following snippet, two parts have a completely different time
-signature, yet remain synchronized. The barlines can't be printed at
+signature, yet remain synchronized. The bar lines can't be printed at
 the @code{Score} level anymore, so you have to remove the
 @code{Barline_engraver} and put it in the @code{Staff} context. 
 " }
diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/input/lsr/quoting-another-voice-with-transposition.ly
index cd07810a5b..66bd2ea180 100644
--- a/input/lsr/quoting-another-voice-with-transposition.ly
+++ b/input/lsr/quoting-another-voice-with-transposition.ly
@@ -5,36 +5,33 @@
   doctitle = "Quoting another voice with transposition"
   lsrtags = "pitches,staff-notation"
   texidoc = "Quotations take into account the transposition of both
-source and target.  In this example, all instruments play sounding
-central C, the target is a instrument in F.  The target part may be
-@code{\\transpose}d.  In this case, all the pitches (including the
-quoted ones) will transposed as well."
+source and target. In this example, all instruments play sounding
+middle C; the target is an instrument in F. The target part may be
+transposed using @code{\\transpose}. In this case, all the pitches (including the
+quoted ones) are transposed."
 }
 % begin verbatim
-\addQuote clarinet  {
-    \transposition bes
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
-    d'16 d'16 d'8 
+\addQuote clarinet {
+  \transposition bes
+  \repeat unfold 8 { d'16 d'16 d'8 }
 }
 
-\addQuote sax  {
-    \transposition es'
-    a8 a a a a a  a a 
+\addQuote sax {
+  \transposition es'
+  \repeat unfold 16 { a8 }
 }
 
 quoteTest = {
-    \transposition f  % french horn
-    
-    g'4
-    << \quoteDuring #"clarinet" { \skip 4 } s4^"clar" >> 
-    << \quoteDuring #"sax" { \skip 4 } s4^"sax" >> 
+  % french horn
+  \transposition f
+  g'4
+  << \quoteDuring #"clarinet" { \skip 4 } s4^"clar." >>
+  << \quoteDuring #"sax" { \skip 4 } s4^"sax." >>
+  g'4
 }
 
-<< \quoteTest
-   \new Staff
-   << \transpose c' d' \quoteTest
-     s4_"up 1 tone"
-  >>
->>
+{
+  \set Staff.instrumentName = \markup \center-align { "Horn" "in F" }
+  \quoteTest
+  \transpose c' d' << \quoteTest s4_"up a tone" >>
+}
diff --git a/input/lsr/rest-styles.ly b/input/lsr/rest-styles.ly
index 8fbb70722a..bcc0f30984 100644
--- a/input/lsr/rest-styles.ly
+++ b/input/lsr/rest-styles.ly
@@ -15,7 +15,7 @@ Rests may be used in various styles.
   indent = 0.0
   \context {
     \Staff
-    \remove Time_signature_engraver
+    \remove "Time_signature_engraver"
   }
 }
 
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 962b6a240f..d4459ca3c4 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -15,6 +15,7 @@ altering-the-number-of-stems-in-a-beam.ly
 modifying-tuplet-bracket-length.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 making-an-object-invisible-with-the-transparent-property.ly
+automatic-beam-subdivisions.ly
 changing-the-tuplet-number.ly
 entering-several-tuplets-using-only-one--times-command.ly
 conducting-signs,-measure-grouping-signs.ly
diff --git a/input/lsr/shortening-volta-brackets.ly b/input/lsr/shortening-volta-brackets.ly
index 6d705270e4..92beba3db2 100644
--- a/input/lsr/shortening-volta-brackets.ly
+++ b/input/lsr/shortening-volta-brackets.ly
@@ -16,7 +16,8 @@ lasts one measure, which is a duration of 3/4.
   c c c
   \set Score.voltaSpannerDuration = #(ly:make-moment 3 4)
   \repeat volta 5 { d d d }
-    \alternative { { e e e f f f }
-    { g g g } 
+  \alternative {
+    { e e e f f f }
+    { g g g }
   }
 }
diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list
index eceb129d3b..1de82b50f2 100644
--- a/input/lsr/staff-notation.snippet-list
+++ b/input/lsr/staff-notation.snippet-list
@@ -1,18 +1,19 @@
 creating-blank-staves.ly
-time-signature-in-parentheses.ly
+incipit.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
-adding-and-extra-staff-at-a-line-break.ly
+adding-ambitus-per-voice.ly
 changing-the-number-of-lines-in-a-staff.ly
-incipit.ly
+adding-an-extra-staff-at-a-line-break.ly
 display-bracket-with-only-one-staff-in-a-system.ly
-inserting-score-fragments-above-the-staff,-as-markups.ly
+time-signature-in-parentheses.ly
 adding-an-extra-staff.ly
 changing-the-staff-size.ly
+use-square-bracket-at-the-start-of-a-staff-group.ly
 quoting-another-voice-with-transposition.ly
-adding-ambiti-per-voice.ly
 clefs-commonly-tweaked-properties.ly
 quoting-another-voice.ly
 volta-multi-staff.ly
+inserting-score-fragments-above-a-staff,-as-markups.ly
 nesting-staves.ly
 non-traditional-key-signatures.ly
 making-some-staff-lines-thicker-than-the-others.ly
diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index 4bce592109..0e9d6731d7 100644
--- a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -5,19 +5,20 @@
   doctitle = "Transposing music with minimum accidentals"
   lsrtags = "pitches"
  texidoc = "There is a way to enforce enharmonic modifications for
-notes in order to have the minimum number of accidentals. In that
-case, ``Double accidentals should be removed, as well as E-sharp
-(-> F), bC (-> B), bF (-> E), B-sharp (-> C).'', as proposed by a
-request for a new feature.  In this manner, the most natural
-enharmonic notes are chosen in this example.  "
-}
+notes in order to have the minimum number of accidentals. In this
+case, the following rules apply:
+
+\"Double accidentals should be removed, as well as E sharp (-> F),
+C flat (-> B), F flat (-> E) and B sharp (-> C)\".
+
+In this manner, the most natural enharmonic notes are chosen.
+"}
 % begin verbatim
-#(define  (naturalise-pitch p)
+#(define  (naturalize-pitch p)
   (let* ((o (ly:pitch-octave p))
          (a (* 4 (ly:pitch-alteration p))) 
     ; alteration, a, in quarter tone steps, for historical reasons
          (n (ly:pitch-notename p)))
-
     (cond
      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
       (set! a (- a 2))
@@ -25,54 +26,44 @@ enharmonic notes are chosen in this example.  "
      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
       (set! a (+ a 2))
       (set! n (- n 1))))
-
     (cond
      ((> a 2) (set! a (- a 4)) (set! n (+ n 1)))
      ((< a -2) (set! a (+ a 4)) (set! n (- n 1))))
-
     (if (< n 0) (begin (set!  o (- o 1)) (set! n (+ n 7))))
     (if (> n 6) (begin (set!  o (+ o 1)) (set! n (- n 7))))
-
     (ly:make-pitch o n (/ a 4))))
 
-#(define (naturalise music)
+#(define (naturalize music)
   (let* ((es (ly:music-property music 'elements))
          (e (ly:music-property music 'element))
          (p (ly:music-property music 'pitch)))
-
     (if (pair? es)
         (ly:music-set-property!
          music 'elements
-         (map (lambda (x) (naturalise x)) es)))
-
+         (map (lambda (x) (naturalize x)) es)))
     (if (ly:music? e)
         (ly:music-set-property!
          music 'element
-         (naturalise e)))
-
+         (naturalize e)))
     (if (ly:pitch? p)
         (begin
-          (set! p (naturalise-pitch p))
+          (set! p (naturalize-pitch p))
           (ly:music-set-property! music 'pitch p)))
-
     music))
 
-music =  \relative c' { c4 d  e f g a b  c }
-
-naturaliseMusic =
+naturalizeMusic =
 #(define-music-function (parser location m)
 					(ly:music?)
-			(naturalise m))
+			(naturalize m))
+
+music =  \relative c' { c4 d e g }
 
 \score {
-   \new Staff {
-     \transpose c ais \music
-     \naturaliseMusic \transpose c ais \music 
-    \break
+  \new Staff {
+    \transpose c ais \music
+    \naturalizeMusic \transpose c ais \music
     \transpose c deses \music
-    \naturaliseMusic \transpose c deses \music
+    \naturalizeMusic \transpose c deses \music
   }
-  \layout { ragged-right = ##t}
+  \layout { ragged-right = ##t }
 }
-
-
diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
new file mode 100644
index 0000000000..68852934d7
--- /dev/null
+++ b/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
@@ -0,0 +1,19 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
+
+\header {
+  lsrtags = "staff-notation, contexts-and-engravers"
+ texidoc = "
+The system start delimiter @code{SystemStartSquare} can be used by
+setting it explicitly in a @code{StaffGroup} or @code{ChoirStaffGroup}
+context. 
+" }
+% begin verbatim
+\score {
+  \new StaffGroup { << 
+  \set StaffGroup.systemStartDelimiter = #'SystemStartSquare
+    \new Staff { c'4 d' e' f' }
+    \new Staff { c'4 d' e' f' }
+  >> }
+}
diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list
index 398c1df27a..ff4d5a6c04 100644
--- a/input/lsr/vocal-music.snippet-list
+++ b/input/lsr/vocal-music.snippet-list
@@ -1,17 +1,17 @@
 chant-or-psalms-notation.ly
 single-staff-template-with-notes-and-lyrics.ly
+adding-ambitus-per-voice.ly
 skips-in-lyric-mode-2.ly
 skips-in-lyric-mode.ly
-aligning-lyrics.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
+ambitus-with-multiple-voices.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
-adding-ambiti-per-voice.ly
 vertically-aligning-ossias-and-lyrics.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
-vocal-ensemble-template-with-automatic-piano-reduction.ly
 formatting-lyrics-syllables.ly
 piano-template-with-melody-and-lyrics.ly
-ambiti-multiple-voices.ly
+aligning-lyrics.ly
 vocal-ensemble-template.ly
 adjusting-lyrics-vertical-spacing.ly
 demo-midiinstruments.ly
-- 
2.39.5