From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 8 Jun 2007 01:39:59 +0000 (-0300)
Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.26-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ae46f750bfb3a947d4adc26044560da54c21e17;hp=95890ee80ae464e70e425dbd39b9798ff27d2bb7;p=lilypond.git

Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
---

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 4e31cc3f76..e17f3e480f 100644
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3201,18 +3201,13 @@ c1
 \alternative { {d2 d} {f f,} }
 @end lilypond
 
-In the following example, the first ending is not a complete
-bar (it only had 3 beats).  The beginning of the second ending
-contains the 4th beat from the first ending.  This @q{extra} beat
-in the second ending is due to the first time ending,
-and has nothing to do with the @code{\partial} at the
-beginning of the example.
+Repeats with upbeats may be created.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Staff {
-  \partial 4
-  \repeat volta 4 { e | c2 d2 | e2 f2 | }
-  \alternative { { g4 g g } { a | a a a a | b2. } }
+  \partial 4 e |
+  \repeat volta 4 { c2 d2 | e2 f2 | }
+  \alternative { { g4 g g e } { a a a a | b2. } }
 }
 @end lilypond
 
diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 2206e61eeb..6b72bbebee 100755
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -4,7 +4,7 @@ import os
 import os.path
 import shutil
 
-dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitches','repeats','scheme','spacing','staff','text','vocal','other']
+dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitch','repeats','scheme','spacing','staff','text','vocal','other']
 notsafe=[]
 
 try:
