From 1b71244a169277f4aabbbd79a8d708c35d074438 Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 13 Jan 2008 10:52:38 +0100
Subject: [PATCH] Update LSR snippets

---
 ...hen-using-tuplet-and-non-tuplet-rythms..ly |   9 +-
 input/lsr/adding-fingerings-to-tablatures.ly  |  16 +-
 ...g-parentheses-around-an-expressive-mark.ly |   2 -
 .../lsr/adding-the-current-date-to-a-score.ly |   7 +-
 .../lsr/adjusting-lyrics-vertical-spacing.ly  |  31 +-
 input/lsr/aligning-lyrics.ly                  |  11 +-
 input/lsr/ambiti-multiple-voices.ly           |  42 ++-
 ...yles-depending-on-the-step-of-the-scale.ly |  30 +-
 input/lsr/broken-crescendo-hairpin.ly         |   4 +-
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly |  24 +-
 input/lsr/changing-the-staff-size.ly          |  17 +-
 .../lsr/clefs-commonly-tweaked-properties.ly  |  12 +-
 .../combining-two-parts-on-the-same-staff.ly  |  39 +--
 ...onducting-signs,-measure-grouping-signs.ly |   4 +-
 ...ontempary.ly => contemporary-glissando.ly} |   2 +-
 input/lsr/creating-text-spanners.ly           |   8 +-
 input/lsr/demo-midiinstruments.ly             | 286 +++++++++---------
 ...editorial-and-educational-use.snippet-list |   1 +
 input/lsr/expressive-marks.snippet-list       |   4 +-
 ...-to-start-from-a-given-letter-or-number.ly |  33 ++
 input/lsr/jazz-combo-template.ly              |   2 +-
 .../manually-controlling-beam-positions.ly    |  27 ++
 .../piano-template-with-centered-dynamics.ly  | 163 +++++-----
 input/lsr/pitches.snippet-list                |   4 +-
 ...naturals-from-being-automatically-added.ly |   6 +-
 input/lsr/rhythmic-slashes.ly                 |  29 +-
 input/lsr/rhythms.snippet-list                |   4 +-
 input/lsr/tweaks-and-overrides.snippet-list   |   1 +
 28 files changed, 438 insertions(+), 380 deletions(-)
 rename input/lsr/{glissando-contempary.ly => contemporary-glissando.ly} (94%)
 create mode 100644 input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 create mode 100644 input/lsr/manually-controlling-beam-positions.ly

diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
index ca557d5e05..1860d15e6b 100644
--- a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
+++ b/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
@@ -17,10 +17,7 @@ tuplet sections (enclosed with curly braces).
 % begin verbatim
 {
   r16[ g16 \times 2/3 {r16 e'8] }
-  
- g16( a \times 2/3 {b d e') }
- 
- g8[( a \times 2/3 {b d') e'~]}
- 
- \times 4/5 {e'32\( a b d' e'} a'4.\)
+  g16( a \times 2/3 {b d e') }
+  g8[( a \times 2/3 {b d') e'~]}
+  \times 4/5 {e'32\( a b d' e'} a'4.\)
 }
diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly
index 5ddeecf1af..20f6ca22e0 100644
--- a/input/lsr/adding-fingerings-to-tablatures.ly
+++ b/input/lsr/adding-fingerings-to-tablatures.ly
@@ -13,14 +13,10 @@ two = \markup{ \finger "2" }
 threetwo = \markup{ \column {\finger "3" \finger "2"} }
 threefour = \markup{ \column {\finger "3" \finger "4"} }
 
-\score {
-       
-\context TabStaff {
-
-\stemUp
-
-{ e8\4^\one b\2 < e, g\3 e'\1 >^>[ b\2 e\4] < a\3 fis'\1 >^>^\threetwo[ b\2 e\4] }
-
-}
-
+\score {      
+  \context TabStaff {
+    \stemUp
+    e8\4^\one b\2 < e, g\3 e'\1 >^>[ b\2 e\4] 
+    < a\3 fis'\1 >^>^\threetwo[ b\2 e\4]
+  }
 }
diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark.ly b/input/lsr/adding-parentheses-around-an-expressive-mark.ly
index 4106858064..af2d230e5c 100644
--- a/input/lsr/adding-parentheses-around-an-expressive-mark.ly
+++ b/input/lsr/adding-parentheses-around-an-expressive-mark.ly
@@ -10,9 +10,7 @@ parentheses. The associated grob is Score.ParenthesesItem.
 % begin verbatim
 \relative {
   c4 -\parenthesize -.
-
   \override ParenthesesItem #'padding = #0.1
   <d \parenthesize fis a> 
-
 }
 
diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/input/lsr/adding-the-current-date-to-a-score.ly
index fa05766c0e..2f5d0e4834 100644
--- a/input/lsr/adding-the-current-date-to-a-score.ly
+++ b/input/lsr/adding-the-current-date-to-a-score.ly
@@ -11,9 +11,10 @@ to enter the date manually to the @code{.ly} file. But that's very
 error prone. It's easy to forget updating the date. So i thought it
 would be useful if you can add the date on which the PDF file is
 generated automatically. I did't figure it out myself, but I asked on
-lilypond-user@@gnu.org. And guess what? Someone came with an excellent
-solution! So thank you very much Toine Schreurs for sending this
-solution to the user mailing list. I post it here for future reference.
+lilypond-user mailing list. And guess what? Someone came with an
+excellent solution! So thank you very much Toine Schreurs for sending
+this solution to the user mailing list. I post it here for future
+reference.
 
 The solution is to use two scheme functions called @code{strftime} and
 @code{localtime}, as shown in the snippet. It is a very flexible
diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly
index 8b358dea6d..92cbf62263 100644
--- a/input/lsr/adjusting-lyrics-vertical-spacing.ly
+++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly
@@ -10,20 +10,25 @@ Staff.
 % begin verbatim
 % Default layout:
 \score{
-<<
-\new Staff \new Voice = m \relative c'{ c4 d e f g f e d c1 }
-\new Lyrics \lyricsto m {aa aa aa aa aa aa aa aa aa }
- >>
+  <<
+    \new Staff \new Voice = m \relative c'{ c4 d e f g f e d c1}
+    \new Lyrics \lyricsto m {aa aa aa aa aa aa aa aa aa }
+  >>
 }
 
 % Reducing the minimum space below the Staff and above the Lyrics:
-\score{
-<<
-\new Staff \with {\override VerticalAxisGroup #'minimum-Y-extent = #'(-1
-. 4)}
- \new Voice = m \relative c'{ c4 d e f g f e d c1 }
-\new Lyrics \with {\override VerticalAxisGroup #'minimum-Y-extent =
-#'(-1.2 . 1)}
-\lyricsto m {aa aa aa aa aa aa aa aa aa }
- >>
+
+\score {
+  <<
+    \new Staff \with {
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. 4)}
+    \new Voice = m \relative c'{ c4 d e f g f e d c1 }
+    \new Lyrics \with {
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 1)}
+    \lyricsto m {aa aa aa aa aa aa aa aa aa }
+  >>
+
+  \header {
+    tagline = ""
+  }
 }
diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly
index 4f5934b012..20e26cc6de 100644
--- a/input/lsr/aligning-lyrics.ly
+++ b/input/lsr/aligning-lyrics.ly
@@ -11,7 +11,10 @@ is left, #0 is center and #1 is right; however, you can use #LEFT,
 " }
 % begin verbatim
 \relative c'' {
-c1 c c}
-\addlyrics {\once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" 
-\once \override LyricText #'self-alignment-X = #CENTER "This is centered" 
-\once \override LyricText #'self-alignment-X = #1 "this is right-aligned"  }
+  c1 c c
+}
+\addlyrics {
+  \once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" 
+  \once \override LyricText #'self-alignment-X = #CENTER "This is centered" 
+  \once \override LyricText #'self-alignment-X = #1 "this is right-aligned"  
+}
diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly
index d51a47ef22..1e7c786f5b 100644
--- a/input/lsr/ambiti-multiple-voices.ly
+++ b/input/lsr/ambiti-multiple-voices.ly
@@ -7,39 +7,33 @@
 If you have multiple voices in a single staff and you want a single
 ambitus per staff rather than per voice, add the
 @code{Ambitus_engraver} to the @code{Staff} context rather than to the
-@code{Voice} context.
-
-This example uses one advanced feature,
-
-
-@code{ \\override Ambitus #'X-offset = #-1.0 }
-% begin verbatim
-
-
-This code moves the ambitus to the left.  The same effect could have
-been achieved with @code{extra-offset}, but then the formatting system
-would not reserve space for the moved object.
-
+@code{Voice} context. This example uses
 
+@code{\\override Ambitus #'X-offset = #-1.0}
 
+to move the ambitus to the left.  The same effect could have been
+achieved with @code{extra-offset}, but then the formatting system would
+not reserve space for the moved object. 
 " }
-
+% begin verbatim
 \new Staff \with {
   \consists "Ambitus_engraver"
-}
+  }
 <<
   \new Voice \with {
     \remove "Ambitus_engraver"
-  } \relative c'' {
-    \override Ambitus #'X-offset = #-1.0
-    \voiceOne
-    c4 a d e f2
-  }
+  } 
+    \relative c'' {
+      \override Ambitus #'X-offset = #-1.0
+      \voiceOne
+      c4 a d e f2
+    }
   \new Voice \with {
     \remove "Ambitus_engraver"
-  } \relative c' {
-    \voiceTwo
-    es4 f g as b2
-  }
+  } 
+    \relative c' {
+      \voiceTwo
+      es4 f g as b2
+    }
 >>
 
diff --git a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
index 2260229344..4248875348 100644
--- a/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
+++ b/input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
@@ -28,22 +28,18 @@ fragment = {
   \break
 }
 
-\relative {
-	  \set shapeNoteStyles = ##(do re mi fa #f la ti)
-	  \fragment
+\score {
+  \new Staff {
+    \transpose c d 
+    \relative {
+      \set shapeNoteStyles = ##(do re mi fa #f la ti)
+      \fragment \break
+    }
+    
+    \relative {
+      \set shapeNoteStyles  = ##(cross triangle fa #f mensural xcircle diamond)
+      \fragment
+    }
+  }
 }
 
-%  temporary change help LSR integration -gp
-%{
-\transpose c d 
-  \relative {
-	  \set shapeNoteStyles = ##(do re mi fa #f la ti)
-	  \fragment
-}
-
-\relative {
-	\set shapeNoteStyles  = ##(cross triangle fa #f mensural xcircle diamond)
-	\fragment
-}
-%}
-
diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly
index cf5ec30ccc..65653fc8f5 100644
--- a/input/lsr/broken-crescendo-hairpin.ly
+++ b/input/lsr/broken-crescendo-hairpin.ly
@@ -28,7 +28,9 @@ Markup to actually draw the rectangle above the hairpin.
 	    \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" }
+	    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
 	}
        >>
diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
index 0007aac535..676380ef93 100644
--- a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
+++ b/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
@@ -10,18 +10,18 @@ The appearance of slurs may be changed from solid to dotted or dashed.
 " }
 % begin verbatim
 \score{
-	\relative c'{
-		c( d e  c) |
-		\slurDotted
-		c( d e  c) |
-		\slurSolid
-		c( d e  c) |
-		\slurDashed
-		c( d e  c) |
-		\slurSolid
-		c( d e  c) |
-	}
-	\layout{ raggedright=##t }
+  \relative c'{
+    c( d e  c) |
+    \slurDotted
+    c( d e  c) |
+    \slurSolid
+    c( d e  c) |
+    \slurDashed
+    c( d e  c) |
+    \slurSolid
+    c( d e  c) |
+  }
+  \layout{ raggedright=##t }
 }
 
 
diff --git a/input/lsr/changing-the-staff-size.ly b/input/lsr/changing-the-staff-size.ly
index de5478414d..a1f193e494 100644
--- a/input/lsr/changing-the-staff-size.ly
+++ b/input/lsr/changing-the-staff-size.ly
@@ -9,16 +9,17 @@ In order to change staff sizes, both @code{staff-space} and
 " }
 % begin verbatim
 {
-    \new Staff \relative c'' { \dynamicDown c8 \ff c c c c c c c } 
+  \new Staff \relative c'' { \dynamicDown c8 \ff c c c c c c c } 
 }
 
 {
-    \new Staff \with {
-	fontSize = #-3
-	\override StaffSymbol #'staff-space = #(magstep -3)
-    } {
-	\clef bass
-	c8 c c c  c c c c
-    }
+  \new Staff \with {
+    fontSize = #-3
+    \override StaffSymbol #'staff-space = #(magstep -3)
+  }
+  {
+    \clef bass
+    c8 c c c  c c c c
+  }
 }
 
diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly
index 296318bed4..1e7c33729f 100644
--- a/input/lsr/clefs-commonly-tweaked-properties.ly
+++ b/input/lsr/clefs-commonly-tweaked-properties.ly
@@ -23,18 +23,18 @@ When a clef change takes place at a line break the new clef symbol is
 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 in not required it can be suppressed by setting the
-explicitClefVisibility Staff property to the value  @code{
-end-of-line-invisible: \\set Staff.explicitClefVisibility =
-#end-of-line-invisible  } The default behaviour can be recovered with 
-@code{\\unset Staff.explicitClefVisibility}
-% begin verbatim
+explicitClefVisibility Staff property to the value 
+@code{end-of-line-invisible: \\set Staff.explicitClefVisibility =
+#end-of-line-invisible} The default behaviour can be recovered with 
+@code{\\unset Staff.explicitClefVisibility}.
+
 
 The following examples show the possibilities when setting these
 properties manually. On the first line, the manual changes preserve the
 standard relative positioning of clefs and notes, whereas on the second
 line, they do not. 
 " }
-
+% begin verbatim
 {
            % The default treble clef
            c'4
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 9d9d55de70..ca21f81ba7 100644
--- a/input/lsr/combining-two-parts-on-the-same-staff.ly
+++ b/input/lsr/combining-two-parts-on-the-same-staff.ly
@@ -21,29 +21,32 @@ staff : standard polyphony, \\partcombine whitout texts, and
 
 " }
 % begin verbatim
-musicUp = { 	 \time 4/4
-			\relative c'' {
-				a4 c4.(g8) a4 |
-				g4 e' g,( a8 b) | 
-				c b a2.
-			}
+musicUp = {
+  \time 4/4
+  \relative c'' {
+    a4 c4.(g8) a4 |
+    g4 e' g,( a8 b) | 
+    c b a2.
+  }
 }
 
 musicDown = {
-			\relative c'' {
-				g4 e4.(d8) c4 |
-				r2 g'4( f8 e) |
-				d2 a
-			}
+  \relative c'' {
+    g4 e4.(d8) c4 |
+    r2 g'4( f8 e) |
+    d2 a
+  }
 }
+
 \score{
-	\new Staff {
-		\set Staff.instrumentName = "Standard polyphony  "
-		<< \musicUp  \\ \musicDown >>
-	}
-	\layout{ 
-	indent = 6.0\cm 
-	}
+  \new Staff {
+    \set Staff.instrumentName = "Standard polyphony  "
+    << \musicUp  \\ \musicDown >>
+}
+
+  \layout{ 
+    indent = 6.0\cm 
+  }
 }
 
 \score{
diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/input/lsr/conducting-signs,-measure-grouping-signs.ly
index 57316830d9..5007ede8b9 100644
--- a/input/lsr/conducting-signs,-measure-grouping-signs.ly
+++ b/input/lsr/conducting-signs,-measure-grouping-signs.ly
@@ -10,10 +10,10 @@ signs ease reading rhythmically complex modern music.  In the following
 example, the 9/8 measure is subdivided in 2, 2, 2 and 3.  This is
 passed to @code{set-time-signature} as the third argument @code{(2 2 2
 3)}
-% begin verbatim
 
-" }
 
+" }
+% begin verbatim
 \score {
   \relative c'' {
     #(set-time-signature 9 8 '(2 2 2 3))
diff --git a/input/lsr/glissando-contempary.ly b/input/lsr/contemporary-glissando.ly
similarity index 94%
rename from input/lsr/glissando-contempary.ly
rename to input/lsr/contemporary-glissando.ly
index b600715936..a8d3dc753e 100644
--- a/input/lsr/glissando-contempary.ly
+++ b/input/lsr/contemporary-glissando.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-%% Tags: pitches, expressive-marks
+%% Tags: expressive-marks
 \version "2.11.35"
 
 \header { texidoc = "
diff --git a/input/lsr/creating-text-spanners.ly b/input/lsr/creating-text-spanners.ly
index 7654ceef87..ebe85d1012 100644
--- a/input/lsr/creating-text-spanners.ly
+++ b/input/lsr/creating-text-spanners.ly
@@ -4,10 +4,10 @@
 \version "2.11.35"
 
 \header { texidoc = "
-The \\startTextSpan and \\stopTextSpan commands give you the ability to
-create text spanners as easily as pedals indications or octavations.
-Override some properties of the TextSpanner object to modify its
-output.
+The <code>\\startTextSpan</code> and <code>\\stopTextSpan</code>
+commands give you the ability to create text spanners as easily as
+pedals indications or octavations. Override some properties of the
+<code>TextSpanner</code> object to modify its output.
 " }
 % begin verbatim
 \relative c''{
diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly
index 3a59adac2b..631ddc7b6b 100644
--- a/input/lsr/demo-midiinstruments.ly
+++ b/input/lsr/demo-midiinstruments.ly
@@ -14,156 +14,156 @@ basemelodie = { c'4. \mf g  c'16 b' c'' d'' | e'' d'' e'' f'' g''4 g'''4 r | r1
 melodie = { \tempo 4 = 150 \basemelodie }
 
 \header {
-	title = "Demo of all midi sounds"
-	arranger = "Myself"
+  title = "Demo of all midi sounds"
+  arranger = "Myself"
 }
 % begin verbatim
 \score { 
-	\new Staff <<
-		\new Voice { \melodie 
-		} %Voice
-	>> %Staff
+  \new Staff <<
+    \new Voice { \melodie 
+    } %Voice
+  >> %Staff
   \layout {  }
 } %score
 
 \score { 
-	\new Staff <<
-		\tempo 4 = 180 
-		%\set Staff.instrumentName="S/A"
-		%\set Staff.midiMinimumVolume = #0.2 
-		%\set Staff.midiMaximumVolume = #0.4
-		%\set Voice.dynamicAbsoluteVolumeFunction = #0.6
-		\new Voice { r \mf
-			\set Staff.midiInstrument="acoustic grand" \melodie
-			\set Staff.midiInstrument="bright acoustic" \melodie
-			\set Staff.midiInstrument="electric grand" \melodie
-			\set Staff.midiInstrument="honky-tonk" \melodie
-			\set Staff.midiInstrument="electric piano 1" \melodie
-			\set Staff.midiInstrument="electric piano 2" \melodie
-			\set Staff.midiInstrument="harpsichord" \melodie
-			\set Staff.midiInstrument="clav" \melodie
-			\set Staff.midiInstrument="celesta" \melodie
-			\set Staff.midiInstrument="glockenspiel" \melodie
-			\set Staff.midiInstrument="music box" \melodie
-			\set Staff.midiInstrument="vibraphone" \melodie
-			\set Staff.midiInstrument="marimba" \melodie
-			\set Staff.midiInstrument="xylophone" \melodie
-			\set Staff.midiInstrument="tubular bells" \melodie
-			\set Staff.midiInstrument="dulcimer" \melodie
-			\set Staff.midiInstrument="drawbar organ" \melodie
-			\set Staff.midiInstrument="percussive organ" \melodie
-			\set Staff.midiInstrument="rock organ" \melodie
-			\set Staff.midiInstrument="church organ" \melodie
-			\set Staff.midiInstrument="reed organ" \melodie
-			\set Staff.midiInstrument="accordion" \melodie
-			\set Staff.midiInstrument="harmonica" \melodie
-			\set Staff.midiInstrument="concertina" \melodie
-			\set Staff.midiInstrument="acoustic guitar (nylon)" \melodie
-			\set Staff.midiInstrument="acoustic guitar (steel)" \melodie
-			\set Staff.midiInstrument="electric guitar (jazz)" \melodie
-			\set Staff.midiInstrument="electric guitar (clean)" \melodie
-			\set Staff.midiInstrument="electric guitar (muted)" \melodie
-			\set Staff.midiInstrument="overdriven guitar" \melodie
-			\set Staff.midiInstrument="distorted guitar" \melodie
-			\set Staff.midiInstrument="acoustic bass" \melodie
-			\set Staff.midiInstrument="electric bass (finger)" \melodie
-			\set Staff.midiInstrument="electric bass (pick)" \melodie
-			\set Staff.midiInstrument="fretless bass" \melodie
-			\set Staff.midiInstrument="slap bass 1" \melodie
-			\set Staff.midiInstrument="slap bass 2" \melodie
-			\set Staff.midiInstrument="synth bass 1" \melodie
-			\set Staff.midiInstrument="synth bass 2" \melodie
-			\set Staff.midiInstrument="violin" \melodie
-			\set Staff.midiInstrument="viola" \melodie
-			\set Staff.midiInstrument="cello" \melodie
-			\set Staff.midiInstrument="contrabass" \melodie
-			\set Staff.midiInstrument="tremolo strings" \melodie
-			\set Staff.midiInstrument="pizzicato strings" \melodie
-			\set Staff.midiInstrument="orchestral strings" \melodie
-			\set Staff.midiInstrument="timpani" \melodie
-			\set Staff.midiInstrument="string ensemble 1" \melodie
-			\set Staff.midiInstrument="string ensemble 2" \melodie
-			\set Staff.midiInstrument="synthstrings 1" \melodie
-			\set Staff.midiInstrument="synthstrings 2" \melodie
-			\set Staff.midiInstrument="choir aahs" \melodie
-			\set Staff.midiInstrument="voice oohs" \melodie
-			\set Staff.midiInstrument="synth voice" \melodie
-			\set Staff.midiInstrument="orchestra hit" \melodie
-			\set Staff.midiInstrument="trumpet" \melodie
-			\set Staff.midiInstrument="trombone" \melodie
-			\set Staff.midiInstrument="tuba" \melodie
-			\set Staff.midiInstrument="muted trumpet" \melodie
-			\set Staff.midiInstrument="french horn" \melodie
-			\set Staff.midiInstrument="brass section" \melodie
-			\set Staff.midiInstrument="synthbrass 1" \melodie
-			\set Staff.midiInstrument="synthbrass 2" \melodie
-			\set Staff.midiInstrument="soprano sax" \melodie
-			\set Staff.midiInstrument="alto sax" \melodie
-			\set Staff.midiInstrument="tenor sax" \melodie
-			\set Staff.midiInstrument="baritone sax" \melodie
-			\set Staff.midiInstrument="oboe" \melodie
-			\set Staff.midiInstrument="english horn" \melodie
-			\set Staff.midiInstrument="bassoon" \melodie
-			\set Staff.midiInstrument="clarinet" \melodie
-			\set Staff.midiInstrument="piccolo" \melodie
-			\set Staff.midiInstrument="flute" \melodie
-			\set Staff.midiInstrument="recorder" \melodie
-			\set Staff.midiInstrument="pan flute" \melodie
-			\set Staff.midiInstrument="blown bottle" \melodie
-			\set Staff.midiInstrument="shakuhachi" \melodie
-			\set Staff.midiInstrument="whistle" \melodie
-			\set Staff.midiInstrument="ocarina" \melodie
-			\set Staff.midiInstrument="lead 1 (square)" \melodie
-			\set Staff.midiInstrument="lead 2 (sawtooth)" \melodie
-			\set Staff.midiInstrument="lead 3 (calliope)" \melodie
-			\set Staff.midiInstrument="lead 4 (chiff)" \melodie
-			\set Staff.midiInstrument="lead 5 (charang)" \melodie
-			\set Staff.midiInstrument="lead 6 (voice)" \melodie
-			\set Staff.midiInstrument="lead 7 (fifths)" \melodie
-			\set Staff.midiInstrument="lead 8 (bass+lead)" \melodie
-			\set Staff.midiInstrument="pad 1 (new age)" \melodie
-			\set Staff.midiInstrument="pad 2 (warm)" \melodie
-			\set Staff.midiInstrument="pad 3 (polysynth)" \melodie
-			\set Staff.midiInstrument="pad 4 (choir)" \melodie
-			\set Staff.midiInstrument="pad 5 (bowed)" \melodie
-			\set Staff.midiInstrument="pad 6 (metallic)" \melodie
-			\set Staff.midiInstrument="pad 7 (halo)" \melodie
-			\set Staff.midiInstrument="pad 8 (sweep)" \melodie
-			\set Staff.midiInstrument="fx 1 (rain)" \melodie
-			\set Staff.midiInstrument="fx 2 (soundtrack)" \melodie
-			\set Staff.midiInstrument="fx 3 (crystal)" \melodie
-			\set Staff.midiInstrument="fx 4 (atmosphere)" \melodie
-			\set Staff.midiInstrument="fx 5 (brightness)" \melodie
-			\set Staff.midiInstrument="fx 6 (goblins)" \melodie
-			\set Staff.midiInstrument="fx 7 (echoes)" \melodie
-			\set Staff.midiInstrument="fx 8 (sci-fi)" \melodie
-			\set Staff.midiInstrument="sitar" \melodie
-			\set Staff.midiInstrument="banjo" \melodie
-			\set Staff.midiInstrument="shamisen" \melodie
-			\set Staff.midiInstrument="koto" \melodie
-			\set Staff.midiInstrument="kalimba" \melodie
-			\set Staff.midiInstrument="bagpipe" \melodie
-			\set Staff.midiInstrument="fiddle" \melodie
-			\set Staff.midiInstrument="shanai" \melodie
-			\set Staff.midiInstrument="tinkle bell" \melodie
-			\set Staff.midiInstrument="agogo" \melodie
-			\set Staff.midiInstrument="steel drums" \melodie
-			\set Staff.midiInstrument="woodblock" \melodie
-			\set Staff.midiInstrument="taiko drum" \melodie
-			\set Staff.midiInstrument="melodic tom" \melodie
-			\set Staff.midiInstrument="synth drum" \melodie
-			\set Staff.midiInstrument="reverse cymbal" \melodie
-			\set Staff.midiInstrument="guitar fret noise" \melodie
-			\set Staff.midiInstrument="breath noise" \melodie
-			\set Staff.midiInstrument="seashore" \melodie
-			\set Staff.midiInstrument="bird tweet" \melodie
-			\set Staff.midiInstrument="telephone ring" \melodie
-			\set Staff.midiInstrument="helicopter" \melodie
-			\set Staff.midiInstrument="applause" \melodie
-			\set Staff.midiInstrument="gunshot" \melodie
-		} %Voice
-	>> %Staff
-	\midi {	}
+  \new Staff <<
+    \tempo 4 = 180 
+    %\set Staff.instrumentName="S/A"
+    %\set Staff.midiMinimumVolume = #0.2 
+    %\set Staff.midiMaximumVolume = #0.4
+    %\set Voice.dynamicAbsoluteVolumeFunction = #0.6
+    \new Voice { r \mf
+      \set Staff.midiInstrument="acoustic grand" \melodie
+      \set Staff.midiInstrument="bright acoustic" \melodie
+      \set Staff.midiInstrument="electric grand" \melodie
+      \set Staff.midiInstrument="honky-tonk" \melodie
+      \set Staff.midiInstrument="electric piano 1" \melodie
+      \set Staff.midiInstrument="electric piano 2" \melodie
+      \set Staff.midiInstrument="harpsichord" \melodie
+      \set Staff.midiInstrument="clav" \melodie
+      \set Staff.midiInstrument="celesta" \melodie
+      \set Staff.midiInstrument="glockenspiel" \melodie
+      \set Staff.midiInstrument="music box" \melodie
+      \set Staff.midiInstrument="vibraphone" \melodie
+      \set Staff.midiInstrument="marimba" \melodie
+      \set Staff.midiInstrument="xylophone" \melodie
+      \set Staff.midiInstrument="tubular bells" \melodie
+      \set Staff.midiInstrument="dulcimer" \melodie
+      \set Staff.midiInstrument="drawbar organ" \melodie
+      \set Staff.midiInstrument="percussive organ" \melodie
+      \set Staff.midiInstrument="rock organ" \melodie
+      \set Staff.midiInstrument="church organ" \melodie
+      \set Staff.midiInstrument="reed organ" \melodie
+      \set Staff.midiInstrument="accordion" \melodie
+      \set Staff.midiInstrument="harmonica" \melodie
+      \set Staff.midiInstrument="concertina" \melodie
+      \set Staff.midiInstrument="acoustic guitar (nylon)" \melodie
+      \set Staff.midiInstrument="acoustic guitar (steel)" \melodie
+      \set Staff.midiInstrument="electric guitar (jazz)" \melodie
+      \set Staff.midiInstrument="electric guitar (clean)" \melodie
+      \set Staff.midiInstrument="electric guitar (muted)" \melodie
+      \set Staff.midiInstrument="overdriven guitar" \melodie
+      \set Staff.midiInstrument="distorted guitar" \melodie
+      \set Staff.midiInstrument="acoustic bass" \melodie
+      \set Staff.midiInstrument="electric bass (finger)" \melodie
+      \set Staff.midiInstrument="electric bass (pick)" \melodie
+      \set Staff.midiInstrument="fretless bass" \melodie
+      \set Staff.midiInstrument="slap bass 1" \melodie
+      \set Staff.midiInstrument="slap bass 2" \melodie
+      \set Staff.midiInstrument="synth bass 1" \melodie
+      \set Staff.midiInstrument="synth bass 2" \melodie
+      \set Staff.midiInstrument="violin" \melodie
+      \set Staff.midiInstrument="viola" \melodie
+      \set Staff.midiInstrument="cello" \melodie
+      \set Staff.midiInstrument="contrabass" \melodie
+      \set Staff.midiInstrument="tremolo strings" \melodie
+      \set Staff.midiInstrument="pizzicato strings" \melodie
+      \set Staff.midiInstrument="orchestral strings" \melodie
+      \set Staff.midiInstrument="timpani" \melodie
+      \set Staff.midiInstrument="string ensemble 1" \melodie
+      \set Staff.midiInstrument="string ensemble 2" \melodie
+      \set Staff.midiInstrument="synthstrings 1" \melodie
+      \set Staff.midiInstrument="synthstrings 2" \melodie
+      \set Staff.midiInstrument="choir aahs" \melodie
+      \set Staff.midiInstrument="voice oohs" \melodie
+      \set Staff.midiInstrument="synth voice" \melodie
+      \set Staff.midiInstrument="orchestra hit" \melodie
+      \set Staff.midiInstrument="trumpet" \melodie
+      \set Staff.midiInstrument="trombone" \melodie
+      \set Staff.midiInstrument="tuba" \melodie
+      \set Staff.midiInstrument="muted trumpet" \melodie
+      \set Staff.midiInstrument="french horn" \melodie
+      \set Staff.midiInstrument="brass section" \melodie
+      \set Staff.midiInstrument="synthbrass 1" \melodie
+      \set Staff.midiInstrument="synthbrass 2" \melodie
+      \set Staff.midiInstrument="soprano sax" \melodie
+      \set Staff.midiInstrument="alto sax" \melodie
+      \set Staff.midiInstrument="tenor sax" \melodie
+      \set Staff.midiInstrument="baritone sax" \melodie
+      \set Staff.midiInstrument="oboe" \melodie
+      \set Staff.midiInstrument="english horn" \melodie
+      \set Staff.midiInstrument="bassoon" \melodie
+      \set Staff.midiInstrument="clarinet" \melodie
+      \set Staff.midiInstrument="piccolo" \melodie
+      \set Staff.midiInstrument="flute" \melodie
+      \set Staff.midiInstrument="recorder" \melodie
+      \set Staff.midiInstrument="pan flute" \melodie
+      \set Staff.midiInstrument="blown bottle" \melodie
+      \set Staff.midiInstrument="shakuhachi" \melodie
+      \set Staff.midiInstrument="whistle" \melodie
+      \set Staff.midiInstrument="ocarina" \melodie
+      \set Staff.midiInstrument="lead 1 (square)" \melodie
+      \set Staff.midiInstrument="lead 2 (sawtooth)" \melodie
+      \set Staff.midiInstrument="lead 3 (calliope)" \melodie
+      \set Staff.midiInstrument="lead 4 (chiff)" \melodie
+      \set Staff.midiInstrument="lead 5 (charang)" \melodie
+      \set Staff.midiInstrument="lead 6 (voice)" \melodie
+      \set Staff.midiInstrument="lead 7 (fifths)" \melodie
+      \set Staff.midiInstrument="lead 8 (bass+lead)" \melodie
+      \set Staff.midiInstrument="pad 1 (new age)" \melodie
+      \set Staff.midiInstrument="pad 2 (warm)" \melodie
+      \set Staff.midiInstrument="pad 3 (polysynth)" \melodie
+      \set Staff.midiInstrument="pad 4 (choir)" \melodie
+      \set Staff.midiInstrument="pad 5 (bowed)" \melodie
+      \set Staff.midiInstrument="pad 6 (metallic)" \melodie
+      \set Staff.midiInstrument="pad 7 (halo)" \melodie
+      \set Staff.midiInstrument="pad 8 (sweep)" \melodie
+      \set Staff.midiInstrument="fx 1 (rain)" \melodie
+      \set Staff.midiInstrument="fx 2 (soundtrack)" \melodie
+      \set Staff.midiInstrument="fx 3 (crystal)" \melodie
+      \set Staff.midiInstrument="fx 4 (atmosphere)" \melodie
+      \set Staff.midiInstrument="fx 5 (brightness)" \melodie
+      \set Staff.midiInstrument="fx 6 (goblins)" \melodie
+      \set Staff.midiInstrument="fx 7 (echoes)" \melodie
+      \set Staff.midiInstrument="fx 8 (sci-fi)" \melodie
+      \set Staff.midiInstrument="sitar" \melodie
+      \set Staff.midiInstrument="banjo" \melodie
+      \set Staff.midiInstrument="shamisen" \melodie
+      \set Staff.midiInstrument="koto" \melodie
+      \set Staff.midiInstrument="kalimba" \melodie
+      \set Staff.midiInstrument="bagpipe" \melodie
+      \set Staff.midiInstrument="fiddle" \melodie
+      \set Staff.midiInstrument="shanai" \melodie
+      \set Staff.midiInstrument="tinkle bell" \melodie
+      \set Staff.midiInstrument="agogo" \melodie
+      \set Staff.midiInstrument="steel drums" \melodie
+      \set Staff.midiInstrument="woodblock" \melodie
+      \set Staff.midiInstrument="taiko drum" \melodie
+      \set Staff.midiInstrument="melodic tom" \melodie
+      \set Staff.midiInstrument="synth drum" \melodie
+      \set Staff.midiInstrument="reverse cymbal" \melodie
+      \set Staff.midiInstrument="guitar fret noise" \melodie
+      \set Staff.midiInstrument="breath noise" \melodie
+      \set Staff.midiInstrument="seashore" \melodie
+      \set Staff.midiInstrument="bird tweet" \melodie
+      \set Staff.midiInstrument="telephone ring" \melodie
+      \set Staff.midiInstrument="helicopter" \melodie
+      \set Staff.midiInstrument="applause" \melodie
+      \set Staff.midiInstrument="gunshot" \melodie
+    } %Voice
+  >> %Staff
+  \midi { }
 } %score
 
 
diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list
index 28e681b67a..3bda01fc7e 100644
--- a/input/lsr/editorial-and-educational-use.snippet-list
+++ b/input/lsr/editorial-and-educational-use.snippet-list
@@ -8,4 +8,5 @@ changing-the-default-text-font-family.ly
 three-sided-box.ly
 clefs-commonly-tweaked-properties.ly
 blanking-staff-lines-using-the--whiteout-command.ly
+forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 changing-an-individual-notes-size-in-a-chord.ly
diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index 98eb1de0ce..d688d8b179 100644
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -1,13 +1,13 @@
 combining-dynamics-with-markup-texts.ly
-glissando-contempary.ly
+creating-text-spanners.ly
 breathing-sign.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 caesura-railtracks-with-fermata.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 center-text-below-hairpin-dynamics.ly
+contemporary-glissando.ly
 adding-parentheses-around-an-expressive-mark.ly
 line-arrows.ly
 changing--flageolet-mark-size.ly
 piano-template-with-centered-dynamics.ly
-creating-text-spanners.ly
 broken-crescendo-hairpin.ly
diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
new file mode 100644
index 0000000000..96b0d0adbf
--- /dev/null
+++ b/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
@@ -0,0 +1,33 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+%% Tags: rhythms, editorial-and-educational-use
+\version "2.11.35"
+
+\header { texidoc = "
+This snippet demonstrates how to obtain automatic ordered rehearsal
+marks, but from the letter or number you want.
+" }
+% begin verbatim
+\relative c''{
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark #14
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+
+\break
+
+  \set Score.markFormatter = #format-mark-numbers 
+  c1 \mark #1
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark #14
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+  c1 \mark \default
+}
diff --git a/input/lsr/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly
index 00c669d5b0..2afcf0091b 100644
--- a/input/lsr/jazz-combo-template.ly
+++ b/input/lsr/jazz-combo-template.ly
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-%% Tags: pitches, piano-music, percussion, guitar, template
+%% Tags: piano-music, percussion, guitar, template
 \version "2.11.35"
 
 \header { texidoc = "
diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly
new file mode 100644
index 0000000000..cb1db0d090
--- /dev/null
+++ b/input/lsr/manually-controlling-beam-positions.ly
@@ -0,0 +1,27 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+%% Tags: rhythms, tweaks-and-overrides
+\version "2.11.35"
+
+\header { texidoc = "
+Beam positions may be controlled manually, by overriding the
+@code{positions} setting of the @code{Beam} grob.
+
+
+
+" }
+% begin verbatim
+\score { 
+    \context Voice \relative c {
+	%% from upper staffline (position 4) to centre (position 0)
+	\override Beam  #'positions = #'(2 . 0)
+	 c'8[ c] 
+	
+	%% from center to one above centre (position 2)
+	\override Beam  #'positions = #'(0 . 1)
+	 c[ c]
+  }
+
+}
+
+
diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/input/lsr/piano-template-with-centered-dynamics.ly
index c468f048e2..d40410a389 100644
--- a/input/lsr/piano-template-with-centered-dynamics.ly
+++ b/input/lsr/piano-template-with-centered-dynamics.ly
@@ -11,86 +11,85 @@ right here, you don't have to do the tweaking yourself.
 " }
 % begin verbatim
 upper = \relative c'' {
-           \clef treble
-           \key c \major
-           \time 4/4
-         
-           a b c d
-         }
-         
-         lower = \relative c {
-           \clef bass
-           \key c \major
-           \time 4/4
-         
-           a2 c
-         }
-         
-         dynamics = {
-           s2\fff\> s4
-           s\!\pp
-         }
-         
-         pedal = {
-           s2\sustainDown s2\sustainUp
-         }
-         
-         \score {
-           \new PianoStaff <<
-             \new Staff = "upper" \upper
-             \new Dynamics = "dynamics" \dynamics
-             \new Staff = "lower" <<
-               \clef bass
-               \lower
-             >>
-             \new Dynamics = "pedal" \pedal
-           >>
-           \layout {
-             \context {
-               \type "Engraver_group"
-               \name Dynamics
-               \alias Voice % So that \cresc works, for example.
-               \consists "Output_property_engraver"
-         
-               \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-               \override DynamicLineSpanner #'Y-offset = #0
-	       pedalSustainStrings = #'("Ped." "*Ped." "*")
-               pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-         
-               \consists "Piano_pedal_engraver"
-               \consists "Script_engraver"
-               \consists "Dynamic_engraver"
-               \consists "Text_engraver"
-         
-               \override TextScript #'font-size = #2
-               \override TextScript #'font-shape = #'italic
-         
-               \consists "Skip_event_swallow_translator"
-         
-               \consists "Axis_group_engraver"
-             }
-             \context {
-               \PianoStaff
-               \accepts Dynamics
-             }
-           }
-         }
-         \score {
-           \new PianoStaff <<
-             \new Staff = "upper" << \upper \dynamics >>
-             \new Staff = "lower" << \lower \dynamics >>
-             \new Dynamics = "pedal" \pedal
-           >>
-           \midi {
-             \context {
-               \type "Performer_group"
-               \name Dynamics
-               \consists "Piano_pedal_performer"
-             }
-             \context {
-               \PianoStaff
-               \accepts Dynamics
-             }
-           }
-         }
+  \clef treble
+  \key c \major
+  \time 4/4
+  
+  a b c d
+}
 
+lower = \relative c {
+  \clef bass
+  \key c \major
+  \time 4/4
+  
+  a2 c
+}
+
+dynamics = {
+  s2\fff\> s4
+  s\!\pp
+}
+
+pedal = {
+  s2\sustainDown s2\sustainUp
+}
+
+\score {
+  \new PianoStaff <<
+    \new Staff = "upper" \upper
+    \new Dynamics = "dynamics" \dynamics
+    \new Staff = "lower" <<
+      \clef bass
+      \lower
+    >>
+    \new Dynamics = "pedal" \pedal
+  >>
+  \layout {
+    \context {
+      \type "Engraver_group"
+      \name Dynamics
+      \alias Voice % So that \cresc works, for example.
+      \consists "Output_property_engraver"
+      
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
+      \override DynamicLineSpanner #'Y-offset = #0
+      pedalSustainStrings = #'("Ped." "*Ped." "*")
+      pedalUnaCordaStrings = #'("una corda" "" "tre corde")
+      
+      \consists "Piano_pedal_engraver"
+      \consists "Script_engraver"
+      \consists "Dynamic_engraver"
+      \consists "Text_engraver"
+      
+      \override TextScript #'font-size = #2
+      \override TextScript #'font-shape = #'italic
+      
+      \consists "Skip_event_swallow_translator"
+      
+      \consists "Axis_group_engraver"
+    }
+    \context {
+      \PianoStaff
+      \accepts Dynamics
+    }
+  }
+}
+\score {
+  \new PianoStaff <<
+    \new Staff = "upper" << \upper \dynamics >>
+    \new Staff = "lower" << \lower \dynamics >>
+    \new Dynamics = "pedal" \pedal
+  >>
+  \midi {
+    \context {
+      \type "Performer_group"
+      \name Dynamics
+      \consists "Piano_pedal_performer"
+    }
+    \context {
+      \PianoStaff
+      \accepts Dynamics
+    }
+  }
+}
diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list
index 6f4dc22595..56e3477a30 100644
--- a/input/lsr/pitches.snippet-list
+++ b/input/lsr/pitches.snippet-list
@@ -1,9 +1,7 @@
 applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
-glissando-contempary.ly
 ambiti-multiple-voices.ly
-makam.ly
 transposing-pitches-with-minimum-accidentals-smart-transpose.ly
-jazz-combo-template.ly
+makam.ly
 preventing-extra-naturals-from-being-automatically-added.ly
 generating-random-notes.ly
 quoting-another-voice-with-transposition.ly
diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
index 597024dde5..ed12391488 100644
--- a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
+++ b/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
@@ -11,7 +11,7 @@ extraNatural property to \"false\" in the Staff context.
 " }
 % begin verbatim
 \relative {
-aeses'4 aes ais a
-\set Staff.extraNatural = ##f
-aeses4 aes ais a
+  aeses'4 aes ais a
+  \set Staff.extraNatural = ##f
+  aeses4 aes ais a
 }
diff --git a/input/lsr/rhythmic-slashes.ly b/input/lsr/rhythmic-slashes.ly
index 3e24677492..cd52298ade 100644
--- a/input/lsr/rhythmic-slashes.ly
+++ b/input/lsr/rhythmic-slashes.ly
@@ -21,25 +21,26 @@ the appropriate duration).
 % begin verbatim
 % Macro to print single slash
 rs = {
-\once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash
-\once \override Rest #'thickness = #'0.48
-\once \override Rest #'slope = #'1.7
-r4
+  \once \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash
+  \once \override Rest #'thickness = #'0.48
+  \once \override Rest #'slope = #'1.7
+  r4
 }
 
 
 % Function to print a specified number of slashes
 comp = #(define-music-function (parser location count) ( integer?)
-#{
-\override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash
-\override Rest #'thickness = #'0.48
-\override Rest #'slope = #'1.7
-\repeat unfold $count { r4 }
-\revert Rest #'stencil
-#})
+  #{
+    \override Rest #'stencil = #ly:percent-repeat-item-interface::beat-slash
+    \override Rest #'thickness = #'0.48
+    \override Rest #'slope = #'1.7
+    \repeat unfold $count { r4 }
+    \revert Rest #'stencil
+  #}
+)
 
 \score{
-\relative c'{
- c d e f | \rs \rs \rs \rs | \comp #4 |
-}
+  \relative c'{
+    c d e f | \rs \rs \rs \rs | \comp #4 |
+  }
 }
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 1ab9eebfb6..35ce406627 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -3,12 +3,14 @@ chant-or-psalms-notation.ly
 heavily-customized-polymetric-time-signatures.ly
 conducting-signs,-measure-grouping-signs.ly
 skips-in-lyric-mode-2.ly
+automatic-beam-subdivisions.ly
 rhythmic-slashes.ly
 adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
 making-an-object-invisible-with-the-transparent-property.ly
-automatic-beam-subdivisions.ly
+manually-controlling-beam-positions.ly
+forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 controlling-tuplet-bracket-visibility.ly
 beam-across-line-breaks.ly
 compound-time-signatures.ly
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index 74d3f91bd0..eb85822dca 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -5,6 +5,7 @@ proportional-strict-notespacing.ly
 making-an-object-invisible-with-the-transparent-property.ly
 transcription-of-ancient-music-with-incipit.ly
 alignment-vertical-spacing.ly
+manually-controlling-beam-positions.ly
 custodes.ly
 drawing-boxes-around-grobs.ly
 move-specific-text.ly
-- 
2.39.5