Further LSR tidying

11 files changed, 24 insertions, 59 deletions

diff --git a/Documentation/snippets/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly
index e1fb58f135..70537f2681 100644
--- a/Documentation/snippets/ancient-fonts.ly
+++ b/Documentation/snippets/ancient-fonts.ly
@@ -202,14 +202,16 @@ lowerStaff = \new MensuralStaff = "lowerStaff" <<
     \context {
       \MensuralStaff
       \revert  BarLine.transparent
-      \override KeySignature.glyph-name-alist = #alteration-mensural-glyph-name-alist
+      \override KeySignature.glyph-name-alist =
+        #alteration-mensural-glyph-name-alist
       clefGlyph = #"clefs.petrucci.c2"
     }
     \context {
       \VaticanaStaff
       \revert  BarLine.transparent
       \override StaffSymbol.thickness = #2.0
-      \override KeySignature.glyph-name-alist = #alteration-vaticana-glyph-name-alist
+      \override KeySignature.glyph-name-alist =
+        #alteration-vaticana-glyph-name-alist
       \override Custos.neutral-position = #4
     }
   }
diff --git a/Documentation/snippets/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
index 3c0beb9ac2..cc468d72ce 100644
--- a/Documentation/snippets/changing-stanza-fonts.ly
+++ b/Documentation/snippets/changing-stanza-fonts.ly
@@ -18,13 +18,13 @@ used for printing the stanza number.
   doctitle = "Changing stanza fonts"
 } % begin verbatim
 
+
 \new Voice {
   \time 3/4
   g2 e4
   a2 f4
   g2.
-} % begin verbatim
-
+}
 \addlyrics {
   \set stanza = #"1. "
   Hi, my name is Bert.
diff --git a/Documentation/snippets/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
index 125f0dd1db..99e80cd7e2 100644
--- a/Documentation/snippets/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/changing-the-default-text-font-family.ly
@@ -18,6 +18,7 @@ The default font families for text can be overridden with
   doctitle = "Changing the default text font family"
 } % begin verbatim
 
+
 \paper {
   % change for other default global staff size.
   myStaffSize = #20
@@ -25,8 +26,7 @@ The default font families for text can be overridden with
      run
          lilypond -dshow-available-fonts blabla
      to show all fonts available in the process log.
-  %} % begin verbatim
-
+  %}
 
   #(define fonts
     (make-pango-font-tree "Times New Roman"
diff --git a/Documentation/snippets/new/changing-stanza-fonts.ly b/Documentation/snippets/new/changing-stanza-fonts.ly
index 3988ec6a95..65f54fed92 100644
--- a/Documentation/snippets/new/changing-stanza-fonts.ly
+++ b/Documentation/snippets/new/changing-stanza-fonts.ly
@@ -9,7 +9,7 @@ used for printing the stanza number.
 
 "
   doctitle = "Changing stanza fonts"
-} % begin verbatim
+}
 
 \new Voice {
   \time 3/4
diff --git a/Documentation/snippets/new/changing-the-default-text-font-family.ly b/Documentation/snippets/new/changing-the-default-text-font-family.ly
index b4ab595995..7db90d3d19 100644
--- a/Documentation/snippets/new/changing-the-default-text-font-family.ly
+++ b/Documentation/snippets/new/changing-the-default-text-font-family.ly
@@ -9,7 +9,7 @@ The default font families for text can be overridden with
 
 "
   doctitle = "Changing the default text font family"
-} % begin verbatim
+}
 
 \paper {
   % change for other default global staff size.
diff --git a/Documentation/snippets/new/printing-bar-numbers-with-changing-regular-intervals.ly b/Documentation/snippets/new/printing-bar-numbers-with-changing-regular-intervals.ly
deleted file mode 100644
index 5d2fbf5605..0000000000
--- a/Documentation/snippets/new/printing-bar-numbers-with-changing-regular-intervals.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-\version "2.18.0"
-
-\header {
-  lsrtags = "rhythms, text"
-
-  texidoc = "
-The bar number interval can be changed by changing the context function
-@code{set-bar-number-visibility}.
-
-"
-  doctitle = "Printing bar numbers with changing, regular intervals"
-}
-
-
-\relative c' {
-  \override Score.BarNumber.break-visibility = #end-of-line-invisible
-  \context Score \applyContext #(set-bar-number-visibility 4)
-  \repeat unfold 10 c'1
-  \context Score \applyContext #(set-bar-number-visibility 2)
-  \repeat unfold 10 c
-}
diff --git a/Documentation/snippets/new/rest-styles.ly b/Documentation/snippets/new/rest-styles.ly
index ddcf547b15..e5ba472bd4 100644
--- a/Documentation/snippets/new/rest-styles.ly
+++ b/Documentation/snippets/new/rest-styles.ly
@@ -7,17 +7,10 @@
 Rests may be used in various styles.
 "
   doctitle = "Rest styles"