diff --git a/input/lsr/chords/volta-brackets-over-chord-names.ly b/input/lsr/chords/volta-brackets-over-chord-names.ly
new file mode 100644
index 0000000000..ee84586117
--- /dev/null
+++ b/input/lsr/chords/volta-brackets-over-chord-names.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Volta brackets can be placed over chord names. Just set the
+voltaOnThisStaff property to \"true\" for the ChordNames context and to
+\"false\" for the topmost ordinary Staff context.
+" }
+
+\score { <<
+  \new ChordNames \with {
+    voltaOnThisStaff = ##t
+  } \chordmode {
+    c1 c
+  }
+  \new Staff \with {
+    voltaOnThisStaff = ##f
+  }
+  {
+    \repeat volta 2 { c'1 } \alternative { c' }
+  }
+>> }
diff --git a/input/lsr/connecting/automatic-beam-subdivisions.ly b/input/lsr/connecting/automatic-beam-subdivisions.ly
new file mode 100644
index 0000000000..95e8c64699
--- /dev/null
+++ b/input/lsr/connecting/automatic-beam-subdivisions.ly
@@ -0,0 +1,18 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Lilypond can subdivide beams automatically. Set the property
+subdivideBeams, and beams are subdivided at beat positions (as
+specified in beat length)
+" }
+
+\relative{ b'32^"default"[ a g f c' b a g f e d' c b a g f ]
+	       \set subdivideBeams = ##t
+	       b32^"subdivision enabled"[ a g f c' b a g f e d' c b a g f ] 
+	       \set Score.beatLength = #(ly:make-moment 1 8)
+	       b32^"beatLength 1 8"[ a g f c' b a g f e d' c b a g f ]
+	       \set Score.beatLength = #(ly:make-moment 1 16)
+	       b32^"beatLength 1 16"[ a g f c' b a g f e d' c b a g f ]
+    }
+
diff --git a/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly b/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly
new file mode 100644
index 0000000000..220a8a701a
--- /dev/null
+++ b/input/lsr/connecting/how-to-improve-automatic-beam-groups-when-frequently-using--time.ly
@@ -0,0 +1,36 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Groups of beamed notes can be made by setting the subdivideBeams
+property. However, if you have \"\time\"-statements inside your score,
+you'll need to set the beatLength again after each \time-statement
+(that has a denominator that is not 8).
+
+This happens because the \"\time\"-statements reset the
+beatLength-value to the denominator of the time signature.     So, if
+you have many meter-changes, you can use the following function named
+\"\timenb #X #Y\" instead of \"\time X/Y\".
+" }
+
+% timenb sets TIMEesignature and measure length, but Not Beatlength
+timenb = #(define-music-function (parser location x y ) (integer? integer?) #{
+	  \set Staff.timeSignatureFraction = #(cons $x $y)
+	  \set Score.measureLength = #(ly:make-moment $x $y)
+#})
+
+\new Staff {
+  \relative c''
+  {
+    \set Score.beatLength = #(ly:make-moment 1 8)
+    \set subdivideBeams = ##t
+
+    \timenb #3 #8 c16.[ c32 c16. c32 c16. c32] |
+    \timenb #5 #8 d8[ d] d16.[ d32  d16. d32 d8] |
+    \timenb #3 #4 e8[ e16. e32] e16.[ e32 e16. e32] e16.[ f32 f8] |
+    \timenb #2 #4
+    g16.[ g32 g16. g32] g16.[ g32 g16. g32] |
+    
+  }
+}
+
diff --git a/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly b/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly
new file mode 100644
index 0000000000..03e7e92a8b
--- /dev/null
+++ b/input/lsr/contemporary/time-signatures-on-top-of-the-score-using-a-separate-staff.ly
@@ -0,0 +1,40 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+in XXth century music, where time signatures tend to change a lot, it
+is sometimes recommended to put the time signatures on top of the score
+(or above each StaffGroup in case of an orchestral score). This can be
+achieved by creating a dummy staff which only contains the
+Time-signature-engraver). In this specific example, I've used a
+separate identifier to define every time signature change, which allows
+me to not bother entering them again when typing the actual music
+(careful though: it makes getting lost easier!).
+" }
+
+\layout{
+  \context { 
+    \type "Engraver_group"
+    \consists "Time_signature_engraver"
+    \consists "Axis_group_engraver"
+    \name "TimeSig"
+    \override TimeSignature #'extra-offset = #'(-2.2 . 0.0 )
+    \override TimeSignature #'font-size = #3
+  }
+  \context {
+    \Score \accepts TimeSig
+  }
+
+  \context { \Staff
+    \override TimeSignature #'transparent = ##t
+  }
+}
+
+timeSignatures = { \time 2/4 s2 \time 3/4 s2. \time 4/4 s1 }
+\score {
+
+<<   	\new TimeSig \timeSignatures
+   	\new Staff \relative { c'2  c2.  c1 }
+	\new Staff { a2 a2. a1}
+ >>
+}
diff --git a/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly b/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly
new file mode 100644
index 0000000000..0f253f0599
--- /dev/null
+++ b/input/lsr/education/making-some-staff-lines-thicker-than-the-others.ly
@@ -0,0 +1,17 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+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.
+" }
+
+\score {
+     \new Staff{
+     \override Staff.StaffSymbol #'line-positions =#'(-4 -2 -0.2 0 0.2 2 4 )
+         d'4 e' f' g'
+     }
+}
diff --git a/input/lsr/education/putting-parentheses-around-a-note.ly b/input/lsr/education/putting-parentheses-around-a-note.ly
new file mode 100644
index 0000000000..cdc3348e4c
--- /dev/null
+++ b/input/lsr/education/putting-parentheses-around-a-note.ly
@@ -0,0 +1,14 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+As children do not always have hands large enough, say, to plays
+octavas when studying piano, or anything else, it can be useful to add
+parentheses around a low note for example. In this snippet, the
+\"parenthesized\" note is made a bit smaller using the \tweak command
+on the #'font-size property.
+" }
+
+{ \clef bass
+< f \parenthesize \tweak #'font-size #-1 f, >2
+}
diff --git a/input/lsr/education/white-text-on-black-background.ly b/input/lsr/education/white-text-on-black-background.ly
new file mode 100644
index 0000000000..af22af8b2a
--- /dev/null
+++ b/input/lsr/education/white-text-on-black-background.ly
@@ -0,0 +1,11 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+If you want to print some white text on black background, here's the
+trick:
+" }
+
+{
+	g1^\markup { \combine \filled-box #'(-.3 . 6.8) #'(-.3 . 1.8) #0 \with-color #white White}
+}
diff --git a/input/lsr/guitar/faking-a-hammer-in-tablatures.ly b/input/lsr/guitar/faking-a-hammer-in-tablatures.ly
new file mode 100644
index 0000000000..70afad63a6
--- /dev/null
+++ b/input/lsr/guitar/faking-a-hammer-in-tablatures.ly
@@ -0,0 +1,19 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+A hammer in tablature can be faked with slurs.  
+" }
+
+\score{
+\context TabStaff
+  <<
+	\relative c''{
+		c(d)
+		d(d)
+		d(c)
+  }
+  >>
+}
+
+%%some weird letters are displayed in the Staff; can't reproduce it at home... --vv
diff --git a/input/lsr/other/all-headers.ly b/input/lsr/other/all-headers.ly
new file mode 100644
index 0000000000..abfeee42c3
--- /dev/null
+++ b/input/lsr/other/all-headers.ly
@@ -0,0 +1,48 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+A demonstration of all headers.
+" }
+
+\header {
+copyright = "copyright"
+title = "title"
+subtitle = "subtitle"
+composer = "composer"
+arranger = "arranger"
+instrument = "instrument"
+metre = "metre"
+opus = "opus"
+piece = "piece"
+poet = "poet"
+texidoc = "All header fields with special meanings."
+  copyright = "public domain"
+  enteredby = "jcn"
+  source = "urtext"
+
+}
+
+
+\score {
+  \relative c'' { c1 c1 c1 c1 }
+}
+
+\score {
+	 \relative c'' { c1 c1 c1 c1 }
+	
+	\header {
+
+	title = "localtitle"
+	subtitle = "localsubtitle"
+	composer = "localcomposer"
+	arranger = "localarranger"
+	instrument = "localinstrument"
+	metre = "localmetre"
+	opus = "localopus"
+	piece = "localpiece"
+	poet = "localpoet"
+	copyright = "localcopyright"
+	}
+}
+
diff --git a/input/lsr/other/engravers-one-by-one.ly b/input/lsr/other/engravers-one-by-one.ly
new file mode 100644
index 0000000000..c950efe0ac
--- /dev/null
+++ b/input/lsr/other/engravers-one-by-one.ly
@@ -0,0 +1,278 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The notation problem, creating a certain symbol, is handled by plugins.
+Each plugin is called an Engraver. In this example, engravers are
+switched on one by one, in the following order:
+
+- note heads
+
+
+- staff symbol,
+
+
+- clef,
+
+
+- stem,
+
+
+- beams, slurs, accents,
+
+
+- accidentals, bar lines, time signature, and key signature.
+
+
+
+Engravers are grouped. For example, note heads, slurs, beams etc. form
+a Voice context. Engravers for key, accidental, bar, etc. form a Staff
+context.
+
+
+You may only see the first example in this document; please download
+this snippet and run it from your own computer. 
+" }
+
+%% sample music
+topVoice =  \relative c' {
+  \key d\major
+  es8([ g] a[ fis])
+  b4
+  b16[-. b-. b-. cis-.]
+  d4->
+}
+
+botVoice =  \relative c' {
+  \key d\major
+  c8[( f] b[ a)]
+  es4
+  es16[-. es-. es-. fis-.]
+  b4->
+}
+
+hoom =  \relative c {
+  \key d \major
+  \clef bass
+  g8-. r
+  r4 
+  fis8-.
+  r8
+  r4
+  b'4->
+}
+
+pah =  \relative c' {
+  r8 b-.
+  r4
+  r8 g8-.
+  r16 g-. r8
+  \clef treble
+  fis'4->
+}
+
+%
+% setup for Request->Element conversion. Guru-only
+%
+
+MyStaff =\context {
+  \type "Engraver_group"
+  \name Staff
+
+  \description "Handles clefs, bar lines, keys, accidentals.  It can contain
+@code{Voice} contexts."
+
+  
+  \consists "Output_property_engraver"	
+  
+  \consists "Font_size_engraver"
+
+  \consists "Volta_engraver"
+  \consists "Separating_line_group_engraver"	
+  \consists "Dot_column_engraver"
+
+  \consists "Ottava_spanner_engraver"
+  \consists "Rest_collision_engraver"
+  \consists "Piano_pedal_engraver"
+  \consists "Piano_pedal_align_engraver"
+  \consists "Instrument_name_engraver"
+  \consists "Grob_pq_engraver"
+  \consists "Forbid_line_break_engraver"
+  \consists "Axis_group_engraver"
+
+  \consists "Pitch_squash_engraver"
+
+  \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
+  extraVerticalExtent = ##f
+  verticalExtent = ##f 
+  localKeySignature = #'()
+
+				% explicitly set instrument, so we don't get 
+				% weird effects when doing instrument names for
+				% piano staves
+
+  instrumentName = #'()
+  shortInstrumentName = #'()
+  
+  \accepts "Voice"
+}
+
+
+MyVoice = \context {
+  \type "Engraver_group"
+  \name Voice
+
+  \description "
+    Corresponds to a voice on a staff.  This context handles the
+    conversion of dynamic signs, stems, beams, super- and subscripts,
+    slurs, ties, and rests.
+
+    You have to instantiate this explicitly if you want to have
+    multiple voices on the same staff."
+
+  localKeySignature = #'()
+  \consists "Font_size_engraver"
+  
+				% must come before all
+  \consists "Output_property_engraver"	
+  \consists "Arpeggio_engraver"
+  \consists "Multi_measure_rest_engraver"
+  \consists "Text_spanner_engraver"
+  \consists "Grob_pq_engraver"
+  \consists "Note_head_line_engraver"
+  \consists "Glissando_engraver"
+  \consists "Ligature_bracket_engraver"
+  \consists "Breathing_sign_engraver"
+				% \consists "Rest_engraver"
+  \consists "Grace_beam_engraver"
+  \consists "New_fingering_engraver"
+  \consists "Chord_tremolo_engraver"
+  \consists "Percent_repeat_engraver"
+  \consists "Slash_repeat_engraver"
+
+%{
+  Must come before text_engraver, but after note_column engraver.
+
+%}
+  \consists "Text_engraver"
+  \consists "Dynamic_engraver"
+  \consists "Fingering_engraver"
+
+  \consists "Script_column_engraver"
+  \consists "Rhythmic_column_engraver"
+  \consists "Cluster_spanner_engraver"
+  \consists "Tie_engraver"
+  \consists "Tie_engraver"
+  \consists "Tuplet_engraver"
+  \consists "Note_heads_engraver"
+  \consists "Rest_engraver"
+
+  \consists "Skip_event_swallow_translator"
+}
+
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+
+MyStaff = \context {
+    \MyStaff
+    \consists "Staff_symbol_engraver"
+}
+
+\score {
+  \topVoice
+  \layout {
+      \context { \MyStaff }
+      \context { \MyVoice }
+            }
+}
+
+MyStaff = \context {
+    \MyStaff
+    \consists "Clef_engraver"
+    \remove "Pitch_squash_engraver"
+}
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+MyVoice = \context {
+  \MyVoice
+  \consists "Stem_engraver"
+}
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+MyVoice = \context {
+  \MyVoice
+  \consists "Beam_engraver"
+}
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+MyVoice= \context {
+  \MyVoice
+  \consists "Phrasing_slur_engraver"
+  \consists "Slur_engraver"
+  \consists "Script_engraver"
+}
+
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+MyStaff = \context {
+  \MyStaff
+  \consists "Bar_engraver"
+  \consists "Time_signature_engraver"
+}
+
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
+MyStaff = \context {
+  \MyStaff
+  \consists "Accidental_engraver"    
+  \consists "Key_engraver"
+}
+\score {
+  \topVoice
+  \layout {
+    \context { \MyStaff }
+    \context { \MyVoice }
+  }
+}
+
diff --git a/input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly b/input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly
new file mode 100644
index 0000000000..e38331e2c3
--- /dev/null
+++ b/input/lsr/other/making-an-object-invisibile-with-the-transparent-property.ly
@@ -0,0 +1,24 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { 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. 
+" }
+
+\relative c'' {
+<< {
+  \once \override Stem #'transparent = ##t
+  b8~ b8\noBeam
+} \\ {
+  b[ g8]
+} >>
+}
diff --git a/input/lsr/other/outputting-the-version-number.ly b/input/lsr/other/outputting-the-version-number.ly
new file mode 100644
index 0000000000..4d4ec62ddc
--- /dev/null
+++ b/input/lsr/other/outputting-the-version-number.ly
@@ -0,0 +1,20 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+By putting the output of
+    @code{lilypond-version} into a lyric, it is possible to print the 
+    version number of LilyPond in a score, or in a document generated
+    with @code{lilypond-book}.  Another possibility is to append the 
+    version number to the doc-string, in this manner:  
+" }
+
+\score { \context Lyrics  {
+    \override Score.RehearsalMark  #'self-alignment-X = #LEFT
+    \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version)))
+    s2
+  }
+}
+
+
+
diff --git a/input/lsr/other/removing-time-signature-and-bar-lines.ly b/input/lsr/other/removing-time-signature-and-bar-lines.ly
new file mode 100644
index 0000000000..9d73b4012d
--- /dev/null
+++ b/input/lsr/other/removing-time-signature-and-bar-lines.ly
@@ -0,0 +1,27 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Engravers can be removed one by one. Here, the time signature and bar
+lines  have been removed.
+
+
+" }
+
+\score {
+   \relative c'' {
+    a b c d
+    d c b a
+  }
+  \layout {
+    raggedright = ##t
+    \context {
+      \Staff
+      whichBar = #""
+      \remove "Time_signature_engraver"
+    }
+  }
+}
+
+
+
diff --git a/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly b/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly
index 5d1a06f4cd..35a7a84ce2 100644
--- a/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly
+++ b/input/lsr/other/using-the--tweak-command-to-tweak-individual-grobs.ly
@@ -2,8 +2,8 @@
 \version "2.11.23"
 
 \header { texidoc = "
-With the \tweak command, you can tune every grob directly. Here are
-some examples of available tweaks.
+With the @code{\tweak} command, you can tune every grob directly. Here
+are some examples of available tweaks.
 " }
 
 \paper {
diff --git a/input/lsr/pitch/combining-two-parts-on-the-same-staff.ly b/input/lsr/pitch/combining-two-parts-on-the-same-staff.ly
new file mode 100644
index 0000000000..3569f3f5a5
--- /dev/null
+++ b/input/lsr/pitch/combining-two-parts-on-the-same-staff.ly
@@ -0,0 +1,74 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The part combiner tool ( \partcombine command ) allows you to combine
+different parts on a same Staff. You can choose whether you want or
+don't want to add texts such as \"solo\" or \"a2\", by defining the
+printPartCombineTexts property.
+
+For vocal scores (hymns), there is no need to add solo/a2 texts, so
+they should 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 wan't to use standard LilyPond polyphony.
+
+This snippet presents the three ways two parts can be printed on a same
+staff : standard polyphony, \partcombine whitout texts, and
+\partcombine with texts.
+
+
+" }
+
+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
+			}
+}
+\score{
+	\new Staff {
+		\set Staff.instrumentName = "Standard polyphony  "
+		<< \musicUp  \\ \musicDown >>
+	}
+	\layout{ 
+	indent = 6.0\cm 
+	}
+}
+
+\score{
+	\context Staff {
+			\set Staff.instrumentName = "PartCombine without texts  "
+			\partcombine \musicUp \musicDown
+	}
+	\layout{
+		indent = 6.0\cm
+		\context {
+			\Voice
+			printPartCombineTexts = ##f
+		}
+	}
+}
+
+\score{
+	\context Staff {
+			\set Staff.instrumentName = "PartCombine with texts  "
+			\partcombine \musicUp \musicDown
+	}
+	\layout{
+		indent = 6.0\cm
+		\context {
+			\Voice
+			printPartCombineTexts = ##t
+		}
+	}
+}
+
diff --git a/input/lsr/pitch/makam.ly b/input/lsr/pitch/makam.ly
index 549df765c8..f5d2d6548f 100644
--- a/input/lsr/pitch/makam.ly
+++ b/input/lsr/pitch/makam.ly
@@ -1,3 +1,4 @@
+%%  Do not edit this file; it is auto-generated from LSR!
 \header {
 
   texidoc = "Makam is Turkish type of melody that uses 1/9 tone
@@ -6,7 +7,7 @@
 }
 
 