-} % begin verbatim
-
-\layout {
-  indent = 0
-  \context {
-    \Staff
-    \remove "Time_signature_engraver"
-  }
 }
 
 \new Staff \relative c {
+  \omit Score.TimeSignature
   \cadenzaOn
 
   \override Staff.Rest.style = #'mensural
diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly
index e614df5e86..94cdccf724 100644
--- a/Documentation/snippets/new/subdividing-beams.ly
+++ b/Documentation/snippets/new/subdividing-beams.ly
@@ -24,7 +24,7 @@ changed to match the new @code{baseMoment}:
 
 "
   doctitle = "Subdividing beams"
-} % begin verbatim
+}
 
 \relative c'' {
   c32[ c c c c c c c]
@@ -50,5 +50,5 @@ changed to match the new @code{baseMoment}:
   \set baseMoment = #(ly:make-moment 1/8)
   \set beatStructure = #'(2 2 2 2)
   c32[ c c c c] r16.
-  
+  r2
 }
diff --git a/Documentation/snippets/printing-bar-numbers-with-changing-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-with-changing-regular-intervals.ly
index 106db138a8..a78462a87b 100644
--- a/Documentation/snippets/printing-bar-numbers-with-changing-regular-intervals.ly
+++ b/Documentation/snippets/printing-bar-numbers-with-changing-regular-intervals.ly
@@ -1,10 +1,9 @@
-% DO NOT EDIT this file manually; it is automatically
-% generated from Documentation/snippets/new
-% Make any changes in Documentation/snippets/new/
-% and then run scripts/auxiliar/makelsr.py
-%
-% This file is in the public domain.
-%% Note: this file works from version 2.18.0
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
 \version "2.18.0"
 
 \header {
@@ -12,14 +11,12 @@
 
   texidoc = "
 The bar number interval can be changed by changing the context function
-@code{set-bar-number-visibility}.
+@code{@{set-bar-number-visibility@}}.
 
 "
   doctitle = "Printing bar numbers with changing regular intervals"
 } % begin verbatim
 
-
-
 \relative c' {
   \override Score.BarNumber.break-visibility = #end-of-line-invisible
   \context Score \applyContext #(set-bar-number-visibility 4)
diff --git a/Documentation/snippets/rest-styles.ly b/Documentation/snippets/rest-styles.ly
index ebf8d91ffa..dc6645b4b1 100644
--- a/Documentation/snippets/rest-styles.ly
+++ b/Documentation/snippets/rest-styles.ly
@@ -16,16 +16,9 @@ Rests may be used in various styles.
   doctitle = "Rest styles"
 } % begin verbatim
 
-\layout {
-  indent = 0
-  \context {
-    \Staff
-    \remove "Time_signature_engraver"
-  } % begin verbatim
-
-}
 
 \new Staff \relative c {
+  \omit Score.TimeSignature
   \cadenzaOn
 
   \override Staff.Rest.style = #'mensural
diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index b15e1b1dfa..e73800041a 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -33,6 +33,7 @@ changed to match the new @code{baseMoment}:
   doctitle = "Subdividing beams"
 } % begin verbatim
 
+
 \relative c'' {
   c32[ c c c c c c c]
   \set subdivideBeams = ##t
@@ -57,5 +58,5 @@ changed to match the new @code{baseMoment}:
   \set baseMoment = #(ly:make-moment 1/8)
   \set beatStructure = #'(2 2 2 2)
   c32[ c c c c] r16.
-
-} % begin verbatim
+  r2
+}