-\version "2.11.6"
+\version "2.11.23"
 
 %{
 
diff --git a/input/lsr/pitch/preventing-stem-extension.ly b/input/lsr/pitch/preventing-stem-extension.ly
new file mode 100644
index 0000000000..731a76e0de
--- /dev/null
+++ b/input/lsr/pitch/preventing-stem-extension.ly
@@ -0,0 +1,30 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Extending stems to the center line may be prevented using
+@code{no-stem-extend}.
+
+
+" }
+
+\score { 
+  \context Voice \relative c {
+	\context Staff <<
+		\new Voice { 
+			f2 f8 g a b 
+			\override Stem  #'no-stem-extend = ##t
+		 	f2 f8 g a b
+		}
+		\new Voice { 
+			c''2 c8 b a g
+			\override Stem  #'no-stem-extend = ##t
+			c2 c8 b a g
+		}
+	>>
+	
+  }
+
+}
+
+
diff --git a/input/lsr/pitch/rest-styles.ly b/input/lsr/pitch/rest-styles.ly
new file mode 100644
index 0000000000..c14c92710f
--- /dev/null
+++ b/input/lsr/pitch/rest-styles.ly
@@ -0,0 +1,39 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Rests may be used in various styles.
+
+
+
+" }
+
+\layout {
+    indent = 0.0
+    raggedright = ##t
+}
+
+\context Staff \relative c {
+    \set Score.timing = ##f
+    \override Staff.Rest  #'style = #'mensural
+    r\maxima^\markup \typewriter { mensural }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar "" 
+
+    \override Staff.Rest  #'style = #'neomensural
+    r\maxima^\markup \typewriter { neomensural }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar "" 
+
+    \override Staff.Rest  #'style = #'classical
+    r\maxima^\markup \typewriter { classical }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    \bar ""
+    
+    \override Staff.Rest  #'style = #'default
+    r\maxima^\markup \typewriter { default }
+    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
+    
+}
+
+
diff --git a/input/lsr/scheme/generating-random-notes.ly b/input/lsr/scheme/generating-random-notes.ly
new file mode 100644
index 0000000000..b51fc6c362
--- /dev/null
+++ b/input/lsr/scheme/generating-random-notes.ly
@@ -0,0 +1,25 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+This Scheme-based snippet allows you to generate 256 random notes 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.
+" }
+
+\score {
+{ #(let ((random-state (seed->random-state (current-time))))
+    (ly:export
+     (make-music 'SequentialMusic 'elements
+      (map (lambda x
+           (let ((idx (random 12 random-state)))
+            (make-music 'EventChord
+             'elements (list (make-music 'NoteEvent
+                              'duration (ly:make-duration 2 0 1 1)
+                              'pitch (ly:make-pitch (quotient idx 7)
+                                      (remainder idx 7)
+                                      0))))))
+       (make-list 256)))))
+   }
+}
diff --git a/input/lsr/scheme/transpose-pitches-with-minimum-accidentals.ly b/input/lsr/scheme/transpose-pitches-with-minimum-accidentals.ly
new file mode 100644
index 0000000000..155f125310
--- /dev/null
+++ b/input/lsr/scheme/transpose-pitches-with-minimum-accidentals.ly
@@ -0,0 +1,74 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { 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.
+" }
+
+#(define  (naturalise-pitch p)
+  (let* ((o (ly:pitch-octave p))
+         (a (ly:pitch-alteration p))
+         (n (ly:pitch-notename p)))
+
+    (cond
+     ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+      (set! a (- a 2))
+      (set! n (+ n 1)))
+     ((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)))
+
+#(define (naturalise 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)))
+
+    (if (ly:music? e)
+        (ly:music-set-property!
+         music 'element
+         (naturalise e)))
+
+    (if (ly:pitch? p)
+        (begin
+          (set! p (naturalise-pitch p))
+          (ly:music-set-property! music 'pitch p)))
+
+    music))
+
+music =  \relative c' { c4 d  e f g a b  c }
+
+naturaliseMusic =
+#(define-music-function (parser location m)
+					(ly:music?)
+			(naturalise m))
+
+\score {
+   \context Staff {
+    \transpose c ais \music
+    \naturaliseMusic \transpose c ais \music
+    \transpose c deses \music
+    \naturaliseMusic \transpose c deses \music
+  }
+  \layout { ragged-right = ##t}
+}
+
+
diff --git a/input/lsr/spacing/alignment-order.ly b/input/lsr/spacing/alignment-order.ly
index 1f50d31cb9..54ba9e15b3 100644
--- a/input/lsr/spacing/alignment-order.ly
+++ b/input/lsr/spacing/alignment-order.ly
@@ -8,10 +8,6 @@ elements (e.g. lyrics) positioning, but also for musical contents such
 as ossias.
 " }
 
-% ****************************************************************
-% ly snippet:
-% ****************************************************************
-
 \paper {
   ragged-right = ##t
 }
@@ -35,10 +31,3 @@ as ossias.
       }
     >> }
 >>
-
-
-
-% ****************************************************************
-% end ly snippet
-% ****************************************************************
-
diff --git a/input/lsr/spacing/drawing-skyline-outline.ly b/input/lsr/spacing/drawing-skyline-outline.ly
index a9bfdf5d31..c6754ed27b 100644
--- a/input/lsr/spacing/drawing-skyline-outline.ly
+++ b/input/lsr/spacing/drawing-skyline-outline.ly
@@ -2,12 +2,11 @@
 \version "2.11.23"
 
 \header { texidoc = "
-By setting the Scheme property 'debug-skylines, you can make a nice
-funky artwork out of you score :-)
-
-More seriously, drawing your skyline can be helpful to debug spacing
-and collision issues. (Still, it does make your score pretty; so just
-try it, no matter how you really need to...)
+By setting the Scheme property 'debug-skylines, you can turn your score
+into a nice funky artwork :-) More seriously, drawing this skyline can
+be helpful to debug spacing and collision issues. (Still, it does make
+your score pretty; so just try it, no matter how much you really need
+to...)
 " }
 
 #(ly:set-option 'debug-skylines #t)
diff --git a/input/lsr/spacing/setting-the-extent-of-objects.ly b/input/lsr/spacing/setting-the-extent-of-objects.ly
new file mode 100644
index 0000000000..7c5d3bc9df
--- /dev/null
+++ b/input/lsr/spacing/setting-the-extent-of-objects.ly
@@ -0,0 +1,24 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+The object may be extended to larger sized by overriding their
+properties. The lyrics in this example have an extent of
+@code{(-10,10)}, which is why  they are spaced so widely.
+
+
+
+" }
+
+\score {
+    \context Lyrics \lyricmode {
+	foo --
+	
+	\override LyricText  #'X-extent = #'(-10.0 . 10.0)
+ bar baz
+	}
+    \layout { raggedright = ##t}
+}
+    
+
+
diff --git a/input/lsr/staff/aligning-instrument-names.ly b/input/lsr/staff/aligning-instrument-names.ly
new file mode 100644
index 0000000000..fad0e4508a
--- /dev/null
+++ b/input/lsr/staff/aligning-instrument-names.ly
@@ -0,0 +1,21 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Instrument names can be displayed using a \markup command; in this case
+the name is placed inside a padded box, which can help vertical
+alignment.
+" }
+
+\new StaffGroup \relative
+<<
+  \new Staff {
+    \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" }
+    c1 c1
+  } 
+  \new Staff {
+    \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" }
+    c1 c1
+  } 
+  
+>>
diff --git a/input/lsr/staff/changing-the-staff-size.ly b/input/lsr/staff/changing-the-staff-size.ly
new file mode 100644
index 0000000000..4b4c32cb21
--- /dev/null
+++ b/input/lsr/staff/changing-the-staff-size.ly
@@ -0,0 +1,21 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+In order to change staff sizes, both @code{staff-space} and
+@code{fontSize} must be scaled. 
+" }
+
+\relative c' <<
+%    \new Staff \relative c'' { \dynamicDown c4 \ff 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/staff/staff-containers.ly b/input/lsr/staff/staff-containers.ly
new file mode 100644
index 0000000000..d97f091a00
--- /dev/null
+++ b/input/lsr/staff/staff-containers.ly
@@ -0,0 +1,63 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+In this preliminary test of a modern score, the staff lines are washed
+out temporarily. This is done by making a tuned @code{StaffContainer},
+which @code{\skip}s some notes without printing lines either and
+creates a @code{\new Staff} then in order to create the lines again.
+(Be careful if you use this; it has been done by splitting the grouping
+@code{Axis_group_engraver} and creating functionality into  separate
+contexts, but the clefs and time signatures may not do what you would
+expect.)
+
+    
+
+" }
+
+\score  {
+     \relative c'' <<
+ 	\new StaffContainer {
+
+	    %% need << >>, otherwise we descend to the voice inside SA  
+	    << \new Staff { c4 c4 } >>
+	    \skip 4  % s4 would create staff.
+	    
+	    << \new Staff { b4 b4 } >> 
+	}
+ 	\new StaffContainer {
+	    \skip 4
+	    << \context Staff { e d f \bar ":|" } >>
+	    \skip 4
+	}
+    >>
+
+    \layout {
+	\context {
+	    \Score
+	    \accepts StaffContainer
+	    \denies Staff
+	}
+	\context {
+	    \type Engraver_group
+	    \consists Clef_engraver
+	    \consists Time_signature_engraver
+	    \consists Separating_line_group_engraver
+	    \consists "Axis_group_engraver"
+	    \accepts "Staff"
+	    
+	    \name StaffContainer
+	}
+	\context {
+	    \Staff
+	    \remove Axis_group_engraver
+	    \remove Separating_line_group_engraver
+	    \remove Clef_engraver
+	    \remove Time_signature_engraver
+	}
+	raggedright=##t
+    }
+}
+
+
+
diff --git a/input/lsr/text/creating-text-spanners.ly b/input/lsr/text/creating-text-spanners.ly
new file mode 100644
index 0000000000..26fb9398f3
--- /dev/null
+++ b/input/lsr/text/creating-text-spanners.ly
@@ -0,0 +1,42 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\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.
+" }
+
+\relative c''{
+    \override TextSpanner  #'edge-text = #'("bla" . "blu")
+    a \startTextSpan
+    b c 
+    a \stopTextSpan
+
+    \override TextSpanner  #'dash-period = #2
+    \override TextSpanner  #'dash-fraction = #0.0
+    a \startTextSpan
+    b c 
+    a \stopTextSpan
+
+    \revert TextSpanner #'style
+    \override TextSpanner  #'style = #'dashed-lineNone \override TextSpanner #'bound-details #'left #'text = \markup { \draw-line #'(0 . 1) }
+None \override TextSpanner #'bound-details #'right #'text = \markup { \draw-line #'(0 . -2) }
+
+    a \startTextSpan
+    b c 
+    a \stopTextSpan
+
+
+    \set Staff.middleCPosition = #-13
+
+    \override TextSpanner  #'dash-period = #10
+    \override TextSpanner  #'dash-fraction = #.5
+    \override TextSpanner  #'thickness = #10
+    a \startTextSpan
+    b c 
+    a \stopTextSpan
+    \set Staff.middleCPosition = #-6	
+}
+
diff --git a/input/lsr/text/how-to-bottom-align-texts-with-different-vertical-extents.ly b/input/lsr/text/how-to-bottom-align-texts-with-different-vertical-extents.ly
new file mode 100644
index 0000000000..541a5914f6
--- /dev/null
+++ b/input/lsr/text/how-to-bottom-align-texts-with-different-vertical-extents.ly
@@ -0,0 +1,22 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+Some letters imply smaller vertical extents than the others; if you
+have, below your staff, two markups with different vertical extents
+(e.g. one text with letters \"t,h,l and/or UPPER CASE\" and one text
+with \"a, c, e, n or m\"), LilyPond will align them to the top by
+default, thus making it look a bit messy. Therefore, you need to add
+invisible ascender letters using the \transparent command to make it
+right.
+" }
+
+\new Staff {
+  \override TextScript #'staff-padding = #4
+  \override TextScript #'self-alignment-X = #center
+  \time 2/4
+  c'4_\markup { \transparent "A" "WRONG" \transparent "A" }
+  c'4_\markup { "case" }
+  c'4_\markup { \transparent "A" "RIGHT" \transparent "A" }
+  c'4_\markup { \transparent "A" "case" \transparent "A" }
+}
diff --git a/input/lsr/text/rotating-a-text-object.ly b/input/lsr/text/rotating-a-text-object.ly
new file mode 100644
index 0000000000..567d41a984
--- /dev/null
+++ b/input/lsr/text/rotating-a-text-object.ly
@@ -0,0 +1,17 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+LilyPond gives you the ability to rotate any object you want,
+particularly markups as showed here. Alternatively, you can use the
+\column function to display your text vertically without rotating the
+letters.
+" }
+
+\score {
+   \relative c' {
+       c4^\markup {\rotate #45.0 {"hello"}}
+       c4^\markup {\rotate #90.0 {"hello"}}
+       c4^\markup {\column {"h" "e" "l" "l" "o"}}
+   }
+ }
diff --git a/input/lsr/vocal/aligning-lyrics.ly b/input/lsr/vocal/aligning-lyrics.ly
new file mode 100644
index 0000000000..ab75df3f83
--- /dev/null
+++ b/input/lsr/vocal/aligning-lyrics.ly
@@ -0,0 +1,15 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+You can specify different horizontal alignment for your lyrics, by
+overriding the #'self-alignment-X property of the LyricText object. #-1
+is left, #0 is center and #1 is right; however, you can use #LEFT,
+#CENTER and #RIGHT as well.
+" }
+
+\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"  }
diff --git a/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly b/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly
new file mode 100644
index 0000000000..db0baa6cec
--- /dev/null
+++ b/input/lsr/vocal/vertical-brace-spanning-several-lyrics-lines.ly
@@ -0,0 +1,37 @@
+%%  Do not edit this file; it is auto-generated from LSR!
+\version "2.11.23"
+
+\header { texidoc = "
+This example shows a trick to insert a vertical brace when going from
+several stanzas into a common ending in the lyrics. (An alternative is
+of course to just skip the brace, especially if you add a line break
+instead).
+" }
+
+% Replace brace150 by whatever between brace0 and brace575 that is of a
+% suitable size.
+leftbrace = \markup {\override #'(font-encoding . fetaBraces) \lookup #"brace200" }
+
+% In some versions earlier than 20.10.20, the argument to \rotate was
+% erroneously treated as radians instead of degrees, i.e. #3.14 was
+% needed instead of #180
+rightbrace = \markup {\rotate #180 \leftbrace }
+
+
+lyricsbeforebrace = \lyricmode {Here is some ly -- rics }
+
+lyricsfrombrace = \lyricmode { \markup{\rightbrace Here} comes some more }
+
+
+melody = \relative c'{ c d e f g f e d c e d f g }
+
+
+\score{
+<<
+ \new Voice = m \melody
+ \new Lyrics \lyricsto m \lyricsbeforebrace
+ \new Lyrics \lyricsto m { \lyricsbeforebrace \lyricsfrombrace }
+ \new Lyrics \lyricsto m \lyricsbeforebrace
+>>
+}
+
diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
deleted file mode 100644
index c65e0abd2a..0000000000
--- a/input/test/engraver-contexts.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.10.0"
-\header {
-    
-texidoc ="In polyphonic notation, many voices can share a staff: In
-this situation, the accidentals and staff are shared, but the stems,
-slurs, beams, etc. are private to each voice. Hence, engravers should
-be grouped. The engravers for note head, stems, slurs, etc. go into a
-group called ``Voice context'', while the engravers for key,
-accidental, bar, etc. go into a group called ``Staff context''. In the
-case of polyphony, a single Staff context contains more than one Voice
-context. Similarly, more Staff contexts can be put into a single Score
-context. "
-
-}
-
-\include "engraver-example.ily"
-
-\score {
-\context Staff << \topVoice \\ \botVoice >>
-}
-
-
-\score {
-<< \new Staff << \topVoice \\ \botVoice >>
-\new Staff << \pah \\ \hoom >>
-  >>
-}
-
-
-
diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
deleted file mode 100644
index 1fdb502d1c..0000000000
--- a/input/test/engraver-one-by-one.ly
+++ /dev/null
@@ -1,233 +0,0 @@
-
-\version "2.10.0"
-\header {
-  
-  texidoc = "The notation problem, creating a certain symbol,
-    is handled by plugins. Each plugin is called Engraver. In this example,
-engravers are switched on one by one, in the following order:
-
-@itemize
-@item note heads,
-@item staff symbol,
-@item clef,
-@item stem,
-@item beams, slurs, accents,
-@item accidentals, bar lines, time signature, and key signature.
-@end itemize
-
-Engravers are grouped. For example, note heads, slurs, beams etc. form
-a Voice context. Engravers for key, accidental, bar, etc. form a
-Staff context.
-
-"
-
-}
-\layout { ragged-right = ##t }
-
-\include "engraver-example.ily"
-
-
-%
-% setup for Request->Element conversion. Guru-only
-%
-
-MyStaff =\context {
-  \type "Engraver_group"
-  \name Staff
-
-  \description "Handles clefs, bar lines, keys, accidentals.  It can contain
-@code{Voice} contexts."
-
-  
-  \consists "Output_property_engraver"	
-  
-  \consists "Font_size_engraver"
-
-  \consists "Volta_engraver"
-  \consists "Separating_line_group_engraver"	
-  \consists "Dot_column_engraver"
-
-  \consists "Ottava_spanner_engraver"
-  \consists "Rest_collision_engraver"
-  \consists "Piano_pedal_engraver"
-  \consists "Piano_pedal_align_engraver"
-  \consists "Instrument_name_engraver"
-  \consists "Grob_pq_engraver"
-  \consists "Forbid_line_break_engraver"
-  \consists "Axis_group_engraver"
-
-  \consists "Pitch_squash_engraver"
-
-  \override VerticalAxisGroup #'minimum-Y-extent = #'(-6 . 6)
-  extraVerticalExtent = ##f
-  verticalExtent = ##f 
-  localKeySignature = #'()
-
-				% explicitly set instrument, so we don't get 
-				% weird effects when doing instrument names for
-				% piano staves
-
-  instrumentName = #'()
-  shortInstrumentName = #'()
-  
-  \accepts "Voice"
-}
-
-
-MyVoice = \context {
-  \type "Engraver_group"
-  \name Voice
-
-  \description "
-    Corresponds to a voice on a staff.  This context handles the
-    conversion of dynamic signs, stems, beams, super- and subscripts,
-    slurs, ties, and rests.
-
-    You have to instantiate this explicitly if you want to have
-    multiple voices on the same staff."
-
-  localKeySignature = #'()
-  \consists "Font_size_engraver"
-  
-				% must come before all
-  \consists "Output_property_engraver"	
-  \consists "Arpeggio_engraver"
-  \consists "Multi_measure_rest_engraver"
-  \consists "Text_spanner_engraver"
-  \consists "Grob_pq_engraver"
-  \consists "Note_head_line_engraver"
-  \consists "Glissando_engraver"
-  \consists "Ligature_bracket_engraver"
-  \consists "Breathing_sign_engraver"
-				% \consists "Rest_engraver"
-  \consists "Grace_beam_engraver"
-  \consists "New_fingering_engraver"
-  \consists "Chord_tremolo_engraver"
-  \consists "Percent_repeat_engraver"
-  \consists "Slash_repeat_engraver"
-
-%{
-  Must come before text_engraver, but after note_column engraver.
-
-%}
-  \consists "Text_engraver"
-  \consists "Dynamic_engraver"
-  \consists "Fingering_engraver"
-
-  \consists "Script_column_engraver"
-  \consists "Rhythmic_column_engraver"
-  \consists "Cluster_spanner_engraver"
-  \consists "Tie_engraver"
-  \consists "Tie_engraver"
-  \consists "Tuplet_engraver"
-  \consists "Note_heads_engraver"
-  \consists "Rest_engraver"
-
-  \consists "Skip_event_swallow_translator"
-}
-
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-
-MyStaff = \context {
-    \MyStaff
-    \consists "Staff_symbol_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-      \context { \MyStaff }
-      \context { \MyVoice }
-            }
-}
-
-MyStaff = \context {
-    \MyStaff
-    \consists "Clef_engraver"
-    \remove "Pitch_squash_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice = \context {
-  \MyVoice
-  \consists "Stem_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice = \context {
-  \MyVoice
-  \consists "Beam_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyVoice= \context {
-  \MyVoice
-  \consists "Phrasing_slur_engraver"
-  \consists "Slur_engraver"
-  \consists "Script_engraver"
-}
-
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Bar_engraver"
-  \consists "Time_signature_engraver"
-}
-
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
-
-MyStaff = \context {
-  \MyStaff
-  \consists "Accidental_engraver"    
-  \consists "Key_engraver"
-}
-\score {
-  \topVoice
-  \layout {
-    \context { \MyStaff }
-    \context { \MyVoice }
-  }
-}
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
deleted file mode 100644
index a16739b846..0000000000
--- a/input/test/hymn.ly
+++ /dev/null
@@ -1,36 +0,0 @@
-
-\version "2.10.0"
-
-\header { texidoc = "
-
-You can combine two parts on the same staff using the part
-combiner. For vocal scores (hymns), there is no need to add solo/a2
-texts, so they should be switched off.
-
-" }
-
-\score{
-	\context Staff <<
-		\time 4/4
-		\partcombine 
-			\relative c'' {
-				a4 c4.(g8) a4 |
-				g4 e' g(f) | 
-				b, a c2
-			}
-			\relative c'' {
-				g4 e4.(d8) c4 |
-				g'4 c, e(f) |
-				d2 a
-			}
-	>>
-	\layout{
-		line-width=140.\mm
-		\context {
-			\Voice
-			printPartCombineTexts = ##f
-		}
-	}
-}
-
-
diff --git a/input/test/instrument-name-align.ly b/input/test/instrument-name-align.ly
deleted file mode 100644
index ccbbeba47d..0000000000
--- a/input/test/instrument-name-align.ly
+++ /dev/null
@@ -1,29 +0,0 @@
-
-\header {
-
-
-  texidoc = "instrument names may be aligned manually by putting the
-names in padded boxes with @code{\markup}."
-
-
-}
-
-\version "2.10.0"
-
-\paper {
-  line-width = 15\cm
-}
-
-
-\new StaffGroup \relative
-<<
-  \new Staff {
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" }
-    c1 c1
-  } 
-  \new Staff {
-    \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" }
-    c1 c1
-  } 
-  
->>
diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
deleted file mode 100644
index 0476737ebd..0000000000
--- a/input/test/lilypond-testpage.ly
+++ /dev/null
@@ -1,49 +0,0 @@
-
-\version "2.10.0"
-% MERGE with title.ly -gp
-
-%{
-  Test lilypond features.
-%}
-
-\header {
-copyright = "copyright"
-title = "title"
-subtitle = "subtitle"
-composer = "composer"
-arranger = "arranger"
-instrument = "instrument"
-metre = "metre"
-opus = "opus"
-piece = "piece"
-poet = "poet"
-texidoc = "All header fields with special meanings."
-  copyright = "public domain"
-  enteredby = "jcn"
-  source = "urtext"
-
-}
-
-
-\score {
-  \relative c'' { c1 c1 c1 c1 }
-}
-
-\score {
-	 \relative c'' { c1 c1 c1 c1 }
-	
-	\header {
-
-	title = "localtitle"
-	subtitle = "localsubtitle"
-	composer = "localcomposer"
-	arranger = "localarranger"
-	instrument = "localinstrument"
-	metre = "localmetre"
-	opus = "localopus"
-	piece = "localpiece"
-	poet = "localpoet"
-	copyright = "localcopyright"
-	}
-}
-
diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly
deleted file mode 100644
index c0740aa521..0000000000
--- a/input/test/music-creation.ly
+++ /dev/null
@@ -1,30 +0,0 @@
-\version "2.10.0"
-
-% possible rename to scheme- something.  -gp
-\header { texidoc = "@cindex Scheme Music Creation
-You can engrave music using just Scheme expressions. Although those 
-expressions reflect the inner mechanism of LilyPond, they are rather 
-clumsy to use, so avoid them, if possible. "
-}
-
-#(define (make-note-req p d)
-   (make-music 'NoteEvent
-    'duration d
-    'pitch p))
-
-#(define (make-note elts)
-   (make-music 'EventChord
-    'elements elts))
-
-#(define (seq-music-list elts)
-   (make-music 'SequentialMusic
-    'elements elts))
-
-fooMusic = #(seq-music-list
-             (list (make-note (list (make-note-req (ly:make-pitch 1 0 0) (ly:make-duration 2 0))))
-                   (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))))
-     
-\score { \fooMusic 
-\layout { ragged-right = ##t }
-}
-
diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
deleted file mode 100644
index f114743e36..0000000000
--- a/input/test/no-bar-lines.ly
+++ /dev/null
@@ -1,26 +0,0 @@
-
-\version "2.10.0"
-% possible rename to bar-lines-foo.  -gp
-
-\header{ texidoc = "@cindex Bar Lines Remove
-Engravers can be removed one by one. Here, the time signature and bar lines 
-have been removed.
-"
-}
-
-\score {
-   \relative c'' {
-    a b c d
-    d c b a
-  }
-  \layout {
-    ragged-right = ##t
-    \context {
-      \Staff
-      whichBar = #""
-      \remove "Time_signature_engraver"
-    }
-  }
-}
-
-
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
deleted file mode 100644
index fcf05bb60c..0000000000
--- a/input/test/partial-blank.ly
+++ /dev/null
@@ -1,33 +0,0 @@
-
-\version "2.10.0"
-% check with invisible-notes or blank-notes.  possible rename. -gp
-\header{ texidoc = "@cindex Partial Blank
-When entering partially typeset music (i.e. for students to be 
-completed by hand), you may need the spacing that correspond to the 
-timing of notes: all measures have same length, etc.  It can be
-implemented by adding an invisible staff with a lot of fast notes. "
-}
-
-quickmeasure =  {
-    \repeat unfold 16 c''16
-}
-
-mel =  \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2}
-
-\score {
-\context PianoStaff  <<
-  \new Staff <<
-    \clef G
-    \new Voice {\mel}
-    \new Voice {
-	\override NoteHead  #'transparent = ##t
-	\override Stem  #'transparent = ##t
-	\override Beam  #'transparent = ##t
-        \repeat unfold 4 \quickmeasure
-    }
-  >>
-  \new Staff  {\clef F s1*4}
->>
-\layout {}
-}
-
diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly
deleted file mode 100644
index 797e7f64b9..0000000000
--- a/input/test/preset-extent.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-\version "2.10.0"
-\header { texidoc = "
-
-@cindex Preset Extent
-
-The object may be extended to larger sized by overriding their properties.
-The lyrics in this example have an extent of @code{(-10,10)}, which is why 
-they are spaced so widely.
-
-"
-
-}
-
-\score {
-    \context Lyrics \lyricmode {
-	foo --
-	
-	\override LyricText  #'X-extent = #'(-10.0 . 10.0)
- bar baz
-	}
-    \layout { ragged-right = ##t}
-}
-    
-
diff --git a/input/test/rests.ly b/input/test/rests.ly
deleted file mode 100644
index 852c0ea93b..0000000000
--- a/input/test/rests.ly
+++ /dev/null
@@ -1,38 +0,0 @@
-
-\version "2.10.0"
-\header {
-    texidoc = "@cindex Rests
-
-Rests may be used in various styles.
-
-"
-}
-
-\layout {
-    indent = 0.0
-    ragged-right = ##t
-}
-
-\context Staff \relative c {
-    \set Score.timing = ##f
-    \override Staff.Rest  #'style = #'mensural
-    r\maxima^\markup \typewriter { mensural }
-    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-    \bar "" 
-
-    \override Staff.Rest  #'style = #'neomensural
-    r\maxima^\markup \typewriter { neomensural }
-    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-    \bar "" 
-
-    \override Staff.Rest  #'style = #'classical
-    r\maxima^\markup \typewriter { classical }
-    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-    \bar ""
-    
-    \override Staff.Rest  #'style = #'default
-    r\maxima^\markup \typewriter { default }
-    r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
-    
-}
-
diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
deleted file mode 100644
index 81791cf134..0000000000
--- a/input/test/staff-container.ly
+++ /dev/null
@@ -1,66 +0,0 @@
-\version "2.10.0"
-
-\header {
-
-    texidoc = "
-
-In this preliminary test of a modern score, the staff lines are washed
-out temporarily. This is done by making a tuned @code{StaffContainer},
-which @code{\skip}s some notes without printing lines either and
-creates a @code{\\new Staff} then in order to create the lines again.
-(Be careful if you use this; it has been done by splitting the
-grouping @code{Axis_group_engraver} and creating functionality into 
-separate contexts, but the clefs and time signatures may not do
-what you would expect.)
-
-    "
-
-      }
-
-
-
-\score  {
-     \relative c'' <<
- 	\new StaffContainer {
-
-	    %% need << >>, otherwise we descend to the voice inside SA  
-	    << \new Staff { c4 c4 } >>
-	    \skip 4  % s4 would create staff.
-	    
-	    << \new Staff { b4 b4 } >> 
-	}
- 	\new StaffContainer {
-	    \skip 4
-	    << \context Staff { e d f \bar ":|" } >>
-	    \skip 4
-	}
-    >>
-
-    \layout {
-	\context {
-	    \Score
-	    \accepts StaffContainer
-	    \denies Staff
-	}
-	\context {
-	    \type Engraver_group
-	    \consists Clef_engraver
-	    \consists Time_signature_engraver
-	    \consists Separating_line_group_engraver
-	    \consists "Axis_group_engraver"
-	    \accepts "Staff"
-	    
-	    \name StaffContainer
-	}
-	\context {
-	    \Staff
-	    \remove Axis_group_engraver
-	    \remove Separating_line_group_engraver
-	    \remove Clef_engraver
-	    \remove Time_signature_engraver
-	}
-	ragged-right=##t
-    }
-}
-
-
diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
deleted file mode 100644
index 6abe3d17d8..0000000000
--- a/input/test/staff-size.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.10.0"
-
-\header { texidoc = "@cindex Staff Size
-
-In order to change staff sizes, both @code{staff-space} and @code{fontSize}
-must be scaled."
-
-}
-
-\layout { ragged-right = ##t}
-
-\relative c' <<
-%    \new Staff \relative c'' { \dynamicDown c4 \ff 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/test/stem-extend.ly b/input/test/stem-extend.ly
deleted file mode 100644
index ab3864b2f6..0000000000
--- a/input/test/stem-extend.ly
+++ /dev/null
@@ -1,26 +0,0 @@
-\version "2.10.0"
-
-\header { texidoc = "@cindex Stem Extend
-Extending stems to the center line may be prevented using @code{no-stem-extend}.
-"
-}
-
-\score { 
-  \context Voice \relative c {
-	\context Staff <<
-		\new Voice { 
-			f2 f8 g a b 
-			\override Stem  #'no-stem-extend = ##t
-		 	f2 f8 g a b
-		}
-		\new Voice { 
-			c''2 c8 b a g
-			\override Stem  #'no-stem-extend = ##t
-			c2 c8 b a g
-		}
-	>>
-	
-  }
-  \layout { ragged-right = ##t}  
-}
-
diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
deleted file mode 100644
index f70949ccd9..0000000000
--- a/input/test/tablature-hammer.ly
+++ /dev/null
@@ -1,18 +0,0 @@
-
-\version "2.10.0"
-\header {texidoc = "@cindex Tablature hammer
-A hammer in tablature can be faked with slurs. "
-} 
-
-\score{
-  %BROKEN \context TabStaff
-  <<
-	\relative c''{
-		c(d)
-		d(d)
-		d(c)
-  }
-  >>
-	\layout{ ragged-right = ##t}
-}
-
diff --git a/input/test/time-signature-staff.ly b/input/test/time-signature-staff.ly
deleted file mode 100644
index 3e557fe1af..0000000000
--- a/input/test/time-signature-staff.ly
+++ /dev/null
@@ -1,41 +0,0 @@
-%% todo: move into advanced notation section of the manual.
-
-\header {
-
-  texidoc = "Time signatures may be put on a separate staff.  This is
-  used contemporary pieces with many time signature changes.  "
-
-}
-\version "2.10.0"
-\layout {
-  ragged-right =  ##T
-}
-
-\layout{
-  \context { 
-    \type "Engraver_group"
-    \consists "Time_signature_engraver"
-    \consists "Axis_group_engraver"
-    \name "TimeSig"
-    \override TimeSignature #'font-size = #4
-  }
-  \context {
-    \Score \accepts TimeSig
-  }
-
-  \context { \Staff
-    \override TimeSignature #'transparent = ##t
-  }
-}
-
-
-\relative
-<< \new Staff { \time 2/4 c2 \time 3/4 c2. \time 4/4 c1 }
-   \new TimeSig {
-     \skip 4 * 9
-   }
-   \new Staff { r4 r r
-		r4 r r
-		r4 r r }
-
- >>
diff --git a/input/test/version-output.ly b/input/test/version-output.ly
deleted file mode 100644
index 012ff14c07..0000000000
--- a/input/test/version-output.ly
+++ /dev/null
@@ -1,24 +0,0 @@
-\version "2.10.0"
-
-\header {
-
-
-    texidoc = #(string-append "By putting the output of
-    @code{lilypond-version} into a lyric, it is possible to print the 
-    version number of LilyPond in a score, or in a document generated
-    with @code{lilypond-book}.  Another possibility is to append the 
-    version number to the doc-string, in this manner: "
-
-  (lilypond-version)
-  )
-    
-}
-
-\score { \context Lyrics  {
-    \override Score.RehearsalMark  #'self-alignment-X = #LEFT
-    \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version)))
-    s2
-  }
-}
-
-
diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
deleted file mode 100644
index b46f3ac123..0000000000
--- a/input/test/vertical-extent.ly
+++ /dev/null
@@ -1,37 +0,0 @@
-\version "2.10.0"
-% TODO: huh?  what's this file about?  -gp
-% This file shows that Staff grobs can get very deep or high; there is a lot
-% of room between the staves. 
-
-\header { texidoc = "
-Vertical extents may increased by setting @code{\override VerticalAxisGroup #'minimum-Y-extent}, 
-@code{extra-Y-extent}, and @code{Y-extent}. In this example,
-@code{Y-extent} is increased.
-" }
-
-\score {
-    <<
-    \new Staff {
-      \override Staff.VerticalAxisGroup #'Y-extent = #'(-15.0 . 0.0)
-      \clef alto
-      a1^"15-deep staff"
-    }
-    \new Staff {
-      \clef alto
-      b1
-    }
-    \new Staff {
-      \clef alto
-      c1
-    }
-    \new Staff {
-      \clef alto
-      \override Staff.VerticalAxisGroup #'Y-extent = #'(-0.0 . 10.0)
-      d1^"10-high staff"
-    }
-  >>
-  \layout{
-      ragged-right = ##t
-  }
-}
-
diff --git a/input/test/volta-chord-names.ly b/input/test/volta-chord-names.ly
deleted file mode 100644
index 8f6ebd7075..0000000000
--- a/input/test/volta-chord-names.ly
+++ /dev/null
@@ -1,19 +0,0 @@
-\header {
-    texidoc = "Volta brackets can be placed over chord names. Just set
-the @code{voltaOnThisStaff} property to true for the @code{ChordNames} context and to false for the topmost ordinary @code{Staff} context."
-}
-
-\version "2.10.0"
-\score { <<
-  \new ChordNames \with {
-    voltaOnThisStaff = ##t
-  } \chordmode {
-    c1 c
-  }
-  \new Staff \with {
-    voltaOnThisStaff = ##f
-  }
-  {
-    \repeat volta 2 { c'1 } \alternative { c' }
-  }
->> }