*** empty log message ***

210 files changed, 2918 insertions, 3059 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a0dfb3911..e2d8da7611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* input/regression/*.ly: remove superfluous \score blocks. Reindent.
+
 	* input/regression/slur-script.ly: remove padding tweaks. Add
 	comment strings.
 
diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 0338f358fb..9704a2691a 100644
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -5,16 +5,15 @@
 }
 
 
-\score {  \transpose c c'
-   \context Staff <<
-     \key g \major
-     \context Voice = "va" { \stemUp c' fis! }
-     \context Voice = "vb" { \stemDown c fis! }
-   >>
+\transpose c c'
+\context Staff <<
+  \key g \major
+  \context Voice = "va" { \stemUp c' fis! }
+  \context Voice = "vb" { \stemDown c fis! }
+>>
+
+\layout { raggedright= ##t }
 
-    \layout { raggedright= ##t }
-	 
-}
 
 
 
diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index ec95d9a371..1071d39a45 100644
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -2,38 +2,35 @@
 
 \header {
 
-    texidoc = "Ledger lines are shortened when there are accidentals.
+  texidoc = "Ledger lines are shortened when there are accidentals.
 This happens only for the single ledger line close to the note head,
 and only if the accidental is horizontally close to the head.  "
-    
+  
 }
 
 
-\score {
-    
-	\relative c {
-	    disis
-	    dis
-	    d
-	    des
-	    deses
-	    eses
-	    es
-	    e
-	    eis
-	    eisis
-	    eses'''
-	    es
-	    e
-	    eis
-	    eisis
-	    feses
-	    fes
-	    f
-	    fis
-	    fisis
-	    <cis,, gis'>
-	    
-	} 
+\relative c {
+  disis
+  dis
+  d
+  des
+  deses
+  eses
+  es
+  e
+  eis
+  eisis
+  eses'''
+  es
+  e
+  eis
+  eisis
+  feses
+  fes
+  f
+  fis
+  fisis
+  <cis,, gis'>
+  
+} 
 
-}
diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index 0ba2946466..342465c633 100644
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 
 \header {
-texidoc="
+  texidoc="
 This shows how accidentals in different octaves are handled. The note names 
 are also automatically printed but the octavation has been dropped out.
 "
@@ -19,12 +19,9 @@ mel =  \transpose c c' {
   \bar "|." \break
 }
 
-\score {
-  << \context Staff \mel
-     \context NoteNames{
-	 \set printOctaveNames= ##f
-	 \mel
-	 }
-  >>
-}
-
+<< \context Staff \mel
+   \context NoteNames{
+     \set printOctaveNames= ##f
+     \mel
+   }
+ >>
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index f692c65296..d7a58b5be3 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -3,40 +3,37 @@
 
 \header {
 
-    texidoc ="Accidentals are placed as closely as possible.
+  texidoc ="Accidentals are placed as closely as possible.
 Accidentals in corresponding octaves are aligned.
 The top accidental should be nearest to the chord. The
 flats in a sixth should be staggered.  "
-    
+  
 }
 
 
-\score {
-     \context Voice \relative c'
-    {
-	<d e! bes'!>4
-	cis4
-	c4
-	\transpose c c' {
-	    <ges es'>
-	    <bis es gis>4
-	    <es! as!>
-	    <gis! cis!>
-	    <g! des'>
-	    <ges! es'!>
-	}    
-	<cis d es fis gis ases bes ces d e! >4
-	<bes'! fis!>     
-	<bes! cis!>
-	<c! es ges beses>
-	<bes! c d f >    
-	<bes,! c d f >
-
-    }
-    \layout {
-	raggedright = ##t
-    }
+\context Voice \relative c'
+{
+  <d e! bes'!>4
+  cis4
+  c4
+  \transpose c c' {
+    <ges es'>
+    <bis es gis>4
+    <es! as!>
+    <gis! cis!>
+    <g! des'>
+    <ges! es'!>
+  }    
+  <cis d es fis gis ases bes ces d e! >4
+  <bes'! fis!>     
+  <bes! cis!>
+  <c! es ges beses>
+  <bes! c d f >    
+  <bes,! c d f >
 
 }
+\layout {
+  raggedright = ##t
+}
 
 
diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly
index f36131401b..00643dd218 100644
--- a/input/regression/accidental-quarter.ly
+++ b/input/regression/accidental-quarter.ly
@@ -1,23 +1,21 @@
 \header {
 
-    texidoc = "Quarter tone notation is supported, including
+  texidoc = "Quarter tone notation is supported, including
     threequarters flat."
-    }
+}
 \version "2.6.0"
 
-\score {
-     \relative c'' {
-	\time 12/4 
-	ceses4
-	ceseh
-	ces
-	ceh
-	c
-	c
-	cih
-	cis 
-	cisih
-	cisis
-    }
-    \layout { raggedright = ##t }
+\relative c'' {
+  \time 12/4 
+  ceses4
+  ceseh
+  ces
+  ceh
+  c
+  c
+  cih
+  cis 
+  cisih
+  cisis
 }
+\layout { raggedright = ##t }
diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 533b2d56fb..907a127b83 100644
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign
 after a double flat sign is automatically prepended with a
 natural sign.
@@ -10,16 +10,18 @@ natural sign.
 
 
 
-thenotes =  \relative cis' { \time 4/4
-gisis'4 gis gisis ges |
+thenotes =  \relative cis' {
+  \time 4/4
+  gisis'4 gis gisis ges |
 }
 
-\score { << \context Staff \thenotes
-	\context NoteNames  {
-		\override NoteNames.NoteName   #'no-spacing-rods = ##f 
-		\thenotes
-	}
-	>>
+<<
+  \context Staff \thenotes
+  \context NoteNames  {
+    \override NoteNames.NoteName   #'no-spacing-rods = ##f 
+    \thenotes
+  }
+>>
+
 \layout { raggedright = ##t }
-}
 
diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly
index a702538576..55146b18a9 100644
--- a/input/regression/accidental-tie.ly
+++ b/input/regression/accidental-tie.ly
@@ -2,7 +2,7 @@
 
 \header {
   texidoc = "The second and third notes should not get accidentals,
-    because they are tied to a note.  However, an accidental is
+6    because they are tied to a note.  However, an accidental is
     present if the line is broken at the tie, which happens for the G
     sharp."
 
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 6c4f3f6e22..0a1628a962 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -13,10 +13,8 @@ rechts =  \relative c' {
     <g b des f>8
 }
 
-\score {
   \rechts
 
-  \layout {
-    raggedright = ##t
-  }
+\layout {
+  raggedright = ##t
 }
diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 89975a4f05..38ec9aa440 100644
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 This shows how modern cross voice auto cautionary accidentals are handled.
 The first two fisses get accidentals because they belong to different voices.
 The first f gets cautionary natural because of previous measure.
@@ -12,31 +12,29 @@ The last f gets cautionary natural because fis was only in the other voice.
 
 
 voicea =  \transpose c c' {
-    \stemUp
-    fis2 a2 f4 fis a2
+  \stemUp
+  fis2 a2 f4 fis a2
 }
 voiceb =  \transpose c c' {
-    \stemDown
-    c2 fis2  f4 c   f2
+  \stemDown
+  c2 fis2  f4 c   f2
 }
 
-\score {
-    <<
-	
-	\new NoteNames {
-	    \set printOctaveNames = ##f
-	     \voicea
-	     }
-	\context Staff << 
-	    #(set-accidental-style 'modern-voice-cautionary)
-	    \new Voice \voicea
-	    \new Voice \voiceb
-	>>
-	\new NoteNames {
-	    \set printOctaveNames = ##f
-	    \voiceb
+<<
+  
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voicea
+  }
+  \context Staff << 
+    #(set-accidental-style 'modern-voice-cautionary)
+    \new Voice \voicea
+    \new Voice \voiceb
+  >>
+  \new NoteNames {
+    \set printOctaveNames = ##f
+    \voiceb
 
-			 }
-    >>
-\layout { raggedright = ##t }
-}
+  }
+>>
+  \layout { raggedright = ##t }
diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index cae9baff92..1e8de5dcb5 100644
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -2,17 +2,16 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Accidentals work: the second note does not get a sharp. The third and
 fourth show forced and courtesy accidentals.
 "
 }
 
+\layout { raggedright = ##t }
+
 foo = \relative c''   {   \key as \major dis4 dis dis!^"force" dis? }
 
-\score {
-  << \foo 
+<< \foo 
    \context NoteNames \foo
-  >>
-\layout { raggedright = ##t }
-}
+ >>
diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index 5da7f8bd46..89676aeffa 100644
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -17,14 +17,14 @@ This example prints a bar-number during processing on stdout.
     \layout { raggedright= ##t }
 
 
-\score {  \relative c'' {
-    c1 c1
-
-    %% todo: should put something interesting in the .tex output.
-    
-    \applycontext
-	#(lambda (tr)
-	 (format #t "\nWe were called in barnumber ~a.\n"
-	  (ly:context-property tr 'currentBarNumber)))
-    c1 c1
-}}
+\relative c'' {
+  c1 c1
+
+  %% todo: should put something interesting in the .tex output.
+  
+  \applycontext
+  #(lambda (tr)
+    (format #t "\nWe were called in barnumber ~a.\n"
+     (ly:context-property tr 'currentBarNumber)))
+  c1 c1
+}
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index aa615eaa71..78c2cfef25 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -2,7 +2,7 @@
 \version "2.6.0" 
 \header {
 
-texidoc = "The @code{\applyoutput} expression is the most flexible way to
+  texidoc = "The @code{\applyoutput} expression is the most flexible way to
 tune properties for individual grobs.
 
 Here, the layout of a note head is changed depending on its vertical
@@ -13,39 +13,35 @@ position.
 
 #(define  (mc-squared gr org cur)
   (let*
-      (
-       (ifs (ly:grob-property gr 'interfaces))
-       (sp (ly:grob-property gr 'staff-position))
-       )
-  (if (and (memq 'note-head-interface ifs)
-	   (memq sp '(-2 -3 -5)))
-      (begin
-	(ly:grob-set-property! gr 'print-function Text_interface::print)
-	(ly:grob-set-property! gr 'font-family 'roman)
-	(ly:grob-set-property!
-	 gr 'text
-	 (make-raise-markup -0.5
-			    (case sp
-			      ((-5) (make-simple-markup "m"))
-			      ((-3) (make-simple-markup "c "))
-			      ((-2) (make-smaller-markup (make-bold-markup "2")))
-			      (else (make-simple-markup "bla"))
-			      ))))
-      )))
-
-\score {
-
- \context Voice \relative  c' {
-				      \stemUp
-				      \set autoBeaming =  ##f
-   { <d f g b>8
-     \context Voice \applyoutput #mc-squared
-
-	 <d f g b>
-   }
-	      
-   }
-\layout { raggedright = ##t
-%		     outputscale = 5
-		     } 
+   (
+     (ifs (ly:grob-property gr 'interfaces))
+     (sp (ly:grob-property gr 'staff-position))
+   )
+   (if (and (memq 'note-head-interface ifs)
+	(memq sp '(-2 -3 -5)))
+    (begin
+     (ly:grob-set-property! gr 'print-function Text_interface::print)
+     (ly:grob-set-property! gr 'font-family 'roman)
+     (ly:grob-set-property!
+      gr 'text
+      (make-raise-markup -0.5
+       (case sp
+	((-5) (make-simple-markup "m"))
+	((-3) (make-simple-markup "c "))
+	((-2) (make-smaller-markup (make-bold-markup "2")))
+	(else (make-simple-markup "bla"))
+      ))))
+  )))
+
+\context Voice \relative  c' {
+  \stemUp
+  \set autoBeaming =  ##f
+  { <d f g b>8
+    \context Voice \applyoutput #mc-squared
+
+    <d f g b>
+  }
+  
 }
+
+\layout { raggedright = ##t }
diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index 8eb7c2c505..cfa3c5ed1a 100644
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -2,19 +2,17 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 A square bracket on the left indicates that the player should not
 arpeggiate the chord.
 "
 }
 
-\score{
-     \relative c''{
-	 \arpeggioBracket
-	 
-	 <fis,  d a >\arpeggio
-	 }
-     
-    \layout { raggedright= ##t }
+\relative c''{
+  \arpeggioBracket
+  
+  <fis,  d a >\arpeggio
 }
 
+\layout { raggedright= ##t }
+
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index a9808ae1e9..aa0e9133fd 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -4,19 +4,17 @@
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
 }
 
-\score{
-     \transpose c c' {
-	<fis'' g d a>\arpeggio
-	<fis, g d a>\arpeggio
-	<fis'' g d a>\arpeggio
-	}
-    \layout {
-        raggedright = ##t
-	\context{
-	    \Staff
-	    connectArpeggios = ##t
-	}
-	}
+\transpose c c' {
+  <fis'' g d a>\arpeggio
+  <fis, g d a>\arpeggio
+  <fis'' g d a>\arpeggio
+}
+\layout {
+  raggedright = ##t
+  \context{
+    \Staff
+    connectArpeggios = ##t
+  }
 }
 
 
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index 4400577f9b..d48ccf8ed3 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,30 +1,28 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.
 "
 }
 
 
 
-\score{
-    \context PianoStaff << 
-	 \new Staff \relative c''{
-	     <fis,  d a>\arpeggio
-	    \override Staff.Arpeggio  #'arpeggio-direction = #1 
-	     <fis d a >\arpeggio	    
-	     %%\override PianoStaff.SpanArpeggio  #'connect = ##t
-	     \set PianoStaff.connectArpeggios = ##t
-	     <fis d a>\arpeggio
-	  }
-	 \new Staff\relative c{
-	     \clef bass
-	     <g b d>\arpeggio
-	    \override Staff.Arpeggio  #'arpeggio-direction = #-1
-	     <g b d>\arpeggio
-	     <g b d>\arpeggio
-	 }
-    >>
-    \layout { raggedright= ##t }
-}
+\context PianoStaff << 
+  \new Staff \relative c''{
+    <fis,  d a>\arpeggio
+    \override Staff.Arpeggio  #'arpeggio-direction = #1 
+    <fis d a >\arpeggio	    
+    %%\override PianoStaff.SpanArpeggio  #'connect = ##t
+    \set PianoStaff.connectArpeggios = ##t
+    <fis d a>\arpeggio
+  }
+  \new Staff\relative c{
+    \clef bass
+    <g b d>\arpeggio
+    \override Staff.Arpeggio  #'arpeggio-direction = #-1
+    <g b d>\arpeggio
+    <g b d>\arpeggio
+  }
+>>
+\layout { raggedright= ##t }
diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index d6565864c7..d3a5fe56c4 100644
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -5,12 +5,10 @@
 texidoc="No auto beams will be put over (manual) repeat bars."
 }
 
-\score {
-     {
-        \time 3/4
-        a'4 b' c''8 \bar ":|:" d''8
-    }
-    \layout{
-   raggedright = ##t
+{
+  \time 3/4
+  a'4 b' c''8 \bar ":|:" d''8
 }
+\layout{
+  raggedright = ##t
 }
diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index dfc164f33f..2a2e019fb4 100644
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -1,15 +1,13 @@
 
 \header
 {
-texidoc = "Automatic beaming is also done on tuplets."
+  texidoc = "Automatic beaming is also done on tuplets."
 }
 
 \version "2.6.0"
 
-\score{
-	\relative c''{
-		c8 c c c
-		\times 4/6 { c c c c c c}
-	}
-    \layout { raggedright= ##t }
+\relative c''{
+  c8 c c c
+  \times 4/6 { c c c c c c}
 }
+\layout { raggedright= ##t }
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index 73c7effaac..7230612a9a 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -2,17 +2,16 @@
 \version "2.6.0"
 
 \header {
-texidoc = "Tuplet-spanner should not put (visible) brackets on
+  texidoc = "Tuplet-spanner should not put (visible) brackets on
 beams even if they're auto generated."
 }
 
-\score {  \relative c' {
+\relative c' {
   \set tupletSpannerDuration = #(ly:make-moment 1 4)
   \override TupletBracket  #'bracket-visibility = #'if-no-beam
   \times 2/3 {
-	 f8[ f f ] f8[ f f ] f f f f f f 
- }
+    f8[ f f ] f8[ f f ] f f f f f f 
+  }
 }
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-     }
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index 7454f2f7ed..76f263c162 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -1,5 +1,5 @@
 \header {
-texidoc="Beams are place automatically; the last measure should have a single 
+  texidoc="Beams are place automatically; the last measure should have a single 
 beam."
 }
 
@@ -7,16 +7,14 @@ beam."
 
 \layout  { raggedright = ##t } 
 
-\score {
-   \relative c'' {
-    a\longa a\breve  
-    a1 a2 a4 a8 a16 a32 a64 a64 
-  }
-  \layout {
-    \context {
-      \Staff
-      \remove "Clef_engraver"
-    }
+\relative c'' {
+  a\longa a\breve  
+  a1 a2 a4 a8 a16 a32 a64 a64 
+}
+\layout {
+  \context {
+    \Staff
+    \remove "Clef_engraver"
   }
 }
 
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 345aa9e69f..5925276b1f 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -11,17 +11,14 @@ note. When central C is reached, staff is not yet switched (by default).
 }
     \layout { raggedright= ##t }
 
-\score {
-	 \context PianoStaff <<
-	\context Staff = "up" {
-		\autochange  \context Voice = VA << \relative c' { g4 c e d c r4 a g } >>
-	}
-	\context Staff = "down" {
-		\clef bass 
-		s1*2
-	}
+\context PianoStaff <<
+  \context Staff = "up" {
+    \autochange  \context Voice = VA << \relative c' { g4 c e d c r4 a g } >>
+  }
+  \context Staff = "down" {
+    \clef bass 
+    s1*2
+  }
 
-	>>
-	
-}
+>>
 
diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index 3324628236..909321a668 100644
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -1,32 +1,30 @@
 
 \header {
-    texidoc = "With balloon texts, objects in the output can be marked,
+  texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
-    }
+}
 \version "2.6.0"
 
-\score  {
-  {
-     
-   \relative c'  {
+{
+  
+  \relative c'  {
 
-       %% by hand:
-       \once\override Stem  #'print-function = #Balloon_interface::print
-       \once\override Stem  #'balloon-original-callback = #Stem::print
-       \once\override Stem  #'balloon-text = #"I'm a stem"
-       \once\override Stem  #'balloon-text-offset = #'(3 . 4)
-       \once\override Stem  #'balloon-text-props
-      = #'((font-family .  roman))
+    %% by hand:
+    \once\override Stem  #'print-function = #Balloon_interface::print
+    \once\override Stem  #'balloon-original-callback = #Stem::print
+    \once\override Stem  #'balloon-text = #"I'm a stem"
+    \once\override Stem  #'balloon-text-offset = #'(3 . 4)
+    \once\override Stem  #'balloon-text-props
+    = #'((font-family .  roman))
 
 
-       %% use predefd function. 
-       \context Voice \applyoutput #(add-balloon-text
-				     'NoteHead "heads, or tails?"
-				     '(0 . -3))
+    %% use predefd function. 
+    \context Voice \applyoutput #(add-balloon-text
+				  'NoteHead "heads, or tails?"
+				  '(0 . -3))
 
-      
-       c8
-       }
+    
+    c8
   }
- \layout{ raggedright = ##t }
 }
+\layout{ raggedright = ##t }
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index 462d6d12e6..dafc149089 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,18 +1,18 @@
 
 \version "2.6.0"
 
-\header{ texidoc="A knee is made automatically when a horizontal
+\header
+{
+  texidoc="A knee is made automatically when a horizontal
 beam fits in a gap between note heads that is larger than a predefined
 threshold.
 "
 }
 
-\score {
-  \context Staff \relative c''{ 
-     c'8[ c,,]  c8[ e']
-     c,16[ e g c e g c c,,] 
-  }
-  \layout{
-      raggedright = ##t 
-  }
+\context Staff \relative c''{ 
+  c'8[ c,,]  c8[ e']
+  c,16[ e g c e g c c,,] 
+}
+\layout{
+  raggedright = ##t 
 }
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index f1030134c9..facfebd883 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -1,13 +1,13 @@
 
 \header {
-    texidoc = "Beams can be printed across line breaks, if forced.
+  texidoc = "Beams can be printed across line breaks, if forced.
 "
 
 }
 \version "2.6.0"
 \layout { raggedright= ##t }
 
-\score {  \relative c''  {
-    \set Score.allowBeamBreak = ##t
-    \time 3/16 c16-[ d e \break f-] 
-}}
+\relative c''  {
+  \set Score.allowBeamBreak = ##t
+  \time 3/16 c16-[ d e \break f-] 
+}
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index 2086802fa3..4c7dcc00ae 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -2,48 +2,46 @@
 \version "2.6.0"
 \header{
 
-    texidoc="Simple beams on middle staffline are allowed to be
+  texidoc="Simple beams on middle staffline are allowed to be
     slightly sloped, even if the notes have ledgers.  Beams reaching
     beyond middle line can have bigger slope."
 
 }
 
-\score{
-    \relative c'{
-	%%\override Staff.Stem  #'beamed-lengths = #'(3.50)
-	%%  c8[ d]
-	%%  d[ c]
-	%% r2
-	%% \override Staff.Stem  #'beamed-lengths = #'(3.26)
-
-         a8[^"small slope" b]
-         b[ a]
-
-	 c''[ b]
-	 b[ c]
-
-	 % baerenreiter test
-	 b,,[ c]
-	 c[ b]
-
-	 b''[ a]
-	 a[ b]
-
-	 c,,[ d]
-	 d[ c]
-	
-	 a''[ g]
-	 g[ a]
-
-	 c,,[^"bigger slope" e]
-	 e[ c]
-	
-	 a''[ f]
-	 f[ a]
-    }
-    \layout{
-	raggedright = ##t
-	indent = 0
-    }
+\relative c'{
+  %%\override Staff.Stem  #'beamed-lengths = #'(3.50)
+  %%  c8[ d]
+  %%  d[ c]
+  %% r2
+  %% \override Staff.Stem  #'beamed-lengths = #'(3.26)
+
+  a8[^"small slope" b]
+  b[ a]
+
+  c''[ b]
+  b[ c]
+
+				% baerenreiter test
+  b,,[ c]
+  c[ b]
+
+  b''[ a]
+  a[ b]
+
+  c,,[ d]
+  d[ c]
+  
+  a''[ g]
+  g[ a]
+
+  c,,[^"bigger slope" e]
+  e[ c]
+  
+  a''[ f]
+  f[ a]
+}
+\layout{
+  raggedright = ##t
+  indent = 0
 }
 
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 6afcfd1114..0c570a8fb1 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -53,7 +53,6 @@ rossBeams = \relative c'' {
 
 
 #(define (<> x y) (not (= x  y)))
-\score{
    \new Voice {
      \override Beam #'position-callbacks = #(check-slope-callbacks =)
      \rossBeams
@@ -63,6 +62,5 @@ rossBeams = \relative c'' {
     raggedright = ##t
     #(define debug-beam-quanting #t)
   }
-}
 
 
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 25025d315c..cc9decfaa1 100644
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -3,24 +3,22 @@
 
 \header{
 
-    texidoc="Automatic cross-staff knees work also (here they were
+  texidoc="Automatic cross-staff knees work also (here they were
 produced with explicit staff switches)."
 
-     }
+}
 
-\score {
-   \context PianoStaff <<
-    \context Staff = "up" \relative c''{
-      b8[ \change Staff="down" d,, ]
-      c[ \change Staff="up" c'' ]
-      b,[ \change Staff="down" d^"no knee" ]
-    }
-    \context Staff = "down" {
-      \clef bass 
-      s2.
-    }
-  >>
-  \layout{
-    raggedright = ##t
+\context PianoStaff <<
+  \context Staff = "up" \relative c''{
+    b8[ \change Staff="down" d,, ]
+    c[ \change Staff="up" c'' ]
+    b,[ \change Staff="down" d^"no knee" ]
+  }
+  \context Staff = "down" {
+    \clef bass 
+    s2.
   }
+>>
+\layout{
+  raggedright = ##t
 }
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index 6e9bc03638..7af3f3fcd1 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -3,30 +3,29 @@
     texidoc = "Cross staff  (kneed) beams do not cause extreme slopes."
 }
 
-\score {
-    \context PianoStaff <<
-    \context Staff = "up"
-    \relative c'' <<
-        {
-	    \stemDown
-            f16( \> d b\! \change Staff = down \stemUp
-            \clef treble g ~ < g e>8)
-	    
-	     e[ \change Staff = up
-	    \stemDown
-	    e e]
-	    \change Staff = down
-	    \stemUp
-	    e8.[
-		\change Staff = up
-	    \stemDown
-	    e8.]
-	    
-	} \\
-    >>
-    \context Staff = "down" {
-        \time 3/8 \clef bass s4.*3 }
-    >>
-    \layout { raggedright = ##t}
-}
+\layout { raggedright = ##t}
+
+\context PianoStaff <<
+  \context Staff = "up"
+  \relative c'' <<
+    {
+      \stemDown
+      f16( \> d b\! \change Staff = down \stemUp
+      \clef treble g ~ < g e>8)
+      
+      e[ \change Staff = up
+	 \stemDown
+	 e e]
+      \change Staff = down
+      \stemUp
+      e8.[
+	\change Staff = up
+	\stemDown
+	e8.]
+      
+    } \\
+  >>
+  \context Staff = "down" {
+    \time 3/8 \clef bass s4.*3 }
+>>
 
diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index 2f4264f62f..b1e416eb6f 100644
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -7,28 +7,27 @@ beautification does not really work, but knees do. Beams should be
 behave well, wherever the switching point is.
 "
 }
-\score{
-	\context PianoStaff <<
-	\context Staff = "one" \relative c'{
-		\stemUp  c8[ c \change Staff=two \stemUp c c]
-		 c[ c c c]
-		\change Staff=one
-		\stemDown  c8[ c \change Staff=two \stemUp c c]
-		r2
-		\stemDown  c8[ c \change Staff=one \stemDown c c]
-		r2
-		\change Staff=two
-		\stemUp  c8[ c \change Staff=one \stemDown c c]
-		r2
-	}
-	\context Staff = "two" \relative c'{
-		\clef bass
-		s1
-		s1
-		s1
-		s1
-	}
-	>>
-}
+
+\context PianoStaff <<
+  \context Staff = "one" \relative c'{
+    \stemUp  c8[ c \change Staff=two \stemUp c c]
+    c[ c c c]
+    \change Staff=one
+    \stemDown  c8[ c \change Staff=two \stemUp c c]
+    r2
+    \stemDown  c8[ c \change Staff=one \stemDown c c]
+    r2
+    \change Staff=two
+    \stemUp  c8[ c \change Staff=one \stemDown c c]
+    r2
+  }
+  \context Staff = "two" \relative c'{
+    \clef bass
+    s1
+    s1
+    s1
+    s1
+  }
+>>
 
 
diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly
index 3858df20c5..687a7d5f05 100644
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -3,24 +3,22 @@
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 
-\score{
-	\relative c''{
-%		\stemUp
-%		 a16[ b b c]
-%		 c[ b b a]
-%		\stemDown
-%		 c[ b b a]
-%		 a[ b b c]
-		\stemUp
-		 g16[ a b c]
-		 c[ b a g]
-		\stemDown
-		 d'[ c b a]
-		 a[ b c d]
-	}
-	\layout{
-		raggedright = ##t
-	}
+\relative c''{
+  %%		\stemUp
+  %%		 a16[ b b c]
+  %%		 c[ b b a]
+  %%		\stemDown
+  %%		 c[ b b a]
+  %%		 a[ b b c]
+  \stemUp
+  g16[ a b c]
+  c[ b a g]
+  \stemDown
+  d'[ c b a]
+  a[ b c d]
+}
+\layout{
+  raggedright = ##t
 }
 
 
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index 09c0ddf60a..f765336f85 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -5,14 +5,12 @@
     texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."
     }
 
-\score{
-    \relative c'{
-	\override Beam  #'position-callbacks =
-	 #`(,Beam::least_squares
-	 ,Beam::check_concave
-	 ,Beam::slope_damping)
+\relative c'{
+  \override Beam  #'position-callbacks =
+  #`(,Beam::least_squares
+     ,Beam::check_concave
+     ,Beam::slope_damping)
 
-        f4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
-    }
-    \layout{ raggedright = ##t}
-}          
+  f4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
+}
+\layout{ raggedright = ##t}
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index cce806fc99..87ecdbd05b 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -27,22 +27,14 @@ extreme = \relative c'' {
       }
 }
 
-\score {
-  {
-    % If we want to test extreme beams,
-    % we should not have them auto-kneed
-    \override Beam  #'auto-knee-gap = ##f
-    \extreme
-
+{
+				% If we want to test extreme beams,
+				% we should not have them auto-kneed
+  \override Beam  #'auto-knee-gap = ##f
+  \extreme
+}
 
-    %% what does this test? --hwn
-%{
-    \override Beam  #'slope-limit = #1000
-    \extreme
-    %}
-  }
-  \layout{
-%    raggedright = ##t
-    raggedright = ##t
-  }
+\layout{
+  %%    raggedright = ##t
+  raggedright = ##t
 }
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 928d390ae2..b7b0bd2699 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -2,20 +2,18 @@
 \version "2.6.0"
 \header {
 
-texidoc=" Funky kneed beams with beamlets also work. The beamlets
+  texidoc=" Funky kneed beams with beamlets also work. The beamlets
 should be pointing to the note head.
 "
 
 }
 
 
-\score {
-  \relative c' {
-     c16 c''8 c,,16
-     c16 c''8 c16
-     c16 c,,8 c16          
-     
-  }
-  \layout { raggedright = ##t}
+\relative c' {
+  c16 c''8 c,,16
+  c16 c''8 c16
+  c16 c,,8 c16          
+  
 }
+\layout { raggedright = ##t}
 	  
diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index 74026fadeb..1f03f4ddf5 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,39 +1,38 @@
 
 \version "2.6.0"
 \header {
-    
-    texidoc = "In complex configurations of knee beaming, according to
+  
+  texidoc = "In complex configurations of knee beaming, according to
 Paul Roberts, the first stem of a beam determines the direction of the
 beam, and as such the way that following (kneed) stems attach to the
 beam. This is in disagreement with the current algorithm."
-    
+  
 }
 
-\score { 
 \relative c'
-	 {
-	     \override Beam  #'auto-knee-gap = #7
-	     \set subdivideBeams = ##t	     
-	     \time 8/8
-	      c,16[  g'''16  
-	     c,,,16  g'''16 
-	     c,,,16  g'''16 	     	     
-	     c,,,16  g'''16 ]
+{
+  \override Beam  #'auto-knee-gap = #7
+  \set subdivideBeams = ##t	     
+  \time 8/8
+  c,16[  g'''16  
+	 c,,,16  g'''16 
+	 c,,,16  g'''16 	     	     
+	 c,,,16  g'''16 ]
 
-	      c,,,16[ c c c
-	      b'''   b b b]
+  c,,,16[ c c c
+	  b'''   b b b]
 
-	     \transpose c' a, { \relative b'' {  g,16[  g'''16  
-	     g,,,16  g'''16 
-	     g,,,16  g'''16 	     	     
-	     g,,,16  g'''16
-	     g g,,,
-	     g''' g,,,
-	     g''' g,,,
-	     g''' g,,,]	    }  }
-	     
-	 }
+  \transpose c' a, {
+    \relative b'' {  g,16[  g'''16  
+			    g,,,16  g'''16 
+			    g,,,16  g'''16 	     	     
+			    g,,,16  g'''16
+			    g g,,,
+			    g''' g,,,
+			    g''' g,,,
+			    g''' g,,,]
+		   }
+  }
+}
 \layout { raggedright = ##t} 
 
-     }
-
diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly
index 16333a07aa..357b821771 100644
--- a/input/regression/beam-isknee.ly
+++ b/input/regression/beam-isknee.ly
@@ -8,22 +8,20 @@ Beams can be placed across a @code{PianoStaff}.
 "
 
 }
-\score{
-	\context PianoStaff <<
-	\context Staff = "one" \relative c'{
-		s1
-	}
-	\context Staff = "two" \relative c'{
-		\clef bass
-% no knee
-		\stemUp  c8[ \change Staff=one \stemDown g'16 f]
-		s8
-		s2
-	}
-	>>
-	\layout{
- 		raggedright = ##t
-	}
+\context PianoStaff <<
+  \context Staff = "one" \relative c'{
+    s1
+  }
+  \context Staff = "two" \relative c'{
+    \clef bass
+				% no knee
+    \stemUp  c8[ \change Staff=one \stemDown g'16 f]
+    s8
+    s2
+  }
+>>
+\layout{
+  raggedright = ##t
 }
 
 
diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index 29a48f691c..d066969415 100644
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -7,7 +7,6 @@
 
 }
 
-\score{
     \relative c'{
 	 a8[ b'' a,, b'']
 	 b8[ a,, b'' a,,]
@@ -15,4 +14,3 @@
     \layout{
 	raggedright = ##t 
     }
-}
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index d7742b202e..2190e44574 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -2,16 +2,14 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Beams should look the same.
 "
 }
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-    
-\score { 
-  \context Voice \relative c {
-			 d''8[ d d]  d[ g d]
-			c c
-  }
+
+\context Voice \relative c {
+  d''8[ d d]  d[ g d]
+  c c
 }
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index cd3d32c450..bd4655fda5 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -3,26 +3,24 @@
 
 
 \header {
-    texidoc = 
-    "Beaming can be overidden for individual stems."
+  texidoc = 
+  "Beaming can be overidden for individual stems."
 }
-\score {
-     \relative c'' {
-	c32[ c
+\relative c'' {
+  c32[ c
 
-	     %% WARNING: #'beaming is written, so this
-	     %% property can not be shared between objects. Always use
-	     %%  \once.
-	     %%
+       %% WARNING: #'beaming is written, so this
+       %% property can not be shared between objects. Always use
+       %%  \once.
+       %%
 
-	     \once \override Stem 
-	     #'beaming = #(cons (list   1 2) (list 0 2 4))
-	     c
-	     \once \override Stem 
-	     #'beaming = #(cons (list 0 2 4) (list 0 1 4))
-	     c c c]
-    }
-    \layout{ 
-	raggedright = ##t 
-    }
+       \once \override Stem 
+       #'beaming = #(cons (list   1 2) (list 0 2 4))
+       c
+       \once \override Stem 
+       #'beaming = #(cons (list 0 2 4) (list 0 1 4))
+       c c c]
+}
+\layout{ 
+  raggedright = ##t 
 }
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index cedbb65e90..962f118a62 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -1,30 +1,28 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Kneed beams (often happens with cross-staff beams)
+  texidoc = "Kneed beams (often happens with cross-staff beams)
 should look good when there are multiple beams: all the beams should
 go on continuously at the staff change. Stems in both staves reach up
 to the last beam.
 "
 }
 
-\score { 
-	 \context PianoStaff \relative c' <<
-	     \context Staff = SA {
-		 \stemDown
-		  c8[ c16 \change Staff = SB \stemUp c16 ]
-		 \stemNeutral
-		  f[ g \change Staff = SA a c] 
-			       }
-	     \context Staff = SB \relative c' {
-\clef bass
-		  b8[ b16 \stemUp b,,16 ]
+\context PianoStaff \relative c' <<
+  \context Staff = SA {
+    \stemDown
+    c8[ c16 \change Staff = SB \stemUp c16 ]
+    \stemNeutral
+    f[ g \change Staff = SA a c] 
+  }
+  \context Staff = SB \relative c' {
+    \clef bass
+    b8[ b16 \stemUp b,,16 ]
 
-		 g'4\rest
-		  b,8[ b16 \stemDown b''16 b ]
-	     }	     
-	     
-	     >>
-    \layout { raggedright= ##t }
+    g'4\rest
+    b,8[ b16 \stemDown b''16 b ]
+  }	     
+  
+>>
+\layout { raggedright= ##t }
 
-}
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index f8a0f15a4c..7d732b6536 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,11 +1,9 @@
 
 \version "2.6.0"
 \header {
-texidoc = "Explicit beams may cross barlines. "
+  texidoc = "Explicit beams may cross barlines. "
 }
-\score {
- \relative c'' { c2.  c8[ c8 c8 c8] }
+\relative c'' { c2.  c8[ c8 c8 c8] }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-}
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 7493ae305c..a8bbebd37e 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 \header{
 
-texidoc=" Beams on ledgered notes should always reach the middle staff
+  texidoc=" Beams on ledgered notes should always reach the middle staff
 line.  The second beam counting from the note head side, should never
 be lower than the second staff line.  This does not hold for grace
 note beams.  Override with @code{no-stem-extend}.  "
@@ -10,20 +10,17 @@ note beams.  Override with @code{no-stem-extend}.  "
 }
 
 
-\score { 
-  \context Voice \relative c {
-     f8[ f]   f64[ f] 
-     \grace { 
-       f8[ e8] 
-      \override Stem  #'no-stem-extend = ##f
-       f8[ e8] 
-      \revert Stem #'no-stem-extend
-    }
-	 f8[ f]
-	
+\context Voice \relative c {
+  f8[ f]   f64[ f] 
+  \grace { 
+    f8[ e8] 
+    \override Stem  #'no-stem-extend = ##f
+    f8[ e8] 
+    \revert Stem #'no-stem-extend
   }
-  \layout {
-    raggedright = ##t
-  }  
-  \midi { }
+  f8[ f]
+  
 }
+\layout {
+  raggedright = ##t
+}  
diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly
index cda10ae7e2..388ed710a0 100644
--- a/input/regression/beam-quanting-32nd.ly
+++ b/input/regression/beam-quanting-32nd.ly
@@ -10,22 +10,19 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden'
 
 \version "2.6.0"
 
-\score {
-     \relative c''{ 
-\time 3/8
-a'16[ b] g[ b]
-a32[ b] g[ b] 
-g16[ a] f[ a]
-g32[ a] f[ a] 
-f16[ g] e[ g]
-f32[ g] e[ g] 
-e16[ f] d[ f]
-e32[ f] d[ f] 
-d16[ e] c[ e]
-d32[ e] c[ e]
-c16[ d] b[ d]
-c32[ d] b[ d]
-a'32[ a] g[ g] f[ f] e[ e] d[ d] c[ c]
-}
-\layout {  }
+\relative c''{ 
+  \time 3/8
+  a'16[ b] g[ b]
+  a32[ b] g[ b] 
+  g16[ a] f[ a]
+  g32[ a] f[ a] 
+  f16[ g] e[ g]
+  f32[ g] e[ g] 
+  e16[ f] d[ f]
+  e32[ f] d[ f] 
+  d16[ e] c[ e]
+  d32[ e] c[ e]
+  c16[ d] b[ d]
+  c32[ d] b[ d]
+  a'32[ a] g[ g] f[ f] e[ e] d[ d] c[ c]
 }
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index b2fbb55cbb..3f01d80882 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -9,21 +9,19 @@ lengths are between 2 and 1.5."
 
 }
 
-\score{
-	\relative c' { 
-		 c8[ c]  a''[ a]
-		 a,[ a]  c[ c]
-		 d,8[ d]  g'[ g]
-		 g,[ g]  d'[ d]
-		 c,16[ c]  a''[ a]
-		 a,[ a ]  c[ c]
-		\break
-		 c,32[  c]  a''[ a]
-		 f,[ f]  e'[ e]
-		 c,64[ c]  a''[ a]
-		 f,[ f]  e'[ e]
-		\break
-	}
+\relative c' { 
+  c8[ c]  a''[ a]
+  a,[ a]  c[ c]
+  d,8[ d]  g'[ g]
+  g,[ g]  d'[ d]
+  c,16[ c]  a''[ a]
+  a,[ a ]  c[ c]
+  \break
+  c,32[  c]  a''[ a]
+  f,[ f]  e'[ e]
+  c,64[ c]  a''[ a]
+  f,[ f]  e'[ e]
+  \break
 }
 
 
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 68a9ad9f92..5a7f0a0dde 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -1,13 +1,12 @@
 
 \header {
- texidoc = "The number of beams does not change on a rest."
+  texidoc = "The number of beams does not change on a rest."
 }
 
 \version "2.6.0"
 
-\score {  \relative c, {
+\relative c, {
   \clef bass	 
-   e8[ r16 f d'8 e16 e16]  c8[ c16 r16 bes8 r16 c16] |
- }
-\layout { raggedright = ##t}
+  e8[ r16 f d'8 e16 e16]  c8[ c16 r16 bes8 r16 c16] |
 }
+\layout { raggedright = ##t }
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index ef869ab50c..d73e7b3844 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,20 +1,22 @@
 
 \version "2.6.0"
+
 \header{
-  texidoc="
-Engraving second intervals is tricky.  We used to have problems with seconds 
-being too steep, or getting too long stems.  In a file like this, showing
-seconds, you'll spot something fishy very quickly.
- 
-" }
-\score{
-    \relative c''{
-	\stemUp
-	 b8[ c]
-	 b16[ c]
-	 a'[ b]
-    }
-    \layout{
-	raggedright = ##t
-    }
+
+  texidoc="Engraving second intervals is tricky.  We used to have
+problems with seconds being too steep, or getting too long stems.  In
+a file like this, showing seconds, you'll spot something fishy very
+quickly."
+
+}
+
+
+\relative c''{
+  \stemUp
+  b8[ c]
+  b16[ c]
+  a'[ b]
+}
+\layout{
+  raggedright = ##t
 }
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index aacd0b42b2..4097f7dfa1 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -5,14 +5,12 @@
     texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
     }
 
-\score{
-    \relative c'{
-	\override Beam  #'position-callbacks =
-	 #`(,Beam::least_squares
-	 ,Beam::check_concave
-	 ,Beam::slope_damping)
-	\stemUp
-        f'4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
-    }
-    \layout{ raggedright = ##t}
-}          
+\relative c'{
+  \override Beam  #'position-callbacks =
+  #`(,Beam::least_squares
+     ,Beam::check_concave
+     ,Beam::slope_damping)
+  \stemUp
+  f'4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
+}
+\layout{ raggedright = ##t }
diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 475aab238b..0c232c64ab 100644
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,14 +1,12 @@
 
 \version "2.6.0"
 \header {
-texidoc = "Automatic beaming works also in ternary time sigs."
+  texidoc = "Automatic beaming works also in ternary time sigs."
 }
 
-\score {
-    \relative c'' {
-\time 6/8
- c8.[ c16 c16 c16] 
+\relative c'' {
+  \time 6/8
+  c8.[ c16 c16 c16] 
 }
 \layout { raggedright = ##t}
-}
 
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index 4f17fa2857..ee953ad6b0 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -9,23 +9,23 @@ hidden just as with breakable bar lines.
 "
 }
 
-\score { \context Staff  \relative c''  {
-	 c8.[ c16]
-	 c8.[ c16 c8.  c16]
-	 c16[ c8.] |
-	 c8.[ c16  c16  c8.]
-	 c8.[ c32  c32]
-	 c8[ c8] |
-	 c16[ c16]
-	 c32[ c32]
-	 c64[ c64]	
-	c32
-	c2
+\context Staff  \relative c''  {
+  c8.[ c16]
+  c8.[ c16 c8.  c16]
+  c16[ c8.] |
+  c8.[ c16  c16  c8.]
+  c8.[ c32  c32]
+  c8[ c8] |
+  c16[ c16]
+  c32[ c32]
+  c64[ c64]	
+  c32
+  c2
 
-	 c8[ c c] c8 % over barline
-	 c16[ c8 c16]
-	 c32[ c16 c16 c16 c32]
-	 c32[ c16 c8 c32]		 % hmm ?
-	
-		}}
+  c8[ c c] c8 % over barline
+  c16[ c8 c16]
+  c32[ c16 c16 c16 c32]
+  c32[ c16 c8 c32]		 % hmm ?
+  
+}
 
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index 1a7f549444..9b2d3fd63d 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -6,12 +6,11 @@
 
     \layout { raggedright= ##t }
 
-\score { 
 \relative c'
-	 {
-	 c16[ c8.]
-	 c8.[ c16]
-	 c8[ c16 c16 c8]
-	 c8[ c16 e16 g8]
+{
+  c16[ c8.]
+  c8.[ c16]
+  c8[ c16 c16 c8]
+  c8[ c16 e16 g8]
 
-    }}
+}
diff --git a/input/regression/break.ly b/input/regression/break.ly
index ef2be2a15e..87ddcdbf38 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -2,19 +2,18 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Breaks can be encouraged and discouraged using @code{\\break} and
 @code{\\noBreak}."
 }
 
 
-\score{
-	\relative c'' \context Voice{
-	\emptyText
-	c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
-	c1 \break \mark "break" c1 \break \mark "break" c1 
-	}
-	\layout {
-	    indent = 0.0
-	    linewidth = 4.0\cm}
+\relative c'' \context Voice {
+  \emptyText
+  c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
+  c1 \break \mark "break" c1 \break \mark "break" c1 
+}
+\layout {
+  indent = 0.0
+  linewidth = 4.0\cm
 }
diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 28c0436dd2..4413517602 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Gregorian chant notation sometimes also uses commas and ticks, but in
 smaller font size (we call it 'virgula' and 'caesura').  However, the
 most common breathing signs are divisio minima/maior/maxima and
@@ -11,40 +11,38 @@ finalis, the latter three looking similar to bar glyphs.
 
 \include "gregorian-init.ly"
 
-\score {
 
-    %
-    % Gregorian notation:
-    %
-    \context VaticanaStaff {
-       \relative c' {
+%%
+%% Gregorian notation:
+%%
+\context VaticanaStaff {
+  \relative c' {
 
-	% we turn bars and bar numbers off for Gregorian stuff
-	\override Staff.BarLine  #'transparent = ##t
-	\override Score.BarNumber  #'transparent = ##t
+    %% we turn bars and bar numbers off for Gregorian stuff
+    \override Staff.BarLine  #'transparent = ##t
+    \override Score.BarNumber  #'transparent = ##t
 
-	% here is no \breathe
-	c g c
+    %% here is no \breathe
+    c g c
 
-	% \virgula applies rcomma, but in a smaller font
-	c \virgula g c
+    %% \virgula applies rcomma, but in a smaller font
+    c \virgula g c
 
-	% \caesura applies rvarcomma, but in a smaller font
-	c \caesura g c
+    %% \caesura applies rvarcomma, but in a smaller font
+    c \caesura g c
 
-	% \divisioMinima is a simple vertical stroke through the
-	% uppermost staffline, just like the original implementation
-	% of breathing signs.
-	c \divisioMinima g c
+    %% \divisioMinima is a simple vertical stroke through the
+    %% uppermost staffline, just like the original implementation
+    %% of breathing signs.
+    c \divisioMinima g c
 
-	% \divisio{maior,maxima} and \finalis look like bars and are
-	% vertically centered on the staff; the direction property has
-	% no effect
-	c \divisioMaior g c
-	c \divisioMaxima g c
+    %% \divisio{maior,maxima} and \finalis look like bars and are
+    %% vertically centered on the staff; the direction property has
+    %% no effect
+    c \divisioMaior g c
+    c \divisioMaxima g c
 
-	% this one looks almost like a "||" type bar
-	\finalis
-      }
-    }
+    %% this one looks almost like a "||" type bar
+    \finalis
+  }
 }
diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index fd34801eaa..1c6007ba94 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,57 +1,52 @@
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Breathing signs are available in different tastes: commas (default),
 ticks, vees and `railroad tracks' (caesura)."
- }
-
-
-\score {
-
-  {
-    %
-    % Modern notation:
-    %
-    \new Staff {
-       \relative c'' {
-	\key es \major \time 3/4
-
-	% this bar contains no \breathe
-	<<
-	  { g4 as g } \\
-	  { es4 bes es }
-	>> |
-
-	% by default, \breathe uses the rcomma, just as if saying:
-	% \override BreathingSign  #'text =
-	%	#(make-musicglyph-markup "scripts.rcomma")
-	<<
-	  { g4 as g } \\
-	  { es4 \breathe bes es }
-	>> |
-
-	% rvarcomma and lvarcomma are variations of the default rcomma
-	% and lcomma
-
-    	% N.B.: must use Staff context here, since we start a Voice below
-	\override Staff.BreathingSign  #'text =
-		#(make-musicglyph-markup "scripts.rvarcomma")
-	<<
-	  { g4 as g } \\
-	  { es4 \breathe bes es }
-	>> |
-
-	% wedge
-	\override BreathingSign  #'text =
-		 #(make-musicglyph-markup "scripts.upbow")
-	es8 d es f g8 \breathe f |
-
-	% caesura
-	\override BreathingSign  #'text =
-		 #(make-musicglyph-markup "scripts.caesura")
-	es8[ d] \breathe  es[ f g f] |
-	es2 r4 \bar "||" \break
-      }
+}
+
+
+{
+  %% Modern notation:
+  \new Staff {
+    \relative c'' {
+      \key es \major \time 3/4
+
+      %% this bar contains no \breathe
+      <<
+	{ g4 as g } \\
+	{ es4 bes es }
+      >> |
+
+      %% by default, \breathe uses the rcomma, just as if saying:
+      %% \override BreathingSign  #'text =
+				%	#(make-musicglyph-markup "scripts.rcomma")
+      <<
+	{ g4 as g } \\
+	{ es4 \breathe bes es }
+      >> |
+
+      %% rvarcomma and lvarcomma are variations of the default rcomma
+      %% and lcomma
+
+      %% N.B.: must use Staff context here, since we start a Voice below
+      \override Staff.BreathingSign  #'text =
+      #(make-musicglyph-markup "scripts.rvarcomma")
+      <<
+	{ g4 as g } \\
+	{ es4 \breathe bes es }
+      >> |
+
+      %% wedge
+      \override BreathingSign  #'text =
+      #(make-musicglyph-markup "scripts.upbow")
+      es8 d es f g8 \breathe f |
+
+      %% caesura
+      \override BreathingSign  #'text =
+      #(make-musicglyph-markup "scripts.caesura")
+      es8[ d] \breathe  es[ f g f] |
+      es2 r4 \bar "||" \break
     }
   }
 }
diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly
index 5c7dfea2a4..8c253cdaf2 100644
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header{
-texidoc="Property chordChanges: display chord names only when
+  texidoc="Property chordChanges: display chord names only when
 there's a change in the chords scheme, but always display the
 chord name after a line break.
 "
@@ -15,13 +15,11 @@ scheme = \chordmode {
 settings = {
 }
 
-\score {
-    <<
-	\context ChordNames <<
-	    \scheme
-	    \set chordChanges = ##t
-	>>
-	\context Staff \transpose c c' \scheme
-    >>
-    \layout{ raggedright = ##t }
-}
+<<
+  \context ChordNames <<
+    \scheme
+    \set chordChanges = ##t
+  >>
+  \context Staff \transpose c c' \scheme
+>>
+  \layout{ raggedright = ##t }
diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly
index 0aa10be494..2e1f31583d 100644
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -2,7 +2,7 @@
 
 \header {
 
-texidoc = "In ignatzek inversions, a note is dropped down to act as the
+  texidoc = "In ignatzek inversions, a note is dropped down to act as the
 bass note of the chord. Bass note may be also added explicitly.  
 Above the staff: computed chord names. Below staff: entered chord name. 
 "
@@ -11,11 +11,11 @@ Above the staff: computed chord names. Below staff: entered chord name.
 
 
 bladidbla = \chordmode { 
-    f4:maj7/e_":maj7/e" f:maj7/f_":maj7/f" f2:maj7/g_":maj7/g"
-    f4:maj7/+e_":maj7/+e" f:maj7/+f_":maj7/+f" f2:maj7/+g_":maj7/+g"
- }
-
-\score {
-<< \context ChordNames \bladidbla
-  \context Voice \bladidbla >>
+  f4:maj7/e_":maj7/e" f:maj7/f_":maj7/f" f2:maj7/g_":maj7/g"
+  f4:maj7/+e_":maj7/+e" f:maj7/+f_":maj7/+f" f2:maj7/+g_":maj7/+g"
 }
+
+<<
+  \context ChordNames \bladidbla
+  \context Voice \bladidbla
+>>
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index ed1795175f..7958f4cef0 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -6,18 +6,14 @@ texidoc = "Scripts can also be attached to chord elements."
 
 }
 
-\score {
-     \relative c''{
-	< c-.  > 4
-	< c->  > 4
-	< c-. e-. g-. b-. >  
-	< c^^  > 4
-	< c_^  > 4
-	< c_^ e^^ > 4
-	< c_^ e^^ > 4
+\relative c''{
+  < c-.  > 4
+  < c->  > 4
+  < c-. e-. g-. b-. >  
+  < c^^  > 4
+  < c_^  > 4
+  < c_^ e^^ > 4
+  < c_^ e^^ > 4
 
 
-    }
-
 }
-
diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly
index e239281bd4..756c058de2 100644
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -5,12 +5,10 @@
   "
 }
 
-\score {
-  \context Staff  \relative c' {
-    \repeat "tremolo"  2 { c32 e32 }
-    \stemDown
-    \repeat "tremolo"  2 { c32 e32 }
-  }
-  \layout { raggedright = ##t }
+\context Staff  \relative c' {
+  \repeat "tremolo"  2 { c32 e32 }
+  \stemDown
+  \repeat "tremolo"  2 { c32 e32 }
 }
+\layout { raggedright = ##t }
 
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index cab11c2368..c462b7a60f 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -19,12 +19,10 @@ chs =
 }
 
 
-\score{
-    <<
-	\context ChordNames {
-%	#(set-chord-name-style 'ignatzek)
-	\chs
-    }
-	\context Staff  \transpose c c' { \chs }
-    >>
-}
+<<
+  \context ChordNames {
+    %%	#(set-chord-name-style 'ignatzek)
+    \chs
+  }
+  \context Staff  \transpose c c' { \chs }
+>>
diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index 479e53ac7a..5ac0e01d5c 100644
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -7,24 +7,21 @@ higher or lower), and can take any value, including 15 for two octaves."
 
 }
 
-\score { 
+\relative c'' {
 
-	\relative c'' {
-
-	    \clef "G_8"
-	    c4
-	    \clef "G_15"
-	    c4
-	    \clef "G_7"
-	    c4
-	    \clef "G_6"
-	    c4 
-	    \clef "G^8"
-	    c4 
-	    \clef "G^15"
-	    c4 
-	    \clef "G^9"
-	    c4 
+  \clef "G_8"
+  c4
+  \clef "G_15"
+  c4
+  \clef "G_7"
+  c4
+  \clef "G_6"
+  c4 
+  \clef "G^8"
+  c4 
+  \clef "G^15"
+  c4 
+  \clef "G^9"
+  c4 
 }
-	 \layout { raggedright = ##t  }
-	     }
+\layout { raggedright = ##t  }
diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly
index c55590051b..c9744625de 100644
--- a/input/regression/cluster-cross-staff.ly
+++ b/input/regression/cluster-cross-staff.ly
@@ -6,19 +6,17 @@
 
 \version "2.6.0"
 
-\score {
-    \new PianoStaff <<
-    \context Staff = "up"     {
-	s1 *2
-	}
-	\context Staff = "down" <<
-	    \applymusic #notes-to-clusters \relative c  { <c e>4 <f a> <b e> \change Staff = up <e a>
-						     <a d> <d g> }
+\new PianoStaff <<
+  \context Staff = "up"     {
+    s1 *2
+  }
+  \context Staff = "down" <<
+    \applymusic #notes-to-clusters \relative c  { <c e>4 <f a> <b e> \change Staff = up <e a>
+						  <a d> <d g> }
 
-	    { \clef bass s1 * 2 }
-	    >>
+    { \clef bass s1 * 2 }
+  >>
 >>
-    \layout {
-	raggedright= ##t
-    }
+\layout {
+  raggedright= ##t
 }
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index 849f9fcb63..b606591f67 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,22 +1,21 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Clusters are a device to denote that a complete range of
+  texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
 }
 
 fragment = \relative c' {
-         c4 f4 <e d'>4
-         <g a>8 <e a> a4 c2 <d b>4 e4 
-         c4 }
-
-\score {
-  <<
-     \new Staff \fragment
-     \new Staff \applymusic #notes-to-clusters \fragment
-     >>
- \layout { raggedright = ##t }
+  c4 f4 <e d'>4
+  <g a>8 <e a> a4 c2 <d b>4 e4 
+  c4
 }
 
+<<
+  \new Staff \fragment
+  \new Staff \applymusic #notes-to-clusters \fragment
+>>
+  \layout { raggedright = ##t }
+
 
 
diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index e5ad0f8c2b..2e64ede364 100644
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -5,13 +5,9 @@ texidoc = "Single head notes may collide. "
     \layout { raggedright= ##t }
 
 
-\score {
-    
-
-  \context Staff  \transpose c c' <<  
-	{  c4 d e f g2 g4 a | }  \\
-	{ g4 f e g  g2 g2 } 
-  >>
-}
+\context Staff  \transpose c c' <<  
+  {  c4 d e f g2 g4 a | }  \\
+  { g4 f e g  g2 g2 } 
+>>
 
 
diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly
index 7d54d0e522..1e733cec1d 100644
--- a/input/regression/collision-dots-invert.ly
+++ b/input/regression/collision-dots-invert.ly
@@ -5,10 +5,8 @@
     confusion to which notes the dots belong."
 }
 \version "2.6.0"
-\score { 
-   \relative c'' { 
-    << <a c>2\\ { <b d>4 <b d>4 }   >>
-    << { <a c>2 } \\ { <b d>4. <b e>8 } >> 
-  }
-  \layout {  raggedright = ##t } 
-}   
+\relative c'' { 
+  << <a c>2\\ { <b d>4 <b d>4 }   >>
+  << { <a c>2 } \\ { <b d>4. <b e>8 } >> 
+}
+\layout {  raggedright = ##t } 
diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly
index 3f947c1560..dff14ca39e 100644
--- a/input/regression/collision-dots-move.ly
+++ b/input/regression/collision-dots-move.ly
@@ -8,10 +8,8 @@
 
 \layout { raggedright = ##t }
 
-\score {
-   \relative c {
-    \key d \minor
-    \clef bass
-    << <cis a' cis>4 \\ { g'8. bes16} >>
-  }
+\relative c {
+  \key d \minor
+  \clef bass
+  << <cis a' cis>4 \\ { g'8. bes16} >>
 }
diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly
index aae096ba69..78a5c937cd 100644
--- a/input/regression/collision-dots.ly
+++ b/input/regression/collision-dots.ly
@@ -9,14 +9,12 @@
 \layout { raggedright= ##t }
 
 % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down)
-\score{
-        \context Staff  <<
-                \clef "bass"
-		{ b8. c'16 d'4 b8  c'8  d'4 b2 b2  }
-		\\
-		{ b2 b2 b8. a16 g4 b8 a g4 }
-        >>
-}
+\context Staff  <<
+  \clef "bass"
+  { b8. c'16 d'4 b8  c'8  d'4 b2 b2  }
+  \\
+  { b2 b2 b8. a16 g4 b8 a g4 }
+>>
 
 
 
diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 1653b9e8c9..1e463308b3 100644
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,18 +1,16 @@
 \version "2.6.0"
 \header {
-texidoc = "Note heads in collisions should be merged if
+  texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
 "
 
 }
 
 
-\score {
-  \relative c'' {
-c4 
+\relative c'' {
+  c4 
   << { c4 d4 <c d>8  <c d> <c d> } \\  { c4 c <a b>8 <b c> <c d>8 } >>
 }
 \layout {raggedright = ##t} 
-}
 
 
diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index b65d6a3af5..326cb01e2e 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,29 @@
 \version "2.6.0"
 \header {
-    texidoc =
+  texidoc =
 
-    "If @code{merge-differently-headed} is enabled, then
+  "If @code{merge-differently-headed} is enabled, then
 open note heads may be merged with black noteheads, but only
 if the black note heads are from 8th or shorter notes.
 "
-    
+  
 }
 
 \layout { raggedright= ##t }
 
 
-\score {
-    \context Staff  \relative c'' <<
-	{
-	    c2 c8 c4.
-	    
-	    \override Staff.NoteCollision  #'merge-differently-headed = ##t
-	    c2 c8 c4.
-	    c2
-	}\\
-	{
-	    c8 c4. c2
-	    
-	    c8 c4. c2
-	    c4
-	}
-    >>
-}
+\context Staff  \relative c'' <<
+  {
+    c2 c8 c4.
+    
+    \override Staff.NoteCollision  #'merge-differently-headed = ##t
+    c2 c8 c4.
+    c2
+  }\\
+  {
+    c8 c4. c2
+    
+    c8 c4. c2
+    c4
+  }
+>>
diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index b2f4d882ec..e0bfb514f3 100644
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -9,22 +9,20 @@ should not disappear when merging similar note heads."
 
 \layout { raggedright= ##t }
 	
-\score {
-    \context Staff \relative c'' <<
-	{
-	    g8[ g8]
-	    \override Staff.NoteCollision  #'merge-differently-dotted = ##t
-	    g8[ g8]
-	    g4. r8 g8. g16
-	    g8 g4 r8 g4
-	}
-	\\
-	{
-	    g8.[ f16]
-	    g8.[ f16]
-	    g8 g4 r8 g4
-	    g4. r8 g8. g16
-	}
-    >>
-}
+\context Staff \relative c'' <<
+  {
+    g8[ g8]
+    \override Staff.NoteCollision  #'merge-differently-dotted = ##t
+    g8[ g8]
+    g4. r8 g8. g16
+    g8 g4 r8 g4
+  }
+  \\
+  {
+    g8.[ f16]
+    g8.[ f16]
+    g8 g4 r8 g4
+    g4. r8 g8. g16
+  }
+>>
 
diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index a4b6871520..143022e0f2 100644
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -4,11 +4,10 @@
     }
 \version "2.6.0"
 
-\score {
- {
-\relative c'' \new Staff {
+{
+  \relative c'' \new Staff {
     << { d8. e16 } \\ { d8. b16 } >> 
-    }
+  }
 }
 
-\layout { raggedright = ##t }}
+\layout { raggedright = ##t }
diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index a1f49dbe10..ebe885870e 100644
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,35 +1,32 @@
 \version "2.6.0"
 \header {
-texidoc = "Oppositely stemmed chords,  meshing into each other,
+  texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
 }
 
-    \layout { raggedright= ##t }
-
-
-\score {
-  \context Staff  \transpose c c' {
-     \time 3/4
-     % Here's what I was trying to do:
-     <<          {
-         d'4
-         d'4.	 
-	 <a c'>4
-	 <g b g'>4
-	 <g b g'>4.	 	 
-	   }\\ {
-       <g b g'>4
-       <g b g'>4.       
-       <g b d'>4
-       d'4
-       d'4.       
-       }
- >>
-
-  }
+\layout { raggedright= ##t }
+
+
+\context Staff  \transpose c c' {
+  \time 3/4
+  %% Here's what I was trying to do:
+  <<
+    {
+      d'4
+      d'4.	 
+      <a c'>4
+      <g b g'>4
+      <g b g'>4.	 	 
+    } \\ {
+      <g b g'>4
+      <g b g'>4.       
+      <g b d'>4
+      d'4
+      d'4.       
+    }
+  >>
 }
 
 
 
 
-
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index e40250ea8f..dfdcf3f775 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,6 +1,6 @@
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 In addition to normal collision rules, there is support for polyphony, 
 where the collosion are avoided by shifting middle voices horizontally.
 "
@@ -8,45 +8,45 @@ where the collosion are avoided by shifting middle voices horizontally.
 
 
 twovoice =
- \relative c' \context Staff  << 
-	 {  g4 f f e e d d c } 
-\\ {  c4 c  d d e e f f }
+\relative c' \context Staff  << 
+  {  g4 f f e e d d c } 
+  \\ {  c4 c  d d e e f f }
 >>
 
 twovoicechords = \context Staff  <<
- \relative c' {
- e4 d c b a g f
-	}\\
- \relative c' {
-	 <a c>4 <a c>4 <a c>4 <a c>4 <a c>
-		<a c> <a c>  
-	}
+  \relative c' {
+    e4 d c b a g f
+  }\\
+  \relative c' {
+    <a c>4 <a c>4 <a c>4 <a c>4 <a c>
+    <a c> <a c>  
+  }
 >>
 
 
 threevoice = \context Staff  <<
-	 { g4 f e f g a g2 } \\
-	 {  c4 d e d c d es } \\
-	 { e4 e e e e e e e  }
+  { g4 f e f g a g2 } \\
+  {  c4 d e d c d es } \\
+  { e4 e e e e e e e  }
 >>
 
 hairyChord = \context Staff  \relative c''
-    << e \\
-      fis, \\
-      cis' \\
-      \\
-      ais
-      >>
-
-
-\score{
-	 { \transpose c c' {
-	   \twovoice
-	   \twovoicechords
-	   \threevoice   }
-	 \hairyChord
-	}
-	
-%	\midi { \tempo 4:80 }
-}
+<<
+  e \\
+  fis, \\
+  cis' \\
+  \\
+  ais
+>>
+
+
+  {
+    \transpose c c' {
+      \twovoice
+      \twovoicechords
+      \threevoice
+    }
+    \hairyChord
+  }
+  
 
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index 0f716233af..4875d72343 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -8,17 +8,15 @@ Completion heads are not fooled by polyphony with a different rhythm.
 
 }
 
-\score{ 
-	\context Staff  \relative c'' << 
-	    { c2. c bes2 } \\
-	    { c2. a8 g4 f4. g4 f  }
-	>>
+\context Staff  \relative c'' << 
+  { c2. c bes2 } \\
+  { c2. a8 g4 f4. g4 f  }
+>>
 
-	\layout {
-		\context{
-			\Voice
-			\remove "Note_heads_engraver"
-			\consists "Completion_heads_engraver"
-		}
-	}
+\layout {
+  \context{
+    \Voice
+    \remove "Note_heads_engraver"
+    \consists "Completion_heads_engraver"
+  }
 }
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index fc0c5f7df3..96350e3a8e 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -12,17 +12,15 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr
 
 
 
-\score{
-  \relative c'{
+\relative c'{
   \time 2/4
 
   c2. c8 d4 e f g a b c2.. b8 a g16 f4 e d c8. c2 
-  }
-  \layout{
-    \context{
-      \Voice
-      \remove "Note_heads_engraver"
-      \consists "Completion_heads_engraver"
-    }
+}
+\layout{
+  \context{
+    \Voice
+    \remove "Note_heads_engraver"
+    \consists "Completion_heads_engraver"
   }
 }
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 4eeeab929e..26872303a0 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -3,32 +3,30 @@
     texidoc = "Custodes may be engraved in various styles."
 }
 
-\score {
-     {
-	\override Staff.Custos  #'neutral-position = #4
+{
+  \override Staff.Custos  #'neutral-position = #4
 
-	\override Staff.Custos  #'style = #'hufnagel
-	c'1^"hufnagel"
-	\break < d' a' f''>1
+  \override Staff.Custos  #'style = #'hufnagel
+  c'1^"hufnagel"
+  \break < d' a' f''>1
 
-	\override Staff.Custos  #'style = #'medicaea
-	c'1^"medicaea"
-	\break < d' a' f''>1
+  \override Staff.Custos  #'style = #'medicaea
+  c'1^"medicaea"
+  \break < d' a' f''>1
 
-	\override Staff.Custos  #'style = #'vaticana
-	c'1^"vaticana"
-	\break < d' a' f''>1
+  \override Staff.Custos  #'style = #'vaticana
+  c'1^"vaticana"
+  \break < d' a' f''>1
 
-	\override Staff.Custos  #'style = #'mensural
-	c'1^"mensural"
-	\break < d' a' f''>1
-    }
-    \layout {
-	\context {
-	    \Staff
-	    \consists Custos_engraver
-	}
-	raggedright = ##t
-    }
+  \override Staff.Custos  #'style = #'mensural
+  c'1^"mensural"
+  \break < d' a' f''>1
+}
+\layout {
+  \context {
+    \Staff
+    \consists Custos_engraver
+  }
+  raggedright = ##t
 }
 
diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index fb085c1070..27ac159bec 100644
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,19 +1,17 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Dots move to the right when a collision with the (up)flag happens."
+  texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }
 
-\score {
-    \relative c''
-    {
-	\time 8/4
-	\set Staff.autoBeaming = ##f
-	a,16.
-	g''16.
-	a,4. a8 a8. a16. c,16. g16.
-    }
-    \layout { raggedright = ##t}
+\relative c''
+{
+  \time 8/4
+  \set Staff.autoBeaming = ##f
+  a,16.
+  g''16.
+  a,4. a8 a8. a16. c,16. g16.
 }
+\layout { raggedright = ##t}
 
 
diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index 73da210a3f..2e3f902d2f 100644
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -22,23 +22,19 @@ The priorities to print the dots are (ranked in importance):
 
 
 
-\score { 
-  \context Voice \relative c'' {
-    \time 6/8
-	d4. g,,
-    \stemDown
-    <b'' c d e>4.  <f g a b>
-    <f a c> <e a c> <b f' c' g'>
-	
-	
-    <<
-	{ f  <b c> r4.  }\\
-	{ b, <a b> r4. }
-    >>
-	
-	
-  }
-  \layout { }  
-  \midi { }
+\context Voice \relative c'' {
+  \time 6/8
+  d4. g,,
+  \stemDown
+  <b'' c d e>4.  <f g a b>
+  <f a c> <e a c> <b f' c' g'>
+  
+  
+  <<
+    { f  <b c> r4.  }\\
+    { b, <a b> r4. }
+  >>
+  
+  
 }
 
diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 015324f68c..44fc7ee411 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -14,27 +14,27 @@ drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tomm
 timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb} }
 
 \score {
-    \repeat "volta" 2 {
-	<<
-	\new DrumStaff \with {
-	    drumStyleTable = #timbales-style
-	    \override StaffSymbol #'line-count = #2
-	    \override BarLine #'bar-size = #2
-	} <<
-	    \set Staff.instrument = "timbales"
-	    \timb
-	>>
-	\new DrumStaff <<
-	    \set Staff.instrument = "drums"
-	    \new DrumVoice {\stemUp \drh }
-	    \new DrumVoice {\stemDown \drl }
-	>>
+  \repeat "volta" 2 {
+    <<
+      \new DrumStaff \with {
+	drumStyleTable = #timbales-style
+	\override StaffSymbol #'line-count = #2
+	\override BarLine #'bar-size = #2
+      } <<
+	\set Staff.instrument = "timbales"
+	\timb
+      >>
+      \new DrumStaff <<
+	\set Staff.instrument = "drums"
+	\new DrumVoice {\stemUp \drh }
+	\new DrumVoice {\stemDown \drl }
+      >>
     >>
-	}
-    \layout {}
+  }
+  \layout {}
 
-    %% broken:
-    \midi{ \tempo 4=120 }
+  %% broken:
+  \midi{ \tempo 4=120 }
 }
 
 
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index 6c93e03d56..b633c495e1 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -4,12 +4,11 @@
 texidoc = "Broken crescendi should be open on one side."
 }
 
-\score {  \relative c'' { 
-    c1 \< \break c1\!  \> \break c1\!
-  }
-  \layout {
-    linewidth = 4.\cm
-  }
+\relative c'' { 
+  c1 \< \break c1\!  \> \break c1\!
 }
-  
+\layout {
+  linewidth = 4.\cm
+}
+
 
diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 2e1badda31..5e26307271 100644
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -7,16 +7,14 @@ horizontally centered on the note head.  Scripts that should appear
 closer to the note head (staccato, accent) are reckoned with.
 "  }
 
-\score {
-    
-\relative c'' { c1\ff
-		      e,-.-> \f
-		      e \rfz		      
-		      c' \mf
-		      c \mp \> 
-		      c\!\ppppp \< 
-		      c\sfp\!
-		      
-}
+
+\relative c'' {
+  c1\ff
+  e,-.-> \f
+  e \rfz		      
+  c' \mf
+  c \mp \> 
+  c\!\ppppp \< 
+  c\sfp\!
 }
 
diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index 6e9da98953..cc92790ca2 100644
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-texidoc=" Dynamics appear below or above the staff.  If multiple
+  texidoc=" Dynamics appear below or above the staff.  If multiple
 dynamics are linked with (de)crescendi, they should be on the same
 line. Isolated dynamics may be forced up or down.
  "
@@ -9,25 +9,18 @@ line. Isolated dynamics may be forced up or down.
 
 
 
-\score{
 \relative c''{
-a1^\sfz
-a1\fff\> c,,\!\pp a'' a\p
+  a1^\sfz
+  a1\fff\> c,,\!\pp a'' a\p
 
-% We need this to test if we get two Dynamic line spanners
-a
+  %% We need this to test if we get two Dynamic line spanners
+  a
 
-% because do_removal_processing ()
-% doesn't seem to post_process elements
-d\f
+  %% because do_removal_processing ()
+  %% doesn't seem to post_process elements
+  d\f
 
-a
+  a
 
 }
-\layout{
-}
-\midi{
-\tempo 1 = 60
-}
-}
 
diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index efb365df6c..3c5be6ac3b 100644
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -4,10 +4,9 @@
 texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."
 }
 
-\score {  { \context  Voice { 
+\context  Voice { 
   << f''1 { s4 s4 \< s4\! \> s4\! } >>
-}}
+}
 
 \layout { raggedright = ##t}
-}
 
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index 8e756a7363..b618d96365 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -2,39 +2,39 @@
 \version "2.6.0"
 \header {
 
-texidoc = "With the new chord syntax, it is possible to associate
+  texidoc = "With the new chord syntax, it is possible to associate
 fingerings uniquely with notes. This makes it possible to add
 horizontal fingerings to notes.
 
 "
 
 }
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
 
-\score {
-     \relative c'{
-	\set fingeringOrientations = #'(left)
-	< c-1  e-2 g-3 b-5 > 4
 
-	\set fingeringOrientations = #'(down left)
-	< c-1  e-2 g-3 b-5 > 4
+\relative c'{
+  \set fingeringOrientations = #'(left)
+  < c-1  e-2 g-3 b-5 > 4
 
-	\set fingeringOrientations = #'(down left up)
-	< c-1  e-2 g-3 b-5 > 4
+  \set fingeringOrientations = #'(down left)
+  < c-1  e-2 g-3 b-5 > 4
 
-	\once \override Fingering  #'staff-padding = #'()
-	< c-1  e-2 g-3 b-5 > 4
+  \set fingeringOrientations = #'(down left up)
+  < c-1  e-2 g-3 b-5 > 4
 
-	\set fingeringOrientations = #'(up left)
-	< c-1  e-2 g-3 b-5 > 4
+  \once \override Fingering  #'staff-padding = #'()
+  < c-1  e-2 g-3 b-5 > 4
 
-	\set fingeringOrientations = #'(right)
-	< c-1  e-2 g-3 b-5 > 4
+  \set fingeringOrientations = #'(up left)
+  < c-1  e-2 g-3 b-5 > 4
+
+  \set fingeringOrientations = #'(right)
+  < c-1  e-2 g-3 b-5 > 4
 
-    }
 }
 
 
 
 
+
diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 5f4f2fef21..ef3638cf39 100644
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,22 +1,18 @@
-
 \version "2.6.0"
-\header {
 
-texidoc = "Automatic fingering tries to put fingering instructions
+\header {
+  texidoc = "Automatic fingering tries to put fingering instructions
 next to noteheads.
 "
 }
 
-    \layout { raggedright= ##t }
-
+\layout { raggedright= ##t }
 
-\score {
-
- \relative c' {
- c4-4
+\relative c' {
+  c4-4
   <c-1 f-4>
   < c-1 e-2 g-3  b-4 >
-}}
- 
+}
+
 
 
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index 0f2193d5f6..01f862b280 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-       texidoc = "
+  texidoc = "
 The line-spanners connects to the Y position of the note  on the next line.
 When put across line breaks, only the part before the line break is
 printed. 
@@ -9,17 +9,17 @@ printed.
 
 }
 
-\score{
-        \context PianoStaff <<
-	    \set PianoStaff.followVoice = ##t	    
-                \context Staff = "one" \relative c''{
-		    a1 \break
-		    \change Staff=two
-		    a,
-		}
-        \context Staff = "two" { \clef bass \skip 1*2 }
-    >>
-    \layout{
-	raggedright = ##t
-    }
+
+\context PianoStaff <<
+  \set PianoStaff.followVoice = ##t	    
+  \context Staff = "one" \relative c''{
+    a1 \break
+    \change Staff=two
+    a,
+  }
+  \context Staff = "two" { \clef bass \skip 1*2 }
+>>
+\layout{
+  raggedright = ##t
 }
+
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index c685575ff0..763dff70a9 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -4,15 +4,15 @@
 that this does not change variable symbols such as beams or slurs. 
 " }
 
-\score {
- \relative c'' \context Voice {
-\override NoteHead  #'font-magnification = #0.9
-c4
-\override NoteHead  #'font-magnification = #0.8
+
+\relative c'' \context Voice {
+  \override NoteHead  #'font-magnification = #0.9
+  c4
+  \override NoteHead  #'font-magnification = #0.8
 
 
-c4-"normal"
-  % why doesn't this  work?
+  c4-"normal"
+  %% why doesn't this  work?
   c4-\markup \bold \magnify #2.0 "foobar"
 
   \override NoteHead  #'font-magnification = #1.2
@@ -22,6 +22,6 @@ c4-"normal"
   c4
 }
 
-}
+
 
 
diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index 9067e4e866..8aeaf0b7c7 100644
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -2,30 +2,30 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 As a last resort, the placement of grobs can be adjusted manually, by
 setting the @code{extra-offset} of a grob.
 "
 }
 
-\score{
-	\relative c''{
-	    \context Bottom
-	      \applyoutput #(outputproperty-compatibility
-			   (make-type-checker 'note-head-interface)
-			   'extra-offset '(2 . 3))
-	    c2
-	    c
-	    \context Score {
-		\applyoutput #(outputproperty-compatibility (make-type-checker 'mark-interface) 'extra-offset '(-1 . 4))
-	    }
-	    \mark A
-	    d1
-	    \mark \default
-	    e
+
+\relative c''{
+  \context Bottom
+  \applyoutput #(outputproperty-compatibility
+		 (make-type-checker 'note-head-interface)
+		 'extra-offset '(2 . 3))
+  c2
+  c
+  \context Score {
+    \applyoutput #(outputproperty-compatibility (make-type-checker 'mark-interface) 'extra-offset '(-1 . 4))
+  }
+  \mark A
+  d1
+  \mark \default
+  e
 }
 \layout{
-	raggedright = ##t
-}
+  raggedright = ##t
 }
 
+
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index cd3a732650..a0a00cb343 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -2,7 +2,7 @@
 
 \header{
 
-texidoc=" Between notes, there may be simple glissando lines.
+  texidoc=" Between notes, there may be simple glissando lines.
 Here, the first two glissandi are not consecutive.
 
 The engraver does no time-keeping, so it involves some trickery to get
@@ -11,24 +11,20 @@ The engraver does no time-keeping, so it involves some trickery to get
 "
 }
 
-\score{
-        \context Staff = "one" \relative c''{
-		     % gliss non gliss and 
-	     c4 \glissando d e \glissando f \glissando \break
-	     % consecutive 
-	     c \glissando d, \glissando e'
-	      << { \stemUp e8 \glissando g8 }
-	        \context Voice = VB {\stemDown \repeat unfold 4 d16 } >>
-		\override Glissando  #'style = #'zigzag
-		c4 \glissando c,, \glissando c' \glissando d
-    }
-    \layout{
-        linewidth = 50.\mm indent = 0
-	\context{
-	       \Staff
-	       % makes for handier debugging
-	       % \remove Clef_engraver
-	}
-    }
+
+\context Staff = "one" \relative c''{
+				% gliss non gliss and 
+  c4 \glissando d e \glissando f \glissando \break
+				% consecutive 
+  c \glissando d, \glissando e'
+  << { \stemUp e8 \glissando g8 }
+     \context Voice = VB {\stemDown \repeat unfold 4 d16 } >>
+  \override Glissando  #'style = #'zigzag
+  c4 \glissando c,, \glissando c' \glissando d
+}
+\layout{
+  linewidth = 50.\mm indent = 0
+ 
 }
 
+
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 45e471a51d..019500c9f3 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -2,15 +2,15 @@
 \version "2.6.0"
 \header
 {
-    texidoc = "The autobeamer is not confused by grace notes."
+  texidoc = "The autobeamer is not confused by grace notes."
 }
 
-\score{
-  \context Voice \relative c''{
 
-    \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f 
-        \grace a8 g16 f e f |
-  }
-  \layout { raggedright = ##t }
+\context Voice \relative c''{
+
+  \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f 
+  \grace a8 g16 f e f |
 }
+\layout { raggedright = ##t }
+
 
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index 24da46aa5e..86ae1f6826 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,15 +1,15 @@
 
 \version "2.6.0"
 \header {
-texidoc = "Bar line should come before the grace note."
+  texidoc = "Bar line should come before the grace note."
 }
 
-	
 
 
 
-\score  { \relative c' \context Staff  { 
- f1 \grace {  a'16[ f]  } g1 }
-		\layout { raggedright = ##t}
- } 
+
+\relative c' \context Staff  { 
+  f1 \grace {  a'16[ f]  } g1 }
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index 15253f6a62..e6404f02a4 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 \header {
 
-texidoc = "Grace notes do tricky things with timing. If a measure
+  texidoc = "Grace notes do tricky things with timing. If a measure
 starts with a grace note, the measure does not start at 0, but
 earlier. Nevertheless, lily should not get confused. For example, line
 breaks should be possible at grace notes, and the bar number should be
@@ -10,10 +10,10 @@ printed correctly.
 "
 }
 
-\score { \relative c'' { c1 \break
-\grace c8
-c1  }
+\relative c'' { c1 \break
+		\grace c8
+		c1  }
 
 \layout { raggedright = ##t }
-}
+
 
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index c5ab221c82..a909fabf14 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -1,14 +1,19 @@
 
 \header
 {
-texidoc = "Grace beams and normal beams may occur simultaneously.
+  texidoc = "Grace beams and normal beams may occur simultaneously.
 Unbeamed grace notes are not put into normal beams.
 "
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
 
 \version "2.6.0"
-\score { \relative c'' { c4  d8[ \grace {  e32[  d c d] } e8]  e[  e \grace { f16 } e8 e]   }}
+\relative c'' {
+  c4  d8[
+    \grace {  e32[  d c d] } e8]
+  e[  e
+      \grace { f16 } e8 e]
+}
 
diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index 9802a33621..38d21e62a9 100644
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -2,21 +2,20 @@
 \version "2.6.0"
 \header {
 
-    texidoc="@cindex Grace End
+  texidoc="@cindex Grace End
  Grace notes after the last note do not confuse the timing code."
 
 
 }
 
-\score { 
-  \context Voice \relative c' {
-    
-	c4 \grace {  d16[ d16] }
-	
-  }
-	\layout {
-		raggedright = ##t
-	}  
-  \midi { }
+
+\context Voice \relative c' {
+  
+  c4 \grace {  d16[ d16] }
+  
 }
+\layout {
+  raggedright = ##t
+}  
+
 
diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly
index 3d8ccbbe30..a32c24f902 100644
--- a/input/regression/grace-nest.ly
+++ b/input/regression/grace-nest.ly
@@ -1,16 +1,16 @@
 \version "2.6.0"
 \header {
-texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
+  texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
-\score {
-     {
-	c''2 { \grace  b'16  c''2 }  \bar "|."
-    }
-    \layout {
 
-	raggedright = ##t 
-    }
+{
+  c''2 { \grace  b'16  c''2 }  \bar "|."
 }
+\layout {
+
+  raggedright = ##t 
+}
+
 
 
diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly
index faaf23c630..94147c16f4 100644
--- a/input/regression/grace-nest1.ly
+++ b/input/regression/grace-nest1.ly
@@ -1,17 +1,17 @@
 \version "2.6.0"
 \header {
-texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
+  texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
+
+
 
 
-\score{
- 
 
 { c''2 { \grace  b'16  c''2 }  \bar "|." }
-  \layout {
+\layout {
 }
- }
+ 
 
 
diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly
index 8dec2afb89..b60b74773b 100644
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,13 +1,13 @@
 \version "2.6.0"
 \header {
-texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
+  texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {  \context Voice {
-	 { \grace b'8 c''2 }
-       \grace b'16 c''4 c''4 \bar "|."
-    }}
+\context Voice {
+  { \grace b'8 c''2 }
+  \grace b'16 c''4 c''4 \bar "|."
+}
 
diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index 499c16023c..d353f04be4 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,13 +1,13 @@
 \version "2.6.0"
 \header {
-    texidoc = "In nested syntax, graces are still properly handled."
-    }
-    \layout { raggedright= ##t }
-
-\score {  \relative c'' {
-	f1
-    \grace e8 f1
-        << { \grace { e8 } f1 } >>
+  texidoc = "In nested syntax, graces are still properly handled."
 }
+\layout { raggedright= ##t }
+
+\relative c'' {
+  f1
+  \grace e8 f1
+  << { \grace { e8 } f1 } >>
 }
 
+
diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index 84234495cc..a3a2b772cc 100644
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,18 +1,18 @@
 \version "2.6.0"
 \header {
-texidoc = "Also in the nested syntax here, grace notes appear rightly."
+  texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }
 
-\score {  \context Voice \relative c'' {
+\context Voice \relative c'' {
 
-    <<
-     { \grace  g32 f4 }
-    >>
-    \grace c16 c2. \bar "|."
-}
-  \layout { raggedright = ##t }
-	 
+  <<
+    { \grace  g32 f4 }
+  >>
+  \grace c16 c2. \bar "|."
 }
+\layout { raggedright = ##t }
+
+
 
 
 
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 5acb4304dc..6eaf8661a7 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,15 +1,14 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Graces notes may have the same duration as the main note."
-    }
-
-\score
-{  \relative c'' {
-     s2 <f>4
-    \grace g e4
+  texidoc = "Graces notes may have the same duration as the main note."
 }
 
-  \layout { raggedright = ##t }
+\relative c'' {
+  s2 <f>4
+  \grace g e4
 }
 
+\layout { raggedright = ##t }
+
+
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index a54a4d3ac6..b9559399f7 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,21 +1,21 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Grace notes may be put in a @code{partcombine}r."
+  texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
 
 \layout { raggedright= ##t }
 
-\score {
-    \new Staff
-	    \partcombine 
-	      \relative c'' {
-		c4 d e f  \grace f16 g1
-	    }
-	      \relative c' {
-		c4 d e2  g1
-	    }
-	
-    
+
+\new Staff
+\partcombine 
+\relative c'' {
+  c4 d e f  \grace f16 g1
+}
+\relative c' {
+  c4 d e2  g1
 }
 
+
+
+
diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 8f1692f67e..f7dc98fdb6 100644
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,24 +1,24 @@
 \version "2.6.0"
 \header{
-texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
+  texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score{
-  \context PianoStaff  \relative c'' <<
-    \new Staff {
-       r1
-       r1
-       \bar "|."
-    }
-    \new Staff {
-      r1
-      \context Staff {
-	\grace { c16 } c1
-      }
+
+\context PianoStaff  \relative c'' <<
+  \new Staff {
+    r1
+    r1
+    \bar "|."
+  }
+  \new Staff {
+    r1
+    \context Staff {
+      \grace { c16 } c1
     }
-  >> 
-  \layout { }
-}
+  }
+>> 
+\layout { }
+
 
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index 1cb1afd815..cf1bfbd5d5 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,14 +1,14 @@
 
 \version "2.6.0"
 \header {
-texidoc = "Pieces may begin with grace notes."
+  texidoc = "Pieces may begin with grace notes."
 }
-\score  { \relative c' \context Staff  { 
- \grace {  a'16[ f]  } g1
- \bar "||"  % test if | and || are synced.
- \grace {  a16[ bes]  }  c1
- \bar "||"  % test if | and || are synced. 
-  }
-  \layout { raggedright = ##t}
+\relative c' \context Staff  { 
+  \grace {  a'16[ f]  } g1
+  \bar "||"  % test if | and || are synced.
+  \grace {  a16[ bes]  }  c1
+  \bar "||"  % test if | and || are synced. 
 }
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 5b5ffb9f76..c1772b58c7 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,26 +1,26 @@
 
 \version "2.6.0"
 \header{
-texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
+  texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
 true; the two grace beams should be the same here.
 "
 }
 
 
-\score { 
-  \context Voice \relative c {
-    \grace { 
-       f8[ e8] 
-      \override Stem  #'no-stem-extend = ##t
-       f8[ e8] 
-      \revert Stem #'no-stem-extend
-    }
-    a4
-	
+
+\context Voice \relative c {
+  \grace { 
+    f8[ e8] 
+    \override Stem  #'no-stem-extend = ##t
+    f8[ e8] 
+    \revert Stem #'no-stem-extend
   }
-  \layout {
-    raggedright = ##t
-  }  
-  \midi { }
+  a4
+  
 }
+\layout {
+  raggedright = ##t
+}  
+\midi { }
+
 
diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index 1c582d0598..b85ea82973 100644
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -3,15 +3,18 @@
   texidoc = "Grace notes in different voices/staves are synchronized."
 }
 
-\score  {\relative c'' << \context Staff  { c2
-	 \grace  c8
-  c4 c4 }
-		\new Staff { c2 \clef bass
- \grace {  dis8[ ( d8] \key es\major  }
+\relative c'' <<
+  \context Staff  {
+    c2
+				   \grace  c8
+				   c4 c4 }
+  \new Staff {
+    c2 \clef bass
+    \grace {  dis8[ ( d8] \key es\major  }
 
     c4) c4 }
-		\new Staff { c2 c4 c4 \bar "|." }
-		>>
-		\layout { raggedright = ##t}
- } 
+  \new Staff { c2 c4 c4 \bar "|." }
+>>
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index 78befb3543..50b1543a67 100644
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,15 +1,15 @@
 \version "2.6.0"
 \header {
-    texidoc = "When grace notes are entered with unfolded repeats,
+  texidoc = "When grace notes are entered with unfolded repeats,
 line breaks take place before  grace  notes.
 "
 }
-    
 
-\score{
-  \context Voice \relative c'{
-    \repeat unfold  10 {\grace d8 c4 d e f}
 
-  }
+
+\context Voice \relative c'{
+  \repeat unfold  10 {\grace d8 c4 d e f}
+
 }
 
+
diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index f094dedbbf..74e22e4eb9 100644
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -2,18 +2,18 @@
 
 \header {
 
-    texidoc = "A volta repeat may begin with a grace. Consecutive
+  texidoc = "A volta repeat may begin with a grace. Consecutive
     ending and starting repeat bars are merged into one @code{:||:}."
 
-      }
+}
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {\relative c' {
-\repeat volta 2 {
-        c1 
-}
-\repeat volta 2 {
-        \grace {c8 } c4
+\relative c' {
+  \repeat volta 2 {
+    c1 
+  }
+  \repeat volta 2 {
+    \grace {c8 } c4
+  }
 }
-}}
diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index 22ee6e16dd..18117cfc92 100644
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -2,21 +2,21 @@
 
 \header {
 
-    texidoc = "Repeated music can start with grace notes.  Bar checks
+  texidoc = "Repeated music can start with grace notes.  Bar checks
     preceding the grace notes do not cause synchronization effects.  "
 
 }
 
-\score{
-   \relative c''{\key a \minor \time 2/4
-     \repeat "volta" 2 {
-     \grace {  a16[ b] }  c4 c4  |
-     \grace {  d16[ b] } c4 c4 |
-     
-     }
-   }
-   \layout { raggedright = ##t}
- }
+
+\relative c''{\key a \minor \time 2/4
+	      \repeat "volta" 2 {
+		\grace {  a16[ b] }  c4 c4  |
+		\grace {  d16[ b] } c4 c4 |
+		
+	      }
+	    }
+\layout { raggedright = ##t}
+ 
 
 
 
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 4a7efee2ae..f3e465f35c 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -3,7 +3,7 @@
 
 \header{
 
-    texidoc=" You can have beams, notes, chords, stems etc. within a
+  texidoc=" You can have beams, notes, chords, stems etc. within a
 @code{\grace} section.  If there are tuplets, the grace notes will not
 be under the brace.  
 
@@ -12,19 +12,18 @@ Main note scripts do not end up on the grace note.
 "
 }
 
-\score { \context Voice = VA \relative c'' {
-	\grace b8 c4\fermata
-	\grace {  c32[ cis32] } gis4
-	\grace {  cis32[ dis32] } e4
-	\grace {  c32[ d] }\times 2/3 {  c8[ c c] }
-	 \grace {  b32[ ( c32] }   c4)
-	\grace  <c d>16  c8[ c8]
-%	\grace  c16  c8[ c8]
-        %% broken?
-	%%\grace  { \set Grace.graceAlignPosition = \right c16} c4
-	c4 \grace  { c16 } c4
+\context Voice = VA \relative c'' {
+  \grace b8 c4\fermata
+  \grace {  c32[ cis32] } gis4
+  \grace {  cis32[ dis32] } e4
+  \grace {  c32[ d] }\times 2/3 {  c8[ c c] }
+  \grace {  b32[ ( c32] }   c4)
+  \grace  <c d>16  c8[ c8]
+				%	\grace  c16  c8[ c8]
+  %% broken?
+  %%\grace  { \set Grace.graceAlignPosition = \right c16} c4
+  c4 \grace  { c16 } c4
 }
 \layout {raggedright = ##t}
-\midi{ }
-}
+
 
diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly
index 4609eec4d5..2408bbdaac 100644
--- a/input/regression/hairpin-dashed.ly
+++ b/input/regression/hairpin-dashed.ly
@@ -1,13 +1,13 @@
 \version "2.6.0"
 
 \header {
-texidoc ="Hairpin crescendi may be dashed. "
+  texidoc ="Hairpin crescendi may be dashed. "
 
 }
 
-\score {
-     \relative c' {
-	\override Hairpin  #'dash-fraction = #0.4
-	\override Hairpin  #'dash-period = #1
-	f2\< g c1 d4\> b a gis\! }     
-    }
+
+\relative c' {
+  \override Hairpin  #'dash-fraction = #0.4
+  \override Hairpin  #'dash-period = #1
+  f2\< g c1 d4\> b a gis\! }     
+
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index b40dd06c31..182ef9f982 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -16,22 +16,22 @@ This example was done with a pianostaff, which has fixed distance
 alignment; this should not confuse the mechanism.
 "
 	  
-}
+	}
 
 \layout { raggedright= ##t }
 
-	
-\score {  \transpose c c''
- \context PianoStaff <<
-   \new Staff {  c4 c c c \break  s1 \break c4 c c c \break c c c c}
-   \new Staff {  d4 d d d s1 s1 s1 s1 }
-   \new Staff {  e4 e e e s1 e4 e e e s1 }
- >>
- \layout {
+
+\transpose c c''
+\context PianoStaff <<
+  \new Staff {  c4 c c c \break  s1 \break c4 c c c \break c c c c}
+  \new Staff {  d4 d d d s1 s1 s1 s1 }
+  \new Staff {  e4 e e e s1 e4 e e e s1 }
+>>
+\layout {
   \context {
-   \RemoveEmptyStaffContext
+    \RemoveEmptyStaffContext
   }
- }
 }
 
 
+
diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index 8ef7755399..0552b865dd 100644
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -1,6 +1,6 @@
 \header {
 
-texidoc = "Instrument names are set with @code{Staff.instrument} and
+  texidoc = "Instrument names are set with @code{Staff.instrument} and
 @code{Staff.instr}. You can enter markup texts to create more funky names,
 including alterations. "
 
@@ -12,15 +12,15 @@ including alterations. "
 
 textFlat = \markup {\smaller \flat}
 
-\score {
-   \new Staff {
-    \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
-    \set Staff.instr = \markup { \smaller  { "Cl(B" \textFlat ")" } }
 
-    { c''1 \break c'' }
+\new Staff {
+  \set Staff.instrument = \markup { \column { "Clarinetti" \line { "in B" \textFlat } } }
+  \set Staff.instr = \markup { \smaller  { "Cl(B" \textFlat ")" } }
+
+  { c''1 \break c'' }
 
-  }
-  \layout { raggedright = ##t }
 }
+\layout { raggedright = ##t }
+
 
 
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index 6f37d42616..c2781a0680 100644
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,11 +1,11 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Instrument names are also printed on  partial starting measures."
+  texidoc = "Instrument names are also printed on  partial starting measures."
 }
 
-\score {
-   \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 }
-  \layout { raggedright = ##t }
-}
+
+\relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 }
+\layout { raggedright = ##t }
+
 
diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 6dfaf69a08..c767c01acf 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,6 +1,6 @@
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Staff margins are also markings attached to barlines.  They should be
 left of the staff, and be centered vertically with respect to the staff.  
 They may be on normal staves, but also on compound staves, like the 
@@ -8,19 +8,19 @@ PianoStaff.
 "
 }
 
-	
 
 
-\score {
 
-   \context PianoStaff <<
-    \context Staff = "treble"    {
-      \set PianoStaff.instrument = "Piano "
-      \set Staff.instrument = "Right " { c''4 }}
-    \context Staff = "bass" { \set Staff.instrument = "Left " \clef bass c4 }>>
+
+
+\context PianoStaff <<
+  \context Staff = "treble"    {
+    \set PianoStaff.instrument = "Piano "
+    \set Staff.instrument = "Right " { c''4 }}
+  \context Staff = "bass" { \set Staff.instrument = "Left " \clef bass c4 }>>
 
 \layout {
-raggedright = ##t
-}}
+  raggedright = ##t
+}
 
 
diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index f61b5538b0..b4d1ae5477 100644
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -4,25 +4,25 @@
 
 #(set-global-staff-size 16)
 
-\score { 
-  \relative cis' {
-
-% \clef french % same as octaviated bass
-\clef violin
-\key cis \major cis1  \key ces \major ces
-\clef soprano
-\key cis \major cis \key ces \major ces
-\clef mezzosoprano
-\key cis \major cis \key ces \major ces
-\clef alto
-\key cis \major cis \key ces \major ces
-\clef tenor
-\key cis \major cis \key ces \major ces
-\clef baritone
-\key cis \major cis \key ces \major ces
-\clef bass
-\key cis \major cis \key ces \major  ces
-}
 
+\relative cis' {
+
+				% \clef french % same as octaviated bass
+  \clef violin
+  \key cis \major cis1  \key ces \major ces
+  \clef soprano
+  \key cis \major cis \key ces \major ces
+  \clef mezzosoprano
+  \key cis \major cis \key ces \major ces
+  \clef alto
+  \key cis \major cis \key ces \major ces
+  \clef tenor
+  \key cis \major cis \key ces \major ces
+  \clef baritone
+  \key cis \major cis \key ces \major ces
+  \clef bass
+  \key cis \major cis \key ces \major  ces
 }
 
+
+
diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 92442ad027..4a22763491 100644
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,35 +1,35 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
+  texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
     lines can be associated with one melody line. For each lyric line,
     can be tuned whether to follow melismata or not."
-    
+  
 }
 
-\score {
+
 <<
-     \context Voice = "bla" \relative c'' {
-	\autoBeamOff
-	c2( d4) e8[ c b c] f4
-    }
-    \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
-    \lyricsto "bla"  \new Lyrics  {
-	bla 
+  \context Voice = "bla" \relative c'' {
+    \autoBeamOff
+    c2( d4) e8[ c b c] f4
+  }
+  \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
+  \lyricsto "bla"  \new Lyrics  {
+    bla 
 
-	\set ignoreMelismata = ##t
-	
-	blob
+    \set ignoreMelismata = ##t
+    
+    blob
 
-	%% note: effect of ignoreMelismata delayed one time step.
-	\unset ignoreMelismata 
-	blob
-	
-	blob
-    }
+    %% note: effect of ignoreMelismata delayed one time step.
+    \unset ignoreMelismata 
+    blob
     
-    \lyricsto "bla"  \new Lyrics  {
-	nes ted lyrics voice with more words than no tes
-    }
-    >>
-    }
+    blob
+  }
+  
+  \lyricsto "bla"  \new Lyrics  {
+    nes ted lyrics voice with more words than no tes
+  }
+>>
+  
diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index c37280bb58..7234ef1ac6 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,34 +1,34 @@
 \version "2.6.0"
 \header {
 
-texidoc ="Polyphonic rhythms and rests do not disturb
+  texidoc ="Polyphonic rhythms and rests do not disturb
 @code{\lyricsto}."
 
 }
 
-\score {
-     {
-       \clef violin
-       \time 8/8
-       \key des \major
-       <<
-	 \lyricsto "one"  \new Lyrics  {
-	     Do mi nus ex
-	 }
-	   \context Voice = "one" {
-	       \voiceOne
-	       bes'4 bes'4
-	       bes'4 bes'4
-	   }
-	  \context Voice = "two" {
-	      \voiceTwo
-	      ees'8 r8 r8 r8 ees' r8 r8 r8 
-          }
-          \lyricsto "two"  \new Lyrics  {
-	      Do na
-         }
-       >>
+
+{
+  \clef violin
+  \time 8/8
+  \key des \major
+  <<
+    \lyricsto "one"  \new Lyrics  {
+      Do mi nus ex
+    }
+    \context Voice = "one" {
+      \voiceOne
+      bes'4 bes'4
+      bes'4 bes'4
+    }
+    \context Voice = "two" {
+      \voiceTwo
+      ees'8 r8 r8 r8 ees' r8 r8 r8 
     }
-    \layout { raggedright = ##t}
+    \lyricsto "two"  \new Lyrics  {
+      Do na
+    }
+  >>
 }
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index 580e12d5a6..6411e79322 100644
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -2,22 +2,22 @@
 \header
 {
 
-    texidoc = "Lyric extenders run to the end of the line if it
+  texidoc = "Lyric extenders run to the end of the line if it
 continues the next line. Otherwise, it should run to the last note
 of the melisma."
 
 }
 
-\score {
-    << 
-	\context Voice=A  {
-	    a1 ( a1 \break
-	    a) a2( b) \break
-	    a2 
-	}
-	\lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
-    >>
-    \layout {
-	raggedright = ##t
-    }
-}
+
+<< 
+  \context Voice=A  {
+    a1 ( a1 \break
+    a) a2( b) \break
+    a2 
+  }
+  \lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
+>>
+  \layout {
+    raggedright = ##t
+  }
+
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 6aeed0fc3f..f2c94b9412 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -2,34 +2,36 @@
 
 \header {
 
-    texidoc = "Hyphens are print at the beginning of the line only when
+  texidoc = "Hyphens are print at the beginning of the line only when
 they go past the first note. "
 
-    }
+}
 
-\score {
-<<     \new Staff \relative c'' { \time 1/4 c16[ c c  c]
-\time 1/4
-c16[ c c c]
-\time 1/4
-r c16[ c c]
 
-}
-     \new Lyrics \lyricmode {
-	bla16 -- bla -- bla -- bla --
-	bla -- bla -- bla -- bla8 --
-	       bla16 -- bla -- bla 
-       }>>
-    \layout   {
-	indent = 0.0 \cm
-	linewidth = 3.4 \cm
-
-	\context {
-	    \Staff \remove "Time_signature_engraver"
-	}
-	
+<<
+  \new Staff \relative c'' {
+    \time 1/4 c16[ c c  c]
+    \time 1/4
+    c16[ c c c]
+    \time 1/4
+    r c16[ c c]
+
+  }
+  \new Lyrics \lyricmode {
+    bla16 -- bla -- bla -- bla --
+    bla -- bla -- bla -- bla8 --
+    bla16 -- bla -- bla 
+  }
+>>
+  \layout   {
+    indent = 0.0 \cm
+    linewidth = 3.4 \cm
+
+    \context {
+      \Staff \remove "Time_signature_engraver"
     }
-      
-}
+  }
+  
+
 
-	
+  
diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index b54e710b16..d10aa84285 100644
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -3,7 +3,7 @@
 
 \header {
 
-texidoc = "In tightly engraved music, hyphens are removed, except at the
+  texidoc = "In tightly engraved music, hyphens are removed, except at the
 end of the line.  Normally, lyrics are not typeset so tightly, but by
 tuning down @code{padding} of in @code{SeparationItem}, syllables are put 
 closer together, and as a result hyphens may disappear.
@@ -19,38 +19,41 @@ amount
 
 }
 
-\score {
-<<     \new Staff \relative c'' { \time 1/4 c16[ c c  c]
-\time 1/4
-c16[ c c c]
-\time 1/4
-c16[ c c c]
 
-}
-      \new Lyrics \with {
-	% Otherwise lyrics are so far apart that hyphens don't disappear
-	  \override SeparationItem #'padding = #0.0
-      }
-      \lyricmode {
-	  bla -- bla -- bla -- bla --
-	  bla -- bla -- bla -- bla --
-
-	  \override LyricHyphen  #'minimum-length = #0.7
-	  \override LyricHyphen  #'spacing-procedure =
-	  #Hyphen_spanner::set_spacing_rods
-
-	   bla -- bla -- bla -- bla 
-       }>>
-    \layout   {
-	indent = 0.0 \cm
-	linewidth = 3.4 \cm
-
-	\context {
-	    \Staff \remove "Time_signature_engraver"
-	}
-	
+<<
+  \new Staff \relative c'' {
+    \time 1/4 c16[ c c  c]
+    \time 1/4
+    c16[ c c c]
+    \time 1/4
+    c16[ c c c]
+
+  }
+  \new Lyrics \with {
+				% Otherwise lyrics are so far apart that hyphens don't disappear
+    \override SeparationItem #'padding = #0.0
+  }
+  \lyricmode {
+    bla -- bla -- bla -- bla --
+    bla -- bla -- bla -- bla --
+
+    \override LyricHyphen  #'minimum-length = #0.7
+    \override LyricHyphen  #'spacing-procedure =
+    #Hyphen_spanner::set_spacing_rods
+
+    bla -- bla -- bla -- bla 
+  }
+>>
+  \layout   {
+    indent = 0.0 \cm
+    linewidth = 3.4 \cm
+
+    \context {
+      \Staff \remove "Time_signature_engraver"
     }
-      
-}
+    
+  }
+  
+
 
-	
+  
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index 6405262e3e..fe32bef281 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 \header {
 
-texidoc = "
+  texidoc = "
   Normally, the lyric is centered on the note head. However, on
   melismata, the text is left aligned on the left-side of the note head.
 
@@ -9,18 +9,18 @@ texidoc = "
 }
 
 
-\score{
-    <<
-	 \relative c' \context Voice = "bla" {
-	    \autoBeamOff
-	    c4( c16 d c b)  c4
-	    d16[ e f g]
-	    
-	}
-	\lyricsto "bla" \context Lyrics \lyricmode {
-	    alllll __ tijd
-	    izzz
-	}
-    >>
-    \layout { raggedright = ##t }
-}
+
+<<
+  \relative c' \context Voice = "bla" {
+    \autoBeamOff
+    c4( c16 d c b)  c4
+    d16[ e f g]
+    
+  }
+  \lyricsto "bla" \context Lyrics \lyricmode {
+    alllll __ tijd
+    izzz
+  }
+>>
+  \layout { raggedright = ##t }
+
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index bf7b4217fe..ae915d19e5 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,18 +1,18 @@
 \version "2.6.0"
 \header
 {
-    texidoc = "Melismata are triggered by manual beams." 
+  texidoc = "Melismata are triggered by manual beams." 
 }
 
 
-\score {
-    <<
-	\new Staff
-	     \relative c'' {
-		\set Staff.autoBeaming = ##f
-		c8 c8[ c8 c8]  c8    }
-	
-	\lyricsto "" \new Lyrics \lyricmode { bla bla bla }
-    >>
-    \layout { raggedright = ##t }
-}
+
+<<
+  \new Staff
+  \relative c'' {
+    \set Staff.autoBeaming = ##f
+    c8 c8[ c8 c8]  c8    }
+  
+  \lyricsto "" \new Lyrics \lyricmode { bla bla bla }
+>>
+  \layout { raggedright = ##t }
+
diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 3f7d962a95..316f83be00 100644
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -1,43 +1,43 @@
 \header {
 
-    texidoc = "The note markup function may be used to make metronome
+  texidoc = "The note markup function may be used to make metronome
  markings. It works for a variety of flag, dot and duration settings."
 }
 \version "2.6.0"
 
-\score {  { c4^\markup {
-    \note #"1" #1
-    \note #"2" #1
-    \note #"4" #1
-    \note #"8" #1
-    \note #"16" #1
-    \note #"32" #1
-    \note #"64" #1
+{ c4^\markup {
+  \note #"1" #1
+  \note #"2" #1
+  \note #"4" #1
+  \note #"8" #1
+  \note #"16" #1
+  \note #"32" #1
+  \note #"64" #1
 
-    \note #"1" #-1
-    \note #"2" #-1
-    \note #"4" #-1
-    \note #"8" #-1
-    \note #"16" #-1
-    \note #"32" #-1
-    \note #"64" #-1
+  \note #"1" #-1
+  \note #"2" #-1
+  \note #"4" #-1
+  \note #"8" #-1
+  \note #"16" #-1
+  \note #"32" #-1
+  \note #"64" #-1
 
-    \note #"1." #-1
-    \note #"2." #-1
-    \note #"4." #-1
-    \note #"8." #-1
-    \note #"16." #-1
-    \note #"32." #-1
-    \note #"64." #-1
+  \note #"1." #-1
+  \note #"2." #-1
+  \note #"4." #-1
+  \note #"8." #-1
+  \note #"16." #-1
+  \note #"32." #-1
+  \note #"64." #-1
 
-    \note #"1." #1
-    \note #"2." #1
-    \note #"4." #1
-    \note #"8." #1
-    \note #"16." #1
-    \note #"32." #1
-    \note #"64." #1
+  \note #"1." #1
+  \note #"2." #1
+  \note #"4." #1
+  \note #"8." #1
+  \note #"16." #1
+  \note #"32." #1
+  \note #"64." #1
 
 }
 
-} }
+} 
diff --git a/input/regression/markup-scheme.ly b/input/regression/markup-scheme.ly
index 759f7fb086..68568adff2 100644
--- a/input/regression/markup-scheme.ly
+++ b/input/regression/markup-scheme.ly
@@ -1,12 +1,12 @@
 
 \header {
 
-    texidoc = "There is a Scheme macro @code{markup} to produce markup
+  texidoc = "There is a Scheme macro @code{markup} to produce markup
     texts using a similar syntax as @code{\\markup}.
 
 "
 
-    }
+}
 
 %{
 
@@ -15,59 +15,59 @@ For maintenance reasons, we don't excercise the entire markup command set.
 %}
 
 \version "2.6.0"
-\score {
-     {
-        \fatText
-        f'1-\markup {
-            foo
-            \raise #0.2 \hbracket \bold bar
-            \override #'(baseline-skip . 4)
 
-            \bracket \column { baz bazr bla }
-            \hspace #2.0
-            \override #'(font-encoding . fetaMusic) {
-                \lookup #"noteheads-0"
-            }
-            \musicglyph #"accidentals.-1"
-            \combine "X" "+"   
-            \combine "o" "/"
-            \box \column { \line { "string 1" } \line { "string 2" } }
-            \italic Norsk
-            \super "2"
-            \dynamic sfzp
-            \huge { "A" \smaller "A" \smaller \smaller "A"
-                    \smaller \smaller \smaller "A" }
-            \sub "alike"
-        }	
-        \break
-        f'1-#(markup* 
-              "foo"
-              #:raise 0.2 #:hbracket #:bold "bar"
-              #:override '(baseline-skip . 4) 
-              #:bracket #:column ( "baz" "bazr" "bla" )
-              #:hspace 2.0
-              #:override '(font-encoding . fetaMusic) #:line (#:lookup "noteheads-0" 
-                                                       )
-              #:musicglyph "accidentals.-1"
-              #:combine "X" "+"   
-              #:combine "o" "/"
-              #:box #:column ("string 1" "string 2")
-	      " "
-              #:italic "Norsk"
-              #:super "2"
-	      #:circle #:dynamic "p"
-	      " "
-              #:dynamic "sfzp"
-              #:huge #:line ("A" #:smaller "A" #:smaller #:smaller "A" 
-                             #:smaller #:smaller #:smaller "A")
-              #:sub "alike")
-    }
-    \layout { 
-        raggedright = ##t
-        indent = #0
-        \context {
-            \Staff
-            \remove Time_signature_engraver 
-        }
+{
+  \fatText
+  f'1-\markup {
+    foo
+    \raise #0.2 \hbracket \bold bar
+    \override #'(baseline-skip . 4)
+
+    \bracket \column { baz bazr bla }
+    \hspace #2.0
+    \override #'(font-encoding . fetaMusic) {
+      \lookup #"noteheads-0"
     }
+    \musicglyph #"accidentals.-1"
+    \combine "X" "+"   
+    \combine "o" "/"
+    \box \column { \line { "string 1" } \line { "string 2" } }
+    \italic Norsk
+    \super "2"
+    \dynamic sfzp
+    \huge { "A" \smaller "A" \smaller \smaller "A"
+	    \smaller \smaller \smaller "A" }
+    \sub "alike"
+  }	
+  \break
+  f'1-#(markup* 
+	"foo"
+	#:raise 0.2 #:hbracket #:bold "bar"
+	#:override '(baseline-skip . 4) 
+	#:bracket #:column ( "baz" "bazr" "bla" )
+	#:hspace 2.0
+	#:override '(font-encoding . fetaMusic) #:line (#:lookup "noteheads-0" 
+						      )
+	#:musicglyph "accidentals.-1"
+	#:combine "X" "+"   
+	#:combine "o" "/"
+	#:box #:column ("string 1" "string 2")
+	" "
+	#:italic "Norsk"
+	#:super "2"
+	#:circle #:dynamic "p"
+	" "
+	#:dynamic "sfzp"
+	#:huge #:line ("A" #:smaller "A" #:smaller #:smaller "A" 
+		       #:smaller #:smaller #:smaller "A")
+	#:sub "alike")
+}
+\layout { 
+  raggedright = ##t
+  indent = #0
+  \context {
+    \Staff
+    \remove Time_signature_engraver 
+  }
 }
+
diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index 3cc9727e01..5fcb93c510 100644
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,6 +1,11 @@
 \version "2.6.0"
 \header {texidoc="Markup scripts may be stacked."}
 \layout { raggedright = ##t}
-\score {  { c''^\markup { "a" \column { "1" \bold "2"  "3" } } } }
+{
+  c''^\markup {
+    "a"
+    \column { "1" \bold "2"  "3" }
+  }
+} 
 
 
diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index efe2b07671..ec0b6552fc 100644
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,22 +1,22 @@
 
 \header {
 
-    texidoc = "Own markup commands may be defined by using the
+  texidoc = "Own markup commands may be defined by using the
     @code{def-markup-command} scheme macro."
 
 
-      }
+}
 
 \version "2.6.0" % to be updated
 
 #(def-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
-   (interpret-markup paper props (make-simple-markup (string-upcase str))))
-
-\score { 
-     { 
-        c''-\markup \upcase #"hello world"
-        % produces a "HELLO WORLD" markup
-    }
-    \layout { raggedright = ##t }
+  (interpret-markup paper props (make-simple-markup (string-upcase str))))
+
+
+{ 
+  c''-\markup \upcase #"hello world"
+				% produces a "HELLO WORLD" markup
 }
+\layout { raggedright = ##t }
+
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index ef38bdea68..a17a5d0198 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -2,7 +2,7 @@
 \header
 {
 
-    texidoc = "The @code{Measure_grouping_engraver} adds triangles and
+  texidoc = "The @code{Measure_grouping_engraver} adds triangles and
 brackets above beats when the beats of a time signature are grouped.  "
 
 }
@@ -11,23 +11,23 @@ brackets above beats when the beats of a time signature are grouped.  "
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
-\score { 
+
 \context Staff
-	 \relative c' {
-	     #(set-time-signature 2 4) 
-	     c8 a'4 a8~
-	     #(set-time-signature 5 8 '(3 2)) 
-	     a8 bes4 r8 bes8->
-	     \time 2/4
-	     c,8 g'4 g8~
-	     #(set-time-signature 5 8 '(3 2)) 
-	     g8 a4 g a4.->
-	 }
-	 \layout  {
-	     raggedright = ##t
-	     \context { \Staff
-			   \consists "Measure_grouping_engraver"
-			   }
-	     }
-	 }
+\relative c' {
+  #(set-time-signature 2 4) 
+  c8 a'4 a8~
+  #(set-time-signature 5 8 '(3 2)) 
+  a8 bes4 r8 bes8->
+  \time 2/4
+  c,8 g'4 g8~
+  #(set-time-signature 5 8 '(3 2)) 
+  g8 a4 g a4.->
+}
+\layout  {
+  raggedright = ##t
+  \context { \Staff
+	     \consists "Measure_grouping_engraver"
+	   }
+}
+
 
diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index f3956e74c5..fe41d9c350 100644
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -5,327 +5,327 @@
   rhythmical pattern and direction of the melody line."
 }
 
-\score {
-  \context Voice{
-    \clef "petrucci-c4"
-    \set Staff.printKeyCancellation = ##f
-    \cadenzaOn % turn off bar lines
-    #(set-accidental-style 'forget)
 
-    % ligaturae binaria
+\context Voice{
+  \clef "petrucci-c4"
+  \set Staff.printKeyCancellation = ##f
+  \cadenzaOn % turn off bar lines
+  #(set-accidental-style 'forget)
 
-    \[
-      b\breve^\markup { \column { { \bold "ligaturae binaria" } "BL" } }
-      g\longa
+				% ligaturae binaria
+
+  \[
+    b\breve^\markup { \column { { \bold "ligaturae binaria" } "BL" } }
+    g\longa
     \]
 
-    \[
-      g\breve^\markup { "BL" }
-      b\longa
+  \[
+    g\breve^\markup { "BL" }
+    b\longa
     \]
 
-    \[
-      b\longa^\markup { "LL" }
-      g
+  \[
+    b\longa^\markup { "LL" }
+    g
     \]
 
-    \[
-      g\longa^\markup { "LL" }
-      b
+  \[
+    g\longa^\markup { "LL" }
+    b
     \]
 
-    \[
-      b\breve^\markup { "BB" }
-      g
+  \[
+    b\breve^\markup { "BB" }
+    g
     \]
 
-    \[
-      g\breve^\markup { "BB" }
-      b
+  \[
+    g\breve^\markup { "BB" }
+    b
     \]
 
-    \[
-      b\longa^\markup { "LB" }
-      g\breve
+  \[
+    b\longa^\markup { "LB" }
+    g\breve
     \]
 
-    \[
-      g\longa^\markup { "LB" }
-      b\breve
+  \[
+    g\longa^\markup { "LB" }
+    b\breve
     \]
 
-    \[
-      b1^\markup { "SS" }
-      g
+  \[
+    b1^\markup { "SS" }
+    g
     \]
 
-    \[
-      g1^\markup { "SS" }
-      b
+  \[
+    g1^\markup { "SS" }
+    b
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % ligaturae ternariae, quaternariae, etc. (sicut in Apel[1])
+				% ligaturae ternariae, quaternariae, etc. (sicut in Apel[1])
 
-    \[
-      b\breve^\markup {
-	\column { { \bold "ligaturae ternariae, quaternariae, etc." } "BBL" } }
-      a
-      g\longa
+  \[
+    b\breve^\markup {
+      \column { { \bold "ligaturae ternariae, quaternariae, etc." } "BBL" } }
+    a
+    g\longa
     \]
 
-    \[
-      a\breve^\markup { "BBBB" }
-      g
-      a
-      b
+  \[
+    a\breve^\markup { "BBBB" }
+    g
+    a
+    b
     \]
 
-    \[
-      b1^\markup { "SSBBBLB" }
-      a
-      g\breve
-      a
-      b
-      a\longa
-      b\breve
+  \[
+    b1^\markup { "SSBBBLB" }
+    a
+    g\breve
+    a
+    b
+    a\longa
+    b\breve
     \]
 
-    \[
-      a\longa^\markup { "LBMxBL" }
-      g\breve
-      a\maxima
-      b\breve
-      a\longa
+  \[
+    a\longa^\markup { "LBMxBL" }
+    g\breve
+    a\maxima
+    b\breve
+    a\longa
     \]
 
-    \[
-      d'\breve^\markup { "BBBBLL" }
-      c'
-      f
-      d'
-      b\longa
-      g
+  \[
+    d'\breve^\markup { "BBBBLL" }
+    c'
+    f
+    d'
+    b\longa
+    g
     \]
 
-    \[
-      c'1^\markup { "SSBLLBB" }
-      b
-      g\breve
-      d'\longa
-      a
-      c'\breve
-      b
+  \[
+    c'1^\markup { "SSBLLBB" }
+    b
+    g\breve
+    d'\longa
+    a
+    c'\breve
+    b
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % examples from "dtv-Atlas zur Musik" [2]
+				% examples from "dtv-Atlas zur Musik" [2]
 
-    \[
-      d'\breve^\markup { \column { { \bold "dtv-Atlas" } "BBL" } }
-      c'
-      b\longa
+  \[
+    d'\breve^\markup { \column { { \bold "dtv-Atlas" } "BBL" } }
+    c'
+    b\longa
     \]
 
-    \[
-      a\breve^\markup { "BBBL" }
-      b
-      c'
-      d'\longa
+  \[
+    a\breve^\markup { "BBBL" }
+    b
+    c'
+    d'\longa
     \]
 
-    \[
-      b\longa.^\markup { "L.B.BBLBBB" }
-      g\breve.
-      a\breve
-      b
-      c'\longa
-      a\breve
-      b
-      a
+  \[
+    b\longa.^\markup { "L.B.BBLBBB" }
+    g\breve.
+    a\breve
+    b
+    c'\longa
+    a\breve
+    b
+    a
     \]
 
-    \[
-      c'1^\markup { "SSBB" }
-      b
-      g\breve
-      a
+  \[
+    c'1^\markup { "SSBB" }
+    b
+    g\breve
+    a
     \]
 
-    \[
-      b\longa^\markup { "LBL" }
-      a\breve
-      c'\longa
+  \[
+    b\longa^\markup { "LBL" }
+    a\breve
+    c'\longa
     \]
 
-    \[
-      a1^\markup { "SSBL" }
-      b
-      d'\breve
-      c'\longa
+  \[
+    a1^\markup { "SSBL" }
+    b
+    d'\breve
+    c'\longa
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % some ligatures from Ockeghem: Missa De plus en plus
+				% some ligatures from Ockeghem: Missa De plus en plus
 
-    \[
-       c'\maxima^\markup {
-	\column { { \bold "Ockeghem: Missa De plus en plus" } "MxMx" } }
-       g
+  \[
+    c'\maxima^\markup {
+      \column { { \bold "Ockeghem: Missa De plus en plus" } "MxMx" } }
+    g
     \]
 
-    \[
-      d\longa^\markup { "LBBBB" }
-      c\breve
-      f
-      e
-      d
+  \[
+    d\longa^\markup { "LBBBB" }
+    c\breve
+    f
+    e
+    d
     \]
 
-    \[
-      c'\maxima^\markup { "MxL" }
-      d'\longa
+  \[
+    c'\maxima^\markup { "MxL" }
+    d'\longa
     \]
 
-    \[
-      e'\breve^\markup { "BBB" }
-      d'
-      c'
+  \[
+    e'\breve^\markup { "BBB" }
+    d'
+    c'
     \]
 
-    \[
-      b\longa^\markup { "LBBBBB" }
-      c'\breve
-      d'
-      g
-      f
-      g
-   \]
+  \[
+    b\longa^\markup { "LBBBBB" }
+    c'\breve
+    d'
+    g
+    f
+    g
+    \]
 
-    \[
-      g\breve^\markup { "BBBBL" }
-      b
-      c'
-      e'
-      d'\longa
+  \[
+    g\breve^\markup { "BBBBL" }
+    b
+    c'
+    e'
+    d'\longa
     \]
 
-    \[
-      e'1^\markup { "SSB" }
-      a
-      g\breve
+  \[
+    e'1^\markup { "SSB" }
+    a
+    g\breve
     \]
 
-    \[
-      g\longa^\markup { "LLLL" }
-      b
-      c'
-      e'
+  \[
+    g\longa^\markup { "LLLL" }
+    b
+    c'
+    e'
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % some from the Requiem
+				% some from the Requiem
 
-    \[
-      a1^\markup { \column { { \bold "Ockeghem: Requiem" } "SSBBBBBBBL" } }
-      d
-      e\breve
-      f
-      d
-      f
-      e
-      f
-      g
-      e\longa
+  \[
+    a1^\markup { \column { { \bold "Ockeghem: Requiem" } "SSBBBBBBBL" } }
+    d
+    e\breve
+    f
+    d
+    f
+    e
+    f
+    g
+    e\longa
     \]
 
-    \[
-      c'\breve^\markup { "BBBBL" }
-      c
-      d
-      c
-      c'\longa
+  \[
+    c'\breve^\markup { "BBBBL" }
+    c
+    d
+    c
+    c'\longa
     \]
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % crazy ligatures
+				% crazy ligatures
 
-    \[
-      c\breve^\markup { \column { { \bold "crazy ligatures" } "BBBBB" } }
-      e
-      f
-      g
-      bes
+  \[
+    c\breve^\markup { \column { { \bold "crazy ligatures" } "BBBBB" } }
+    e
+    f
+    g
+    bes
     \]
 
-    \[
-      bes\breve^\markup { "BB" }
-      a
+  \[
+    bes\breve^\markup { "BB" }
+    a
     \] % TODO: accidentals must be collected and printed before ligature
 
-    \[
-      a\breve.^\markup { "B.B.B.B.B.B.B.B.B." }
-      g
-      b
-      a
-      e
-      g
-      f
-      a
-      g
-    \]
-
-    \[
-      b^\markup { "B.B." }
-      a
+  \[
+    a\breve.^\markup { "B.B.B.B.B.B.B.B.B." }
+    g
+    b
+    a
+    e
+    g
+    f
+    a
+    g
+    \]
+
+  \[
+    b^\markup { "B.B." }
+    a
     \] % TODO: dots within ligatures must be placed above heads
 
-    \bar "|" \break
+  \bar "|" \break
 
-    % invalid ligatures (those commented out are rejected with explanation)
+				% invalid ligatures (those commented out are rejected with explanation)
 
-    %  \[
-    %    a1^\markup { \column { { \bold "invalid ligatures" } "SS" } }
-    %    as
-    %  \]
+				%  \[
+				%    a1^\markup { \column { { \bold "invalid ligatures" } "SS" } }
+				%    as
+				%  \]
 
-    \[
-      a\breve^\markup { "BBB" }
-      g
-      as
+  \[
+    a\breve^\markup { "BBB" }
+    g
+    as
     \]
 
-    %  \[
-    %    f\longa^\markup { "LLB" }
-    %    g
-    %    f\breve
-    %  \]
+				%  \[
+				%    f\longa^\markup { "LLB" }
+				%    g
+				%    f\breve
+				%  \]
 
-    %  \[
-    %    f\breve^\markup { "BSLB" }
-    %    a1
-    %    g\longa
-    %    a\breve
-    %  \]
-  }
+				%  \[
+				%    f\breve^\markup { "BSLB" }
+				%    a1
+				%    g\longa
+				%    a\breve
+				%  \]
+}
 
-  \layout {
-    raggedright = ##t
-    packed = ##t
-    indent = 0.0
-    \context {
-      \Voice
-      \remove Ligature_bracket_engraver
-      \consists Mensural_ligature_engraver
-    }
+\layout {
+  raggedright = ##t
+  packed = ##t
+  indent = 0.0
+  \context {
+    \Voice
+    \remove Ligature_bracket_engraver
+    \consists Mensural_ligature_engraver
   }
 }
 
+
 % Litterae:
 %
 % [1] Willi Apel: The Notation of Polyphonic Music. 900-1600.
diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index 87729de160..3d0252531b 100644
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -1,16 +1,16 @@
 \version "2.6.0"
 \header {
-    
-texidoc = "There is limited support for mensural notation: note head
+  
+  texidoc = "There is limited support for mensural notation: note head
 shapes are available. Mensural stems are centered on the note heads,
 both for up and down stems."
 
 }
 
 
-\score { { \context Voice { 
-    \override NoteHead  #'style = #'mensural
-\transpose c d'' {  c4 c2 c8  c16 c16  c1 c\breve c\longa }
-\transpose c c' { c4 c2 c8  c16 c16  c1 c\breve c\longa }
-}}}
+{ \context Voice { 
+  \override NoteHead  #'style = #'mensural
+  \transpose c d'' {  c4 c2 c8  c16 c16  c1 c\breve c\longa }
+  \transpose c c' { c4 c2 c8  c16 c16  c1 c\breve c\longa }
+}}
 
diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index 4dc17599d7..fea439b9cc 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -2,17 +2,20 @@
 
 \header {
 
-    texidoc = "Here @code{\\tempo} directives are printed as metronome markings.
+  
+  texidoc = "Here @code{\\tempo} directives are printed as metronome markings.
 
 The marking is left aligned with the time signature, if there is one.
 "
-    
-    }
+  
+}
 
 \version "2.6.0"
 
-\score {  \relative c'' {   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 }
+\relative c'' {
+  \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1
+}
 \layout {  raggedright = ##t }
 
-     }
-	 
+
+
diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index ccd1c3b2ca..39b4b5d491 100644
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 If @code{Score.skipBars} is set,
 the signs for four, two, and one measure rest are combined to
 produce the graphical representation of rests for up to 10 bars.
@@ -11,24 +11,24 @@ The number of bars will be written above the sign.
 }
 
 thenotes =  \relative cis' {
-\set Score.skipBars = ##t
-\time 4/4
-R1 |
-R1*1 |
-R1*2 |
-R1*3 |
-R1*4 |
-R1*5 |
-R1*6 |
-R1*7 |
-R1*8 |
-R1*9 |
-R1*10 |
-R1*11 | 
+  \set Score.skipBars = ##t
+  \time 4/4
+  R1 |
+  R1*1 |
+  R1*2 |
+  R1*3 |
+  R1*4 |
+  R1*5 |
+  R1*6 |
+  R1*7 |
+  R1*8 |
+  R1*9 |
+  R1*10 |
+  R1*11 | 
 }
 
-\score { << \context Staff \thenotes
+<< \context Staff \thenotes
+
+ >>
 
-	>>
-}
 
diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly
index ed7c105936..48fbcbc12a 100644
--- a/input/regression/multi-measure-rest-center.ly
+++ b/input/regression/multi-measure-rest-center.ly
@@ -5,16 +5,16 @@
 
 }
 
-\score {
-    
-    {
-	\set Score.skipBars = ##t
-	\override Staff.BarLine  #'hair-thickness = #7.5
-	\override Staff.MultiMeasureRest  #'hair-thickness = #10
 
-	c'1 R1*20 c'1
-    }
-    \layout { raggedright = ##t} 
+
+{
+  \set Score.skipBars = ##t
+  \override Staff.BarLine  #'hair-thickness = #7.5
+  \override Staff.MultiMeasureRest  #'hair-thickness = #10
+
+  c'1 R1*20 c'1
 }
+\layout { raggedright = ##t} 
+
 	 
 
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 074a19a421..4338e09b2e 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,27 +1,27 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "There are both long and short instrument names.
+  texidoc = "There are both long and short instrument names.
 Engraving instrument names should not be confused by the
 multimeasure rests. "
 
 }
 
-\score{
-    \context Staff <<
-	\set Staff.instrument = "instrument"
-	\set Staff.instr = "instr"
-	{c''1 \break R1 }
-    >>
-    \layout {
-	raggedright = ##t
-	\context {
-	    \Staff
-	    \consists Instrument_name_engraver
-
-	}
-    }
+
+\context Staff <<
+  \set Staff.instrument = "instrument"
+  \set Staff.instr = "instr"
+  {c''1 \break R1 }
+>>
+\layout {
+  raggedright = ##t
+  \context {
+    \Staff
+    \consists Instrument_name_engraver
+
+  }
 }
 
 
 
+
diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 79aa7f0f86..6c359af9f3 100644
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -1,14 +1,14 @@
 \header { texidoc = "The centering of multi-measure rests is
 independent on prefatory matter in other staves."
 
-	  }
+	}
 \version "2.6.0"
 
-\score {
-    << \new Staff  { R1 } 
-     \new Staff { f'1  \clef bass } 
 
-    >>
+<< \new Staff  { R1 } 
+   \new Staff { f'1  \clef bass } 
+
+ >>
+
+   \layout { raggedright = ##t } 
 
-\layout { raggedright = ##t } 
-}
diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly
index 846c954b18..6c23e5eeef 100644
--- a/input/regression/multi-measure-rest-spacing.ly
+++ b/input/regression/multi-measure-rest-spacing.ly
@@ -1,18 +1,18 @@
 \header {
 
-    texidoc = "By setting texts starting with a multi-measure rest, an 
+  texidoc = "By setting texts starting with a multi-measure rest, an 
 extra spacing column is created. This should not cause problems."
-    }
+}
 \version "2.6.0"
 
-\score {
-    <<
-	\set Score.skipBars = ##t
-	\context Staff = "flute"  \new Voice { 
-	    <<  { R1*40 }  { s1*0_"bla" }>> 
-	}
-    >>
-    \layout {
-	raggedright = ##t
-    }
- }
+
+<<
+  \set Score.skipBars = ##t
+  \context Staff = "flute"  \new Voice { 
+    <<  { R1*40 }  { s1*0_"bla" }>> 
+  }
+>>
+  \layout {
+    raggedright = ##t
+  }
+ 
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index b18441831c..2aef498b2e 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -2,7 +2,7 @@
 
 \header  {
 
-texidoc = "
+  texidoc = "
 Texts may be added to the multi-measure rests.
 
 "
@@ -10,7 +10,7 @@ Texts may be added to the multi-measure rests.
 
 }
 
-\score {  {
+{
   \time 3/4
   \set Score.skipBars = ##t
   R2._\markup { \center-align { \musicglyph  #"scripts.dfermata" \roman "Ad lib"  }  }
@@ -19,4 +19,4 @@ Texts may be added to the multi-measure rests.
   R2.*3_\markup { \roman "a1b2c3" }
   R2.*10^"inner"^"top"_"inner"_"bot"
   c'2.
-}}
+}
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 8108fccca0..2afd03cb11 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 \header{
 
-texidoc="
+  texidoc="
 Multi-measure rests do not collide with barlines and clefs.  They
 are not expanded when you set @code{Score.skipBars}.  Although the
 multi-measure-rest is a Spanner, minimum distances are set to keep it
@@ -15,23 +15,23 @@ are used then a different symbol is used.
 }
 
 
-\score {  {
-    \time 3/4 \key cis \major
-    R2.*15
+{
+  \time 3/4 \key cis \major
+  R2.*15
   
-    R2.
-    R2.*3
-    R2.*9
-    R2.*11
+  R2.
+  R2.*3
+  R2.*9
+  R2.*11
 
-\time 8/4 R1*2
+  \time 8/4 R1*2
 }
-	\layout {
-	\context {
-		\Score
-		skipBars = ##t
-	}
-	raggedright = ##t	
-	}
+\layout {
+  \context {
+    \Score
+    skipBars = ##t
+  }
+  raggedright = ##t	
 }
 
+
diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index 3ab61a8168..a3821d8a65 100644
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -1,8 +1,8 @@
 \header {
 
-texidoc =
+  texidoc =
 
-"With @code{music-map}, you can apply functions operating on a single
+  "With @code{music-map}, you can apply functions operating on a single
 piece of music to an entire music expression. In this example, the the
 function @code{notes-to-skip} changes a note to a skip. When applied
 to an entire music expression in the 1st measure, the scripts and
@@ -13,29 +13,29 @@ dynamics are left over. These are put onto the 2nd measure."
 \version "2.6.0"
 
 #(define (notes-to-skip m)
-"Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
+  "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
 Scripts and dynamics are maintained.
 "
   (if (memq 'rhythmic-event (ly:music-property m 'types))
-	(let* ((newmus (make-music 'SkipEvent)))
-		(map
-		  (lambda (x) (ly:music-set-property! newmus (car x) (cdr x)))
-		  (ly:music-mutable-properties m))
-		newmus
-	)
-	m)
+   (let* ((newmus (make-music 'SkipEvent)))
+    (map
+     (lambda (x) (ly:music-set-property! newmus (car x) (cdr x)))
+     (ly:music-mutable-properties m))
+    newmus
+  )
+   m)
 )
 
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
 foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  } 
 
-\score {
-   \relative c''  \context Voice {
-	\foobar
 
-	<< \applymusic #(lambda (x) (music-map notes-to-skip x))
-		\foobar
-	   { d2 d2 } >> 
-}}
+\relative c''  \context Voice {
+  \foobar
+
+  << \applymusic #(lambda (x) (music-map notes-to-skip x))
+     \foobar
+     { d2 d2 } >> 
+}
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index f64cc1c6b3..857bc7410a 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -2,21 +2,21 @@
 \version "2.6.0"
 
 \header{
-    texidoc=" By default, text is set with empty horizontal dimensions.  
+  texidoc=" By default, text is set with empty horizontal dimensions.  
 The boolean property @code{no-spacing-rods} in @code{TextScript} is used
 to control the horizontal size of text.  " }
 
-\score{
-    \relative c''{
-	%% \emptyText
-	%% short for \override TextScript  #'no-spacing-rods = ##t
-	c2_"very wide and long text" c | \break
-	%% short for \override TextScript  #'no-spacing-rods = ##f
-	\fatText
-	c_"very wide and long text" c
-    }
-    \layout {
-	linewidth = 3.0\cm
-    }
+
+\relative c''{
+  %% \emptyText
+  %% short for \override TextScript  #'no-spacing-rods = ##t
+  c2_"very wide and long text" c | \break
+  %% short for \override TextScript  #'no-spacing-rods = ##f
+  \fatText
+  c_"very wide and long text" c
+}
+\layout {
+  linewidth = 3.0\cm
 }
 
+
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index daffbc1d9e..bc63a69bf8 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -3,7 +3,7 @@
 
 \header {
 
-    texidoc = "Note grouping events are used to indicate where
+  texidoc = "Note grouping events are used to indicate where
 analysis brackets start and end.
 
 @cindex bracket
@@ -12,27 +12,27 @@ analysis brackets start and end.
 @cindex analysis
 
 "
-    
+  
 }
 
 
 
-\score {
-    \relative c''
-    {
-	c4\startGroup\startGroup\startGroup
-	c4\stopGroup
-	c4\startGroup
-	c4\stopGroup\stopGroup
-	c4\startGroup
-	c4\stopGroup\stopGroup
-    }
-
-    \layout {
-	\context {
-	    \Staff \consists "Horizontal_bracket_engraver"
-	}
-	raggedright = ##t
-    }
+
+\relative c''
+{
+  c4\startGroup\startGroup\startGroup
+  c4\stopGroup
+  c4\startGroup
+  c4\stopGroup\stopGroup
+  c4\startGroup
+  c4\stopGroup\stopGroup
+}
+
+\layout {
+  \context {
+    \Staff \consists "Horizontal_bracket_engraver"
+  }
+  raggedright = ##t
 }
 
+
diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index 0b245329c8..3e801b2166 100644
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -2,20 +2,20 @@
 \version "2.6.0"
 
 \header {
-    texidoc = "Note heads are flipped on the stem to prevent collisions.
+  texidoc = "Note heads are flipped on the stem to prevent collisions.
 It also works for whole heads that have invisible stems.
 "
 
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {  \relative c''
-	 \context Voice {
-	     <g a c>4
-	     <c d g a>
-	     <c d e >
-	     <c c g>
-	     <c d f g>1
-    }}
+\relative c''
+\context Voice {
+  <g a c>4
+  <c d g a>
+  <c d e >
+  <c c g>
+  <c d f g>1
+}
 
diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly
index 49c3304c41..3c2f405f53 100644
--- a/input/regression/note-head-harmonic.ly
+++ b/input/regression/note-head-harmonic.ly
@@ -1,6 +1,6 @@
 \header
 {
-    texidoc = "  The handling of stems for harmonic notes must be
+  texidoc = "  The handling of stems for harmonic notes must be
    completely identical to normal note heads.
 
   Harmonic heads do not get  dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals."
@@ -8,17 +8,17 @@
 
 \version "2.6.0"
 
-\score {
-  {
-    < c'' f''\harmonic >4
-    \stemUp
-    < c'' f''\harmonic >4.
-    < cis'' fis''\harmonic >8
-    \set Staff.harmonicAccidentals = ##f
-    < dis'' gis''\harmonic >8
-  }
 
-  \layout {
-      raggedright = ##t 
-  }
+{
+  < c'' f''\harmonic >4
+  \stemUp
+  < c'' f''\harmonic >4.
+  < cis'' fis''\harmonic >8
+  \set Staff.harmonicAccidentals = ##f
+  < dis'' gis''\harmonic >8
+}
+
+\layout {
+  raggedright = ##t 
 }
+
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 1416cb7128..5502966297 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,6 +1,6 @@
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Note head shapes may be set from several choices.  
 The stem endings should be adjusted according to the note head.  
 If you want different note head styles on one stem,
@@ -22,67 +22,67 @@ pattern = <<
   }
 >>
 
-\score {
-  \transpose c c {
-    \clef C
 
-    \override Staff.NoteHead  #'style = #'default
-    s1*0^\markup { "default" }
-    \pattern
+\transpose c c {
+  \clef C
 
-    \override Staff.NoteHead  #'style = #'baroque
-    s1*0^\markup { "baroque" }
-    \pattern
+  \override Staff.NoteHead  #'style = #'default
+  s1*0^\markup { "default" }
+  \pattern
 
-    \break
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
 
-    \override Staff.NoteHead  #'style = #'neomensural
-    s1*0^\markup { "neomensural" }
-    \pattern
+  \break
 
-    \override Staff.NoteHead  #'style = #'mensural
-    s1*0^\markup { "mensural" }
-    \pattern
+  \override Staff.NoteHead  #'style = #'neomensural
+  s1*0^\markup { "neomensural" }
+  \pattern
 
-    \break
+  \override Staff.NoteHead  #'style = #'mensural
+  s1*0^\markup { "mensural" }
+  \pattern
 
-    \override Staff.NoteHead  #'style = #'petrucci
-    s1*0^\markup { "petrucci" }
-    \pattern
+  \break
 
-    \override Staff.NoteHead  #'style = #'harmonic
-    s1*0^\markup { "harmonic" }
-    \pattern
+  \override Staff.NoteHead  #'style = #'petrucci
+  s1*0^\markup { "petrucci" }
+  \pattern
 
-    \break
+  \override Staff.NoteHead  #'style = #'harmonic
+  s1*0^\markup { "harmonic" }
+  \pattern
 
-    \override Staff.NoteHead  #'style = #'diamond
-    s1*0^\markup { "diamond" }
-    \pattern
+  \break
 
-    \override Staff.NoteHead  #'style = #'cross
-    s1*0^\markup { "cross" }
-    \pattern
+  \override Staff.NoteHead  #'style = #'diamond
+  s1*0^\markup { "diamond" }
+  \pattern
 
-    \break
+  \override Staff.NoteHead  #'style = #'cross
+  s1*0^\markup { "cross" }
+  \pattern
 
-    \override Staff.NoteHead  #'style = #'xcircle
-    s1*0^\markup { "xcircle" }
-    \pattern
+  \break
 
-    \override Staff.NoteHead  #'style = #'triangle
-    s1*0^\markup { "triangle" }
-    \pattern
+  \override Staff.NoteHead  #'style = #'xcircle
+  s1*0^\markup { "xcircle" }
+  \pattern
 
-    \break
+  \override Staff.NoteHead  #'style = #'triangle
+  s1*0^\markup { "triangle" }
+  \pattern
 
-    \override Staff.NoteHead  #'style = #'slash
-    s1*0^\markup { "slash" }
-    \pattern
-  }
+  \break
 
-  \layout {
-    indent = 0.0
-    raggedright = ##t
-  }
+  \override Staff.NoteHead  #'style = #'slash
+  s1*0^\markup { "slash" }
+  \pattern
 }
+
+\layout {
+  indent = 0.0
+  raggedright = ##t
+}
+
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index fc93175d19..76969d7ee8 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -1,29 +1,29 @@
 \version "2.6.0"
 
 \header {
-texidoc = "Note head lines (e.g. glissando)
+  texidoc = "Note head lines (e.g. glissando)
 run between centers of the note heads."
 }
 
 su = { \change Staff = up}
 sd = { \change Staff = down}
 
-\score {
-    \context PianoStaff
-         <<
-	\context Staff = "up"   {
-            \set PianoStaff.connectArpeggios = ##t
-	    \showStaffSwitch
-	    \clef F
-	    c4 d \sd b a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1
-	}
-	\context Staff = "down" {
-	    \clef F s1*4
-	}
-    >>
-\layout {
+
+\context PianoStaff
+<<
+  \context Staff = "up"   {
+    \set PianoStaff.connectArpeggios = ##t
+    \showStaffSwitch
+    \clef F
+    c4 d \sd b a g8 f16 e32 d \su g2 \glissando a,4 \sd \break a2. \su g4 \glissando f1
+  }
+  \context Staff = "down" {
+    \clef F s1*4
+  }
+>>
+  \layout {
     linewidth = 8.0 \cm
-}
-}
+  }
+
 
 
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 7d1150718f..01bb2d2970 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -2,20 +2,19 @@
 \version "2.6.0"
 
 \header{
-texidoc=" The number of stafflines of a staff can be set.  Ledger
+  texidoc=" The number of stafflines of a staff can be set.  Ledger
 lines both on note heads and rests, as well as barlines, are
 adjusted accordingly.  "
 }
 
-\score { 
+
 \context Voice \relative c {
-	c' c c c | g' g g g 	\bar ":|"
+  c' c c c | g' g g g 	\bar ":|"
+}
+\layout {
+  \context {
+    \Staff
+    \override StaffSymbol #'line-count = #3
   }
-  \layout {
 
-\context { \Staff
-\override StaffSymbol #'line-count = #3
-}  }
-  \midi { }
-}
 
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 177526604b..9a81d74eed 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,7 +1,7 @@
 
 \header
 {
-texidoc = "Ottava brackets are supported, through the
+  texidoc = "Ottava brackets are supported, through the
 use of the scheme function @code{set-octavation}.
 
 The spanner should go below a staff for 8va bassa, and the ottavation
@@ -12,29 +12,29 @@ string can be tuned with @code{Staff.ottavation}.
 }
 \version "2.6.0"
 
-% . There must be a minimum distance between the octavation line and the
-%   topmost staff line, taking into account the height of the closing
-%   vertical dashed line.
-%
-% . Octavation lines broken across staves must always start with `8va'
-%   (or something similar).
-%
-% . The `8va' should be slightl offset to the left.
-%
-% . The final vertical dashed line of the octavation line should be offset
-%   to the right.
-%
-% . Octavation lines for `8va bassa' must be below the staff, not above.
-%
-% . The `8va bassa' string is far too long for short octavation lines.
-%   LilyPond should select between `8va bassa', `8ba', and `8', depending
-%   on the available horizontal space (and the octavation style selected
-%   by the user).  The same holds for `8va' and `15ma'.
+%% . There must be a minimum distance between the octavation line and the
+%%   topmost staff line, taking into account the height of the closing
+%%   vertical dashed line.
+				%
+%% . Octavation lines broken across staves must always start with `8va'
+%%   (or something similar).
+				%
+%% . The `8va' should be slightl offset to the left.
+				%
+%% . The final vertical dashed line of the octavation line should be offset
+%%   to the right.
+				%
+%% . Octavation lines for `8va bassa' must be below the staff, not above.
+				%
+%% . The `8va bassa' string is far too long for short octavation lines.
+%%   LilyPond should select between `8va bassa', `8ba', and `8', depending
+%%   on the available horizontal space (and the octavation style selected
+%%   by the user).  The same holds for `8va' and `15ma'.
 
 
 \layout { raggedright = ##t} 
-\score {
-  \relative c'''  {
+
+\relative c'''  {
   a b c a
   #(set-octavation 1)
   a b c a
@@ -64,5 +64,5 @@ string can be tuned with @code{Staff.ottavation}.
   \set Staff.ottavation = #"8"
   g,,16
 }
-}
+
 
diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly
index 98043ca289..37705ad459 100644
--- a/input/regression/part-combine-global.ly
+++ b/input/regression/part-combine-global.ly
@@ -10,25 +10,25 @@ In the 2nd measure, the pattern without the tie, leads to combined
 voices.
   
 "
-    }
+	}
 \version "2.6.0"
 
 vone =
 
 %%%%%%%%%%%%%%  0   1   2   3  
 \relative c'' {
-    \time 2/4
-    a8[ a]  a8[ a] |
-    a8[ a]  a8[ a]
+  \time 2/4
+  a8[ a]  a8[ a] |
+  a8[ a]  a8[ a]
 }
 
 vtwo =
 \relative c' {
-    \time 2/4
-    f8[ f]~ f8[ f] |
-    f8[ f]  f8[ f]
+  \time 2/4
+  f8[ f]~ f8[ f] |
+  f8[ f]  f8[ f]
 }
 
-\score {
-    \partcombine \vone \vtwo
-    }
+
+\partcombine \vone \vtwo
+
diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly
index 43269c6423..b1c52a68b7 100644
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -1,26 +1,28 @@
 
 \header {
-    texidoc ="The new part combiner stays apart from:
+  texidoc ="The new part combiner stays apart from:
 @itemize @bullet
 @item different durations,
 @item different articulations (taking into account only slur/beam/tie), and
 @item wide pitch ranges.
 @end itemize
 "
-    }
+}
 
 \version "2.6.0"
 
-vone =  \relative a' { g2 g    g  g4 g f' c c( c) c c  c ~ c
-			     c2. c4   c
-			 }
-vtwo =  \relative a' { f2 f4 f f2 g4 g c, f f  f  f f~ f ~ f
-			     f4 f2. ~ f4
+vone =  \relative a' {
+  g2 g    g  g4 g f' c c( c) c c  c ~ c
+  c2. c4   c
+}
+vtwo =  \relative a' {
+  f2 f4 f f2 g4 g c, f f  f  f f~ f ~ f
+  f4 f2. ~ f4
+}
+
 
-			 }
+\partcombine \vone \vtwo
+
+\layout { raggedright = ##t } 
 
-\score {
-   \partcombine \vone \vtwo
-   \layout { raggedright = ##t } 
-}
  
diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly
index ea276c9ce3..49b7aaf6d2 100644
--- a/input/regression/pedal-end.ly
+++ b/input/regression/pedal-end.ly
@@ -1,15 +1,15 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Unterminated piano pedal brackets run to the end of the piece. "
+  texidoc = "Unterminated piano pedal brackets run to the end of the piece. "
 
 }
 
-\score {
-     {
-	\set Staff.pedalSustainStyle = #'bracket
-	c4 \sustainDown
-	\bar "|."
-    }
-    \layout { raggedright  = ##t }
+
+{
+  \set Staff.pedalSustainStyle = #'bracket
+  c4 \sustainDown
+  \bar "|."
 }
+\layout { raggedright  = ##t }
+
diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly
index 549f8d3f81..3231abe87b 100644
--- a/input/regression/pedal-ped.ly
+++ b/input/regression/pedal-ped.ly
@@ -1,21 +1,21 @@
 \version "2.6.0"
 \header
 {
-    texidoc = "The standard piano pedals style comes with Ped symbols.
+  texidoc = "The standard piano pedals style comes with Ped symbols.
 The pedal string can be also tuned, for example, to a shorter tilde/P variant
 at the end of the melody."
 
 }
 
-\score{
-    \context Staff \relative c'{
-        c4 d e f g
-        \sustainDown b c
-        c, d16[  c  c c]  e[ e \sustainUp \sustainDown e e ] f4 \sustainUp 
-        g\sustainDown  b \sustainUp c 
-        \set Staff.pedalSustainStrings = #'("-" "-P" "P")
-        \override Staff.SustainPedal   #'padding = #-2
-        c, \sustainDown d e \sustainUp \sustainDown f
-        \sustainUp g b c
-    }
+
+\context Staff \relative c'{
+  c4 d e f g
+  \sustainDown b c
+  c, d16[  c  c c]  e[ e \sustainUp \sustainDown e e ] f4 \sustainUp 
+  g\sustainDown  b \sustainUp c 
+  \set Staff.pedalSustainStrings = #'("-" "-P" "P")
+  \override Staff.SustainPedal   #'padding = #-2
+  c, \sustainDown d e \sustainUp \sustainDown f
+  \sustainUp g b c
 }
+
diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index 04a4422612..23c7058983 100644
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -2,16 +2,17 @@
 
 \header {
 
-texidoc =" The A is atop an invisible barline. The barline,
+  texidoc =" The A is atop an invisible barline. The barline,
 although invisible, is also translated because it is the last one of
 the break alignment."
-    
+  
 }
 
 \layout { raggedright= ##t }
 
-\score{  {
-a a a a \break
-\mark A
-a a a a}}
+{
+  a a a a \break
+  \mark A
+  a a a a
+}
 
diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index efc765b84c..910b943116 100644
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Distances between prefatory items (e.g. clef, bar,
+  texidoc = "Distances between prefatory items (e.g. clef, bar,
 etc.)  are determined by engraving standards.  These distances depend
 on which items are combined.  Mid-line, the order for clef and
 bar-line is different from the start of line.
@@ -10,16 +10,16 @@ bar-line is different from the start of line.
 
 }
 
-\score {  \relative c'' {
-	\set Staff.instrument = "fobar"
-	\bar "||:"
-	\key cis \major
-	cis4 cis4 cis4 cis4 \clef bass  cis,1
-	\clef treble
-	\bar ":|"
-	\key g \minor
-	c1
+\relative c'' {
+  \set Staff.instrument = "fobar"
+  \bar "||:"
+  \key cis \major
+  cis4 cis4 cis4 cis4 \clef bass  cis,1
+  \clef treble
+  \bar ":|"
+  \key g \minor
+  c1
 }
 \layout  { raggedright = ##t}
-}
+
 
diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly
index 896e633d80..45d8b82ab0 100644
--- a/input/regression/repeat-line-break.ly
+++ b/input/regression/repeat-line-break.ly
@@ -1,21 +1,19 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Across linebreaks, the left edge of a first and second alternative
 bracket should be equal.
 "
 }
 
-    \layout { raggedright= ##t }
-
-\score  {
+\layout { raggedright= ##t }
 
 \context Staff\relative c''  {
-	\repeat "volta" 2 { c1 \break } \alternative { d e }
-	c1
-	\repeat "volta" 2 { c1 } \alternative { { d \break}  e }
+  \repeat "volta" 2 { c1 \break } \alternative { d e }
+  c1
+  \repeat "volta" 2 { c1 } \alternative { { d \break}  e }
 
 }
-}
+
 
diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index 5a6d4361e0..b6bb8f33d0 100644
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -2,17 +2,17 @@
 
 
 \header {
-texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set."
+  texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set."
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
+
+
+\context Staff <<
+  \set Score.skipBars = ##t
+  {
+    \repeat "percent" 2 { g2 a g a }
+  }
+>>
 
-\score {
-     \context Staff <<
-	\set Score.skipBars = ##t
-	 {
-	\repeat "percent" 2 { g2 a g a }
-	}
-     >>
-}
 
diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly
index 0cdf7792f7..a9e2c7f972 100644
--- a/input/regression/repeat-slash.ly
+++ b/input/regression/repeat-slash.ly
@@ -1,16 +1,17 @@
 \version "2.6.0"
 \header {
-texidoc = "Within a bar, beat repeats denote that a music snippet should be
+  texidoc = "Within a bar, beat repeats denote that a music snippet should be
 played again."
 }
 
-\score {  \relative c'
-	 \context Voice { \time 4/4
-   \repeat "percent" 2 { c2 }
+\relative c'
+\context Voice {
+  \time 4/4
+  \repeat "percent" 2 { c2 }
 
-   % the chairman dances
-   \repeat "percent" 2 { g'8 g c, c  }   
-   \repeat "percent" 4 { b8 b8  }
-  }
-	 \layout { raggedright = ##t }
+  %% the chairman dances
+  \repeat "percent" 2 { g'8 g c, c  }   
+  \repeat "percent" 4 { b8 b8  }
 }
+\layout { raggedright = ##t }
+
diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly
index 280bcd014d..2c00727808 100644
--- a/input/regression/repeat-unfold-tremolo.ly
+++ b/input/regression/repeat-unfold-tremolo.ly
@@ -1,27 +1,27 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Unfolding tremolo repeats. All fragments fill one
+  texidoc = "Unfolding tremolo repeats. All fragments fill one
  measure with 16th notes exactly."
 
 }
 
 
-\score{
-    {
-	\time 2/4 
-	\applymusic #unfold-repeats 	
-	{ \repeat tremolo 4 { c'16 e' } |
-	  \repeat tremolo 8 c'16 } |
 
-	\time 3/4 
-	\applymusic #unfold-repeats 	
-	{ \repeat tremolo 6 { c'16 e' } |
-	  \repeat tremolo 12 c'16 } | \bar "|."
-	
-	\bar "|."
+{
+  \time 2/4 
+  \applymusic #unfold-repeats 	
+  { \repeat tremolo 4 { c'16 e' } |
+    \repeat tremolo 8 c'16 } |
 
-	
-    }
-    \layout { raggedright = ##t }  
+  \time 3/4 
+  \applymusic #unfold-repeats 	
+  { \repeat tremolo 6 { c'16 e' } |
+    \repeat tremolo 12 c'16 } | \bar "|."
+  
+  \bar "|."
+
+  
 }
+\layout { raggedright = ##t }  
+
diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly
index 3c95425054..8381b3bf02 100644
--- a/input/regression/repeat-unfold.ly
+++ b/input/regression/repeat-unfold.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 LilyPond has three modes for repeats: folded, unfolded and
 semi-unfolded.  Unfolded repeats are fully written out. Semi unfolded
 repeats have the body written and all alternatives sequentially.
@@ -15,14 +15,14 @@ Unfolded behavior:
 "
 }
 
-\score {
 
-  \context Voice \relative c'' {
-\repeat unfold 3 { c^"3x 0a" d }
-% less alts than body
-\repeat unfold 4 { c^"4x 0a" d } \alternative { e f }
-% more alts than body
-\repeat unfold 2 { c^"2x 3a" d } \alternative { e f g } 
-}}
+
+\context Voice \relative c'' {
+  \repeat unfold 3 { c^"3x 0a" d }
+  %% less alts than body
+  \repeat unfold 4 { c^"4x 0a" d } \alternative { e f }
+  %% more alts than body
+  \repeat unfold 2 { c^"2x 3a" d } \alternative { e f g } 
+}
 
 
diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly
index 0741104b7d..be809379ee 100644
--- a/input/regression/repeat-volta.ly
+++ b/input/regression/repeat-volta.ly
@@ -1,24 +1,21 @@
 \version "2.6.0"
 
 \header{
-texidoc="
+  texidoc="
 Volta (Semi folded) behavior.  Voltas can start on non-barline moments.
 If they don't barlines should still be shown.
 "
 }
 
-%  no alts.
-\score {
-   \context Voice \relative c'' {
-    % repeat non aligning with barlines.
-    \repeat volta 3 { c^"3x 0alt" d e }
-    % less alts than body
-    \repeat volta 4 { c^"4x 2alt" d } \alternative { e f }
-    % more alts than body
-    \repeat volta 2 { c^"2x 3alt" d } \alternative { e f g }
-  }
-  \layout {}
-  \midi {}
+%%  no alts.
+
+\context Voice \relative c'' {
+  %% repeat non aligning with barlines.
+  \repeat volta 3 { c^"3x 0alt" d e }
+  %% less alts than body
+  \repeat volta 4 { c^"4x 2alt" d } \alternative { e f }
+  %% more alts than body
+  \repeat volta 2 { c^"2x 3alt" d } \alternative { e f g }
 }
 
 
diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index b18997db8a..d9cc6e7b12 100644
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -1,37 +1,38 @@
 \header {
-    texidoc = "Rests under beams are only moved if necessary."
+  texidoc = "Rests under beams are only moved if necessary."
 }
 
 \version "2.6.0"
 
 fig =   \relative c' {
-    <a c e>8[ r <c e a> r <e a c> r <a c e>]  r |
+  <a c e>8[ r <c e a> r <e a c> r <a c e>]
+	    r |
 }
 
-			 
-\score {
-   \relative c' \new Staff {
-     \fig 
-      \transpose c c,  \fig
-      \new Voice { \stemUp \transpose c f  \fig }
-      <<
-	  \\
-	  \transpose f c \fig
-      >>
-      
-      <<
-	  { \transpose c c' \fig }
-	  \\
-	  {} 
-      >>
-      
-      << \transpose c c' \fig \\
-	  \transpose f c \fig
-      >>
+  
+
+  \relative c' \new Staff {
+    \fig 
+    \transpose c c,  \fig
+    \new Voice { \stemUp \transpose c f  \fig }
+    <<
+      \\
+      \transpose f c \fig
+    >>
+    
+    <<
+      { \transpose c c' \fig }
+      \\
+      {} 
+    >>
+    
+    << \transpose c c' \fig \\
+       \transpose f c \fig
+     >>
   }
 
   \layout {
-      raggedright = ##t
+    raggedright = ##t
   }
-}
+
 
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index a9fe4453f4..bfbe75b1af 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
 be under beams.  Rests should be move by integral number of spaces
 inside the staff, and by half spaces outside.  Notice that the half
@@ -18,38 +18,38 @@ rests =              {
   r r r  r r r r r r r r r r r r r
 } 
 different = <<  {
-       \relative c'' {
-        r8 a e4 a e
-      }
-    }\\ {
-      
-       \relative c'' {
-        r1
-      }} >>
+  \relative c'' {
+    r8 a e4 a e
+  }
+}\\ {
+  
+  \relative c'' {
+    r1
+  }} >>
 
 scales = \context Staff  <<
-	 {  r1 r2 r2   \scale    c''1 c'2 a'2 \rests  }
-	 \\
-	 { a'1 a'2 d'2 \rests r1 r2 r2  \scale }
+  {  r1 r2 r2   \scale    c''1 c'2 a'2 \rests  }
+  \\
+  { a'1 a'2 d'2 \rests r1 r2 r2  \scale }
 >>
 
 restsII = \context Staff  {
-	r4 r8
-	\context Staff << {  r8 } \\{  r8} >>
-	\context Staff << { r8} r8 \\{  r8} >>
-	\context Staff << { r8} r8 r8 \\ {  r8} >>
-	\context Staff << { r} \\ {  r} >>
-	\context Staff << { r} r\\ { \stemDown r} >>
-	\different	
-	}
-
-\score{
-	 { 
-		\scales 
-		\restsII 
-	}
-	\layout { raggedright = ##t }
-}	
+  r4 r8
+  \context Staff << {  r8 } \\{  r8} >>
+  \context Staff << { r8} r8 \\{  r8} >>
+  \context Staff << { r8} r8 r8 \\ {  r8} >>
+  \context Staff << { r} \\ {  r} >>
+  \context Staff << { r} r\\ { \stemDown r} >>
+  \different	
+}
+
+
+{ 
+  \scales 
+  \restsII 
+}
+\layout { raggedright = ##t }
+	
 
 
 
diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index bf5170cc27..5aa510cc4a 100644
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,23 +1,23 @@
 \version "2.6.0"
 \header {
 
-texidoc = "Rests can have pitches--these will be affected by
+  texidoc = "Rests can have pitches--these will be affected by
 transposition and relativization. If a rest has a pitch, rest/rest and
 beam/rest collision resolving will leave it alone."
 
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score { \relative c'' 
-	 {
-	     a4\rest b4\rest c4\rest
+\relative c'' 
+{
+  a4\rest b4\rest c4\rest
+
+  <<d \\  d\rest^"rest pitch" >>
+  <<d \\  r>>
+  c16 [ d r e] 
+  c16 [ d e\rest^"rest pitch" e] 
+  
+}
 
-	     <<d \\  d\rest^"rest pitch" >>
-	     <<d \\  r>>
-	     c16 [ d r e] 
-	     c16 [ d e\rest^"rest pitch" e] 
-	     
-	 }
-     }
 
diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly
index a2e178899a..b962edcd5e 100644
--- a/input/regression/rest-polyphonic.ly
+++ b/input/regression/rest-polyphonic.ly
@@ -1,18 +1,18 @@
 \header {
 
-    texidoc = "In polyphonic situations, rests are moved down
+  texidoc = "In polyphonic situations, rests are moved down
 even if there is no opposite note or rest. The amount is two
 @code{staff-space}s. "
 
-    }
+}
 
 
 \version "2.6.0"
 
-\score {
-  \new Staff  \relative c' {
-     << { r8 g''4 g8 r g4 g8 } \\
-            { d,4    r   d   r   } >>
-  }
-  \layout { raggedright = ##t }
+
+\new Staff  \relative c' {
+  << { r8 g''4 g8 r g4 g8 } \\
+     { d,4    r   d   r   } >>
 }
+\layout { raggedright = ##t }
+
diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index 79c920f837..ef5f32f6be 100644
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -2,17 +2,17 @@
 
 \header {
 
-    texidoc = "Scripts are put on the utmost head, so they are
+  texidoc = "Scripts are put on the utmost head, so they are
       positioned correctly when there are collisions."
 }
 
-\score  {
- \relative c'' {
+
+\relative c'' {
   c4
   <c d c'>\marcato
   <<  { c4^^ }\\
-     { d4_^ } >>
-    }
+      { d4_^ } >>
+}
 \layout { raggedright = ##t}
-    }
+
 
diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly
index 0e8a02a51e..5114c08ab9 100644
--- a/input/regression/script-stack-order.ly
+++ b/input/regression/script-stack-order.ly
@@ -1,13 +1,13 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Scripts can be stacked. The order is determined by a
+  texidoc = "Scripts can be stacked. The order is determined by a
 priority field, but when objects have the same priority, the input
 order determines the order. Objects specified first are closest to the note.
 "
 }
 
-\score{ \relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" }
-	\layout { raggedright = ##t}
-    } 
+\relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" }
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly
index 6f6ca5ee19..7c85edcd1b 100644
--- a/input/regression/script-stacked.ly
+++ b/input/regression/script-stacked.ly
@@ -3,8 +3,8 @@
 \layout { raggedright= ##t }
 
 \header { 
-texidoc = "Scripts may be stacked."
+  texidoc = "Scripts may be stacked."
 }
 
-\score {  { c'''->-. } }
+{ c'''->-. } 
 
diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index 357a0b5dde..33b48fceb6 100644
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,50 +1,50 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Slurs behave decently when broken across a linebreak.
 "
 }
 
-	
-\score{
-	\context PianoStaff <<
-	\context Staff = "one" \relative c'{
-		\stemUp \slurUp
-		 c4( c \change Staff=two c  c) |
-		\change Staff=one
-		\stemUp \slurUp
-		 c4( c \change Staff=two c  c) |
-		\stemUp \slurUp
-		 c4( c \change Staff=one c  c) |
-		\change Staff=two
-		\stemUp \slurUp
-		 c4( c \change Staff=one c  c) |
-		\change Staff=two
-		\stemUp \slurUp
-		 c4( \change Staff=one c c  c) |
-		r2
-		\change Staff=two
-		\stemUp \slurUp
-		 c4( \change Staff=one c
-		   \break
-		c  c)
-		r2
-%		\stemDown \slurDown
-%		 c4( \change Staff=two c c \change Staff=one  c)
-		\stemDown \slurDown
-		 d4( \change Staff=two c c \change Staff=one  d)
-		\change Staff=two
-		\stemUp \slurUp
-		 c4( \change Staff=one c c \change Staff=two  c)
-		r1
-	}
-	\context Staff = "two" \relative c'{
-		\clef bass
-		s1 s1 s1 s1 s1 s1 s1 s1 s1 s1
-	}
-	>>
-}
+
+
+\context PianoStaff <<
+  \context Staff = "one" \relative c'{
+    \stemUp \slurUp
+    c4( c \change Staff=two c  c) |
+    \change Staff=one
+    \stemUp \slurUp
+    c4( c \change Staff=two c  c) |
+    \stemUp \slurUp
+    c4( c \change Staff=one c  c) |
+    \change Staff=two
+    \stemUp \slurUp
+    c4( c \change Staff=one c  c) |
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c c  c) |
+    r2
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c
+    \break
+    c  c)
+    r2
+    %%		\stemDown \slurDown
+    %%		 c4( \change Staff=two c c \change Staff=one  c)
+    \stemDown \slurDown
+    d4( \change Staff=two c c \change Staff=one  d)
+    \change Staff=two
+    \stemUp \slurUp
+    c4( \change Staff=one c c \change Staff=two  c)
+    r1
+  }
+  \context Staff = "two" \relative c'{
+    \clef bass
+    s1 s1 s1 s1 s1 s1 s1 s1 s1 s1
+  }
+>>
+
 
 
 
diff --git a/input/regression/slur-dash.ly b/input/regression/slur-dash.ly
index 1d3f5333e5..d9e332359d 100644
--- a/input/regression/slur-dash.ly
+++ b/input/regression/slur-dash.ly
@@ -2,22 +2,22 @@
 \header {texidoc = "@cindex Slur, dotted, dashed
 The appearance of slurs may be changed from solid to dotted or dashed.
 "
-} 
-\score{
-	\relative c'{
-		c( d e  c) |
-		\slurDotted
-		c( d e  c) |
-		\slurDashed
-		c( d e  c) |
-		\override Slur #'dash-period = #2.0
-		\override Slur #'dash-fraction = #0.4
-		c( d e  c) |
-		\slurSolid
-		c( d e  c) |
-	}
-	\layout{ raggedright=##t }
+       } 
+
+\relative c'{
+  c( d e  c) |
+  \slurDotted
+  c( d e  c) |
+  \slurDashed
+  c( d e  c) |
+  \override Slur #'dash-period = #2.0
+  \override Slur #'dash-fraction = #0.4
+  c( d e  c) |
+  \slurSolid
+  c( d e  c) |
 }
+\layout{ raggedright=##t }
+
 
 
 
diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index b42c1f8fe5..a51dbe94bf 100644
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -1,16 +1,16 @@
 
 \version "2.6.0"
 \header{
-texidoc="Slurs should not get confused by augmentation dots.  With a lot
+  texidoc="Slurs should not get confused by augmentation dots.  With a lot
 of dots, the problems becomes more visible."
 }
-\score {
-  \relative c'' {
-    c4.............( c)
-  }
-  \layout {
-    raggedright = ##t
-  }
+
+\relative c'' {
+  c4.............( c)
+}
+\layout {
+  raggedright = ##t
 }
 
 
+
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 6bfe231ccb..d9a9d051d6 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -1,26 +1,26 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Slurs should look nice and symmetric.  The curvature may increase
 only to avoid noteheads, and as little as possible.  Slurs never
 run through noteheads or stems.
 "
 }
 
-\score{
-	\relative c''{
-		\time 3/4
-		\slurUp
-		\stemNeutral a ( \stemDown a \stemNeutral  a) a( c  a) a( e'  a,) a( g'  a,)
-		\stemUp a( e'  a,)
-		\break
-		\slurDown
-		\stemNeutral c ( \stemUp c \stemNeutral  c) c ( a  c) c( d,  c') c( f,  c')
-		\stemDown c( f,  c')
-	}
-	\layout{
-		linewidth = 120.\mm
-	}
+
+\relative c''{
+  \time 3/4
+  \slurUp
+  \stemNeutral a ( \stemDown a \stemNeutral  a) a( c  a) a( e'  a,) a( g'  a,)
+  \stemUp a( e'  a,)
+  \break
+  \slurDown
+  \stemNeutral c ( \stemUp c \stemNeutral  c) c ( a  c) c( d,  c') c( f,  c')
+  \stemDown c( f,  c')
+}
+\layout{
+  linewidth = 120.\mm
 }
 
+
diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index 2dcda470eb..1278958aba 100644
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -2,19 +2,19 @@
 \version "2.6.0"
 \header
 {
-    texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
+  texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
 the rest.
 
 "
 }
-\score{   { \stemDown c'4 ( r4  c'2)
+{ \stemDown c'4 ( r4  c'2)
 
-		  \relative c'' { 
-	% Finish with F if played separately 
-	c8-.(   r c,-. r  c4) r4|  }
-		  
+  \relative c'' { 
+    %% Finish with F if played separately 
+    c8-.(   r c,-. r  c4) r4|
+  }
+  
+}
+\layout { raggedright = ##t }
 
-	      }
-\layout { raggedright = ##t}
-    }
 
diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index f3ae544732..fa283c2535 100644
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -18,9 +18,6 @@
 %    #(define debug-slur-scoring #t)
 }
 
-%% help lilypond-book
-%% \score
-
 \relative {
   
     \grace e=''16( d8.[) c16]
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index 0da03ba5b3..844bee9888 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -4,18 +4,18 @@
   texidoc = "Symmetric figures should lead to symmetric slurs."
 }
 
-\score{
-	\relative c''<<
-		\time 4/4
-		\context Staff{
-			f8(f f f) f(g g f) f(a a f) f(b b f)
-		}
-		\new Staff{
-			e,(e e e) e(d d e) e(c c e) e(b b e)
-		}
-	>>
-	\layout{
-		raggedright = ##t
-	}
+
+\relative c''<<
+  \time 4/4
+  \context Staff{
+    f8(f f f) f(g g f) f(a a f) f(b b f)
+  }
+  \new Staff{
+    e,(e e e) e(d d e) e(c c e) e(b b e)
+  }
+>>
+\layout{
+  raggedright = ##t
 }
 
+
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index 29c4fb76f0..a86dc56b5c 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,22 +1,22 @@
 \version "2.6.0"
 \header
 {
-    texidoc = "Symmetric figures should lead to symmetric slurs."
+  texidoc = "Symmetric figures should lead to symmetric slurs."
 
 }
 
-\score{
-	\relative c'<<
-		\time 6/8
-		\context Staff{
-			e8(e e) e(d e) e(c e) e(b e)
-		}
-		\new Staff{
-			f'8(f f) f(g f) f(a f) f(b f)
-		}
-	>>
-	\layout{
-		raggedright = ##t
-	}
+
+\relative c'<<
+  \time 6/8
+  \context Staff{
+    e8(e e) e(d e) e(c e) e(b e)
+  }
+  \new Staff{
+    f'8(f f) f(g f) f(a f) f(b f)
+  }
+>>
+\layout{
+  raggedright = ##t
 }
 
+
diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index a950f7e50b..7b8a3eaae5 100644
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,21 +1,24 @@
 \version "2.6.0"
 
 \header { 
-texidoc = "Accidentals in different staves do not affect the
+  texidoc = "Accidentals in different staves do not affect the
 spacing of the eighth notes here."
 }
 
-\score {  \relative c'' << \new Staff { \time 4/4
+\relative c'' <<
+  \new Staff {
+    \time 4/4
 
- c8[ c8 cis8 cis8]
- cis8[ cis8 cis8 cis]
+    c8[ c8 cis8 cis8]
+    cis8[ cis8 cis8 cis]
+  }
+  {
+    \key d \major cis4 cis4 cis4 cis!4
+  }
+>>
 
+\layout { raggedright = ##t} 
 
- }
-   { \key d \major cis4 cis4 cis4 cis!4  } >>
-
-   \layout { raggedright = ##t} 
- }
 
 
 
diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly
index 3ede19f407..6d89738001 100644
--- a/input/regression/spacing-accidental.ly
+++ b/input/regression/spacing-accidental.ly
@@ -2,17 +2,17 @@
 \version "2.6.0"
 
 \header {
-texidoc = "Accidentals sticking out to the left
+  texidoc = "Accidentals sticking out to the left
 of a note will take a little more space, but only if the spacing is tight." 
 }
 
-\score {  \relative c'' {
-    \time 8/4
-    c2 c2 cis2 cis2 |
-    c8 c8 cis8 cis8 cis c c c]
+\relative c'' {
+  \time 8/4
+  c2 c2 cis2 cis2 |
+  c8 c8 cis8 cis8 cis c c c]
 }
 \layout { raggedright = ##t}
 
-}
+
 
 
diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly
index f74f108954..68cd8d1487 100644
--- a/input/regression/spacing-bar-stem.ly
+++ b/input/regression/spacing-bar-stem.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header {
-texidoc = "Downstem notes following a barline are
+  texidoc = "Downstem notes following a barline are
 printed with some extra space. This is an optical correction similar
 to juxtaposed stems.
 
@@ -11,16 +11,16 @@ Accidentals after the barline get some space as well.
 
 sd = \override Stem  #'direction = #-1
 su = \override Stem  #'direction = #1
-\score { \relative c''
+\relative c''
 {
 
-%\override Staff.StaffSpacing  #'stem-spacing-correction = #10
-%\override Staff.NoteSpacing  #'stem-spacing-correction = #10
+  %%\override Staff.StaffSpacing  #'stem-spacing-correction = #10
+  %%\override Staff.NoteSpacing  #'stem-spacing-correction = #10
 
-\time 1/4 \sd c4 \su c4
-\sd c4 \su c4
-\sd f c,4  c'4 cis4 \stemUp c4
+  \time 1/4 \sd c4 \su c4
+  \sd c4 \su c4
+  \sd f c,4  c'4 cis4 \stemUp c4
 }
 \layout { raggedright = ##t}
-}
+
 
diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index 264ad91cef..468b78624b 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,28 +1,28 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Clef changes at the start of a line get much more space
+  texidoc = "Clef changes at the start of a line get much more space
 than clef changes halfway the line."
 
 }
 
-\score  {  
-    <<
-	\new Staff {
-	    c'2
-	    \clef bass e16 f a
-	    \clef treble b
-	}
-	\new Staff  {
-	    c'4 c'4 c'4 
-	}
-    >>
-    \layout {
-	raggedright = ##t
-	\context {
-	    \Staff
-	    \remove Time_signature_engraver
-	}
+
+<<
+  \new Staff {
+    c'2
+    \clef bass e16 f a
+    \clef treble b
+  }
+  \new Staff  {
+    c'4 c'4 c'4 
+  }
+>>
+  \layout {
+    raggedright = ##t
+    \context {
+      \Staff
+      \remove Time_signature_engraver
     }
-}
+  }
+
 
diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly
index ba53ee3b04..093545241e 100644
--- a/input/regression/spacing-end-of-line.ly
+++ b/input/regression/spacing-end-of-line.ly
@@ -1,19 +1,18 @@
 
 \version "2.6.0"
 \header {
-    
-    texidoc ="Broken engraving of a bar at the end of a line does not upset 
+  
+  texidoc ="Broken engraving of a bar at the end of a line does not upset 
     the space following rests and notes."  }
 
-\score
-{
- \relative c' {
-    c2.. r8
-    c2.. r8
-    \time 3/4 \break
-    e2 e4 | e2 e4 \time 4/4 \break
+
+\relative c' {
+  c2.. r8
+  c2.. r8
+  \time 3/4 \break
+  e2 e4 | e2 e4 \time 4/4 \break
 }
 \layout {
-    raggedright = ##t }  
-}
+  raggedright = ##t }  
+
 
diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly
index 69bb65ac5a..6ceab62b6b 100644
--- a/input/regression/spacing-ended-voice.ly
+++ b/input/regression/spacing-ended-voice.ly
@@ -2,20 +2,20 @@
 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."
-}
+	}
 
 
-	\score {
- {  \context Staff \relative c' {
+
+{  \context Staff \relative c' {
   c4
   <<
-      { r4 dis'4 } \\
-      { r4 fis,4 } \\
-      { r bis } \\
-      { s gis }
+    { r4 dis'4 } \\
+    { r4 fis,4 } \\
+    { r bis } \\
+    { s gis }
   >>
   c4
 }}
-  \layout { raggedright = ##t }
-}
+\layout { raggedright = ##t }
+
 
diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly
index 9a87bec584..ccda67c403 100644
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -2,22 +2,22 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Spacing uses the duration of the notes, but disregards
+  texidoc = "Spacing uses the duration of the notes, but disregards
     grace notes for this. In this example, the 8ths around the grace
     are spaced exactly as the other 8th notes.
 
 "
 }
 
-\score {  \relative c''
-	 \context Voice 
+\relative c''
+\context Voice 
 {
-     c8[  c8]
-    \grace {  b16 }
-     c8[ c8]  c8[ c8] 
+  c8[  c8]
+  \grace {  b16 }
+  c8[ c8]  c8[ c8] 
 
 }
 
-	 \layout { raggedright = ##t}
-}
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly
index d40cf5e185..82553d1c4f 100644
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -3,10 +3,10 @@
 \header {
   texidoc = "Grace note spacing.  "
 }
-	
-\score {
-  \context Voice \relative c'' { \grace {  c16[ d] } c4 }
-  \layout { raggedright = ##t}
 
-}
+
+\context Voice \relative c'' { \grace {  c16[ d] } c4 }
+\layout { raggedright = ##t}
+
+
 
diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly
index 84685090f8..442f78c445 100644
--- a/input/regression/spacing-knee.ly
+++ b/input/regression/spacing-knee.ly
@@ -1,22 +1,22 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "For knees, the spacing correction is such that the
+  texidoc = "For knees, the spacing correction is such that the
 stems are put at regular distances. This effect takes into account the
 width of the note heads and the thickness of the stem.
 "
-    }
-\score { 
+}
+
 {
- g''8[ g g'' g''] 
+  g''8[ g g'' g''] 
 
- % check code independent of default settings.
- \override NoteSpacing  #'knee-spacing-correction = #1.0 
- g''8[ g g'' g''] 
- \override Stem  #'thickness = #10 
- g''8[ g g'' g''] 
-    }
+				% check code independent of default settings.
+  \override NoteSpacing  #'knee-spacing-correction = #1.0 
+  g''8[ g g'' g''] 
+  \override Stem  #'thickness = #10 
+  g''8[ g g'' g''] 
+}
 \layout { raggedright = ##t}
-     }
+
 
 
diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index dc0293b058..d0edc43d1a 100644
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -1,21 +1,21 @@
 
 \header {
 
-texidoc = "The flags of 8th notes take some space, but not
+  texidoc = "The flags of 8th notes take some space, but not
     too much: the space following a flag is less than the space
     following a beamed 8th head."
 
 }
 
-\score {  \relative c'' \context Staff {
-    \set autoBeaming = ##f
-    a8[ a8 a8 a8]
-    a8 a8 a8 a8
+\relative c'' \context Staff {
+  \set autoBeaming = ##f
+  a8[ a8 a8 a8]
+  a8 a8 a8 a8
 }
 \layout {
-raggedright = ##t
-    }
-     }
+  raggedright = ##t
+}
+
 
 \version "2.6.0"
 
diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index 9ee437acdb..439b7736ed 100644
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,17 +1,17 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Rests get a little less space, since they are narrower.
+  texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this 
 effect to be very small.
 "
-    }
-\score {  \relative c'' \context Staff {
-    \time 12/4
-    r4 c4 c4 c4 r4 r4 c4
+}
+\relative c'' \context Staff {
+  \time 12/4
+  r4 c4 c4 c4 r4 r4 c4
 }
 \layout {
-raggedright = ##t
-    }
-     }
+  raggedright = ##t
+}
+
 
diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly
index d68e754956..d6f5243ac5 100644
--- a/input/regression/spacing-short-notes.ly
+++ b/input/regression/spacing-short-notes.ly
@@ -1,8 +1,8 @@
 
 \version "2.6.0"
 \header {
-    
-texidoc = "Notes that are shorter than the common shortest note get a
+  
+  texidoc = "Notes that are shorter than the common shortest note get a
 space (i.e. without the space needed for the note) proportional to
 their duration. So, the 16th notes get 1/2 of the space of an eigth note.
 The total distance for a 16th (which includes note head) is 3/4 of the
@@ -10,16 +10,16 @@ eighth note. "
 
 }
 
-\score {  \relative c''
+\relative c''
 {
-    \time 2/4 
-    c16 c c c c4 c4
-    c8 c8 c8 c8
-    c8 c8 c4
-    c8 c8 c4
+  \time 2/4 
+  c16 c c c c4 c4
+  c8 c8 c8 c8
+  c8 c8 c4
+  c8 c8 c4
 
 }
 
-	 \layout { raggedright = ##t}
-}
+\layout { raggedright = ##t}
+
 
diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly
index 82fbbbc6c4..52086b9374 100644
--- a/input/regression/spacing-stem-bar.ly
+++ b/input/regression/spacing-stem-bar.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 \header {
 
-texidoc = "Upstem notes before a barline are printed with some extra
+  texidoc = "Upstem notes before a barline are printed with some extra
 space. This is an optical correction similar to juxtaposed stems.
 "
 
@@ -10,20 +10,20 @@ space. This is an optical correction similar to juxtaposed stems.
 
 sd = \override Stem  #'direction = #-1
 su = \override Stem  #'direction = #1
-\score { \relative e'
+\relative e'
 {
 
-%\override Staff.StaffSpacing  #'stem-spacing-correction = #0.5
-%\override Staff.NoteSpacing  #'stem-spacing-correction = #0.5
+				%%\override Staff.StaffSpacing  #'stem-spacing-correction = #0.5
+				%%\override Staff.NoteSpacing  #'stem-spacing-correction = #0.5
 
-\time 3/8
-\su
-e8 e e
-f f f
-a a a
-c c c
-e e e
+  \time 3/8
+  \su
+  e8 e e
+  f f f
+  a a a
+  c c c
+  e e e
 }
 \layout { raggedright = ##t}
-}
+
 
diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly
index 3b5c052623..1bfeb562f9 100644
--- a/input/regression/spacing-stem-direction.ly
+++ b/input/regression/spacing-stem-direction.ly
@@ -3,7 +3,7 @@
 
 \header{
 
-texidoc="
+  texidoc="
 
 There are optical corrections to the spacing of stems. The overlap between 
 two adjacent stems of different direction is used as a measure for how
@@ -11,15 +11,15 @@ much to correct."
 
 }
 
-\score { 
-  \context Voice \relative c {
-  % make sure neutral is down.
-    \override Stem  #'neutral-direction = #-1
-	\time 16/4  c''4 c c,  c' d, c' e, c' f, c' g c a c b c
-	
-  }
-  \layout {
-    raggedright = ##t
-  }  
+
+\context Voice \relative c {
+  %% make sure neutral is down.
+  \override Stem  #'neutral-direction = #-1
+  \time 16/4  c''4 c c,  c' d, c' e, c' f, c' g c a c b c
 }
 
+\layout {
+  raggedright = ##t
+}  
+
+
diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index 0a3ce37afb..464940b86e 100644
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -1,17 +1,17 @@
 
 \version "2.6.0"
 \header {
-	texidoc = "For juxtaposed chords with the same direction, a
+  texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and works only if
 two chords have no common head-positions range."
 }
 
-\score {  \relative c'' {
-\stemDown
-\time 12/4
+\relative c'' {
+  \stemDown
+  \time 12/4
   f8[
-      e f e]  f[ d f d]  f[ c f c]  f[ b, f' b,]  f'[ a, f' a,]
+    e f e]  f[ d f d]  f[ c f c]  f[ b, f' b,]  f'[ a, f' a,]
 }
 \layout { raggedright = ##t}
-}
+
 
diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly
index 176f0de002..5d9308f599 100644
--- a/input/regression/spacing-to-grace.ly
+++ b/input/regression/spacing-to-grace.ly
@@ -2,21 +2,21 @@
 \version "2.6.0"
 \header {
 
-    texidoc ="Space from a normal note (or barline) to a grace note is
+  texidoc ="Space from a normal note (or barline) to a grace note is
     smaller than to a normal note."
-    
+  
 }
 
-\score {
-    \context Voice 
-    { \time 2/4
-      \relative c'' {
-	  e8 e \grace d8 e e \grace f8 e es, d' d
-	  e8 e e e \grace { \stemDown f8 \stemNeutral } e es, d'
 
-		  }  
+\context Voice 
+{ \time 2/4
+  \relative c'' {
+    e8 e \grace d8 e e \grace f8 e es, d' d
+    e8 e e e \grace { \stemDown f8 \stemNeutral } e es, d'
+
+  }  
+
+}
+\layout { raggedright = ##t}
 
-    }
-    \layout { raggedright = ##t}
-    }
 
diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly
index 3554c2d483..793ec60ee6 100644
--- a/input/regression/span-bar-break.ly
+++ b/input/regression/span-bar-break.ly
@@ -2,18 +2,18 @@
 
 \header {
 
-    texidoc = "At the beginning of a system, the @code{|:} repeat
+  texidoc = "At the beginning of a system, the @code{|:} repeat
 barline is drawn between the staves, but the @code{:|} is not."
 
-      }
-
-\score {
- \new PianoStaff <<
-    \context Staff = "up" {
-	\bar "|:" r1
-	\bar ":|" \break r1
-    }
-    \context Staff = "down" { r r }
-  >>
-  \layout{ raggedright = ##t }
 }
+
+
+\new PianoStaff <<
+  \context Staff = "up" {
+    \bar "|:" r1
+    \bar ":|" \break r1
+  }
+  \context Staff = "down" { r r }
+>>
+\layout{ raggedright = ##t }
+
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 0a3a8453c8..dbd9b2da0f 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -9,32 +9,32 @@ between systems.
 "
 }
 
-\score {
-   \relative c' \new StaffGroup <<
-    \new Staff {
-      \override Score.BarLine #'transparent = ##t
-      a1 a1
-      \revert Score.BarLine #'transparent
-      \override Score.SpanBar #'transparent = ##t
-      a1 a1
-    }
-    \lyricmode <<
-      \new Lyrics { bla1 die bla }
-      \new Lyrics { foo bar foo }
-    >>
-    \new Staff {
-      f1 f1 f1 f1
-    }
+
+\relative c' \new StaffGroup <<
+  \new Staff {
+    \override Score.BarLine #'transparent = ##t
+    a1 a1
+    \revert Score.BarLine #'transparent
+    \override Score.SpanBar #'transparent = ##t
+    a1 a1
+  }
+  \lyricmode <<
+    \new Lyrics { bla1 die bla }
+    \new Lyrics { foo bar foo }
   >>
-  \layout {
-    \context {
-      \Staff
-    }
-    raggedright =##t 
+  \new Staff {
+    f1 f1 f1 f1
   }
+>>
+\layout {
+  \context {
+    \Staff
+  }
+  raggedright =##t 
 }
 
 
+
 %% Local variables:
 %% LilyPond-indent-level:2
 %% End:
diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index 44611e7fdb..bca8c63bae 100644
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -3,21 +3,21 @@
 
 \header{
 
-    texidoc=" The staccato dot (and all scripts with follow-into-staff
+  texidoc=" The staccato dot (and all scripts with follow-into-staff
 set) must not be on staff lines. The staccato dot is close to the
 notehead. If the head is in a space, then the dot is in the space next
 to it.  "
 
 }
 
-\score { 
-    \context Voice \relative c' {
-	e'4-. f-. g-. d-. c-. b-.
-	\stemDown
-	e,-. d-. c-. b-. a-. g-.    
-    }
-    \layout {
-	raggedright = ##t
-    }  
+
+\context Voice \relative c' {
+  e'4-. f-. g-. d-. c-. b-.
+  \stemDown
+  e,-. d-. c-. b-. a-. g-.    
 }
+\layout {
+  raggedright = ##t
+}  
+
 
diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index 4f3b6fa69a..86087c938e 100644
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -1,6 +1,6 @@
 \header {
-    
-texidoc = "Staves may be present in several sizes within a score.
+  
+  texidoc = "Staves may be present in several sizes within a score.
 This is achieved with an internal scaling factor. If the scaling factor is 
 forgotten in some places, objects generally become too thick or too 
 large on smaller staves."
@@ -9,25 +9,25 @@ large on smaller staves."
 
 \version "2.6.0"
 
-\score {
-  <<
-    \new Staff \with {
-      fontSize = #-4
-      \override StaffSymbol #'staff-space = #(magstep -4)
-    }
-     \relative c' {
-\override DynamicText  #'extra-offset = #'(0 . 3)
-      s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
-    }
+
+<<
+  \new Staff \with {
+    fontSize = #-4
+    \override StaffSymbol #'staff-space = #(magstep -4)
+  }
+  \relative c' {
+    \override DynamicText  #'extra-offset = #'(0 . 3)
+    s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
+			    }
     \new Staff
-     \relative c' {
-\override DynamicText  #'extra-offset = #'(0 . 3)
+    \relative c' {
+      \override DynamicText  #'extra-offset = #'(0 . 3)
       s1-\f c''8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
-    }
-  >>
+			      }
+    >>
 
   \layout {
     #(layout-set-staff-size 6)
     raggedright = ##t
   }
-}
+
diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly
index c3e06ee4c7..28e9d8bce2 100644
--- a/input/regression/staff-tweak.ly
+++ b/input/regression/staff-tweak.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header {
-texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}.
+  texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}.
 However, beams remain correctly quantized."    
 
 }
@@ -9,18 +9,18 @@ However, beams remain correctly quantized."
 
 mus =  \relative c' { c4 g' d'8 d d d }
 
-\score {
-   <<
-    \new Staff {
-	\override Staff.StaffSymbol  #'thickness = #2.0
-	\override Staff.StaffSymbol  #'line-count = #6
-	\override Staff.StaffSymbol  #'staff-space = #1.1
-	\mus
-    }
+
+<<
+  \new Staff {
+    \override Staff.StaffSymbol  #'thickness = #2.0
+    \override Staff.StaffSymbol  #'line-count = #6
+    \override Staff.StaffSymbol  #'staff-space = #1.1
     \mus
-  >>
+  }
+  \mus
+>>
   \layout  {
     raggedright = ##t
   }
-}
+
 
diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly
index 91a01faec3..ef35c229b3 100644
--- a/input/regression/stem-shorten.ly
+++ b/input/regression/stem-shorten.ly
@@ -2,23 +2,23 @@
 \version "2.6.0"
 
 \header {
-    
-    texidoc = "If note head is `over' the center line, the stem is
+  
+  texidoc = "If note head is `over' the center line, the stem is
  shortened.  This happens with forced stem directions, and with some
  chord configurations."
 
 }
 
-\score {
-     \relative c'' {
-	\stemDown d c b a g f e
-	\stemNeutral
-	\stemUp a b c d e f g a
-	\stemNeutral
-	<g, e'>2 <b e g> <c e g> <d f g>
-	
-    } 
-    \layout  {
-	raggedright = ##t
-    }
+
+\relative c'' {
+  \stemDown d c b a g f e
+  \stemNeutral
+  \stemUp a b c d e f g a
+  \stemNeutral
+  <g, e'>2 <b e g> <c e g> <d f g>
+  
+} 
+\layout  {
+  raggedright = ##t
 }
+
diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 66b7342690..61098a6b82 100644
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments
 crossing stems.  If the stem is in a beam, the tremolo must be parallel
 to the beam.  If the stem is invisible (e.g. on a whole note), the
@@ -10,24 +10,24 @@ tremolo must be centered on the note.
 }
 
 
-\score{
-	\context Voice \relative c''{
-		\override TextScript  #'direction = #1
-		\override TextScript  #'padding = #5
-		a1:4^":4" a:8^":8" c:16^":16" a:32^":32" a^"x" a:^":"
-		a4:4 c:8 a:16 c:32 a a: a2:
-		\break
-		\stemUp
-		a4:32 a'4:64 
-		\stemDown
-		c,4:32 c,4:64
-		\stemNeutral
-		c'8:16 c c c
-		a': a a: a
-		c,16:32 c: c c a16:32 a: a a
-		c8:16 g: d: a:
-		c8:32 f: b: e:
-		\transpose c c { f''8:256[ f'8: f'':] }
-	}
+
+\context Voice \relative c''{
+  \override TextScript  #'direction = #1
+  \override TextScript  #'padding = #5
+  a1:4^":4" a:8^":8" c:16^":16" a:32^":32" a^"x" a:^":"
+  a4:4 c:8 a:16 c:32 a a: a2:
+  \break
+  \stemUp
+  a4:32 a'4:64 
+  \stemDown
+  c,4:32 c,4:64
+  \stemNeutral
+  c'8:16 c c c
+  a': a a: a
+  c,16:32 c: c c a16:32 a: a a
+  c8:16 g: d: a:
+  c8:32 f: b: e:
+  \transpose c c { f''8:256[ f'8: f'':] }
 }
 
+
diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly
index efc7b709d1..5eb99f1e56 100644
--- a/input/regression/system-start-bracket.ly
+++ b/input/regression/system-start-bracket.ly
@@ -1,21 +1,21 @@
 \version "2.6.0"
 \header {
-    texidoc =
-"
+  texidoc =
+  "
 The piano brace should be shifted horizontally if it  is enclosed in a bracket.
 "
 }
 
 
-\score {   {
-    \context StaffGroup <<
-	c4
-	\context PianoStaff <<
-	    \new Staff d
-	    \new Staff e
-	   >>
+{
+  \context StaffGroup <<
+    c4
+    \context PianoStaff <<
+      \new Staff d
+      \new Staff e
     >>
-    }
-    \layout {raggedright = ##t}
+  >>
 }
+\layout {raggedright = ##t}
+
 
diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly
index 806f334972..230852a6ed 100644
--- a/input/regression/tablature-string-tunings.ly
+++ b/input/regression/tablature-string-tunings.ly
@@ -1,6 +1,6 @@
 \header {
 
-    texidoc = "For other tunings, it is sufficient to set
+  texidoc = "For other tunings, it is sufficient to set
     @code{stringTunings}. The number of staff lines is adjusted
     accordingly."
 
@@ -8,10 +8,10 @@
 
 \version "2.6.0"
 
-\score  {
-     \new TabStaff {
-	\set TabStaff.stringTunings = #'(5  10 15 20)
-	\relative c''  { c4 d e f }
-       }
+
+\new TabStaff {
+  \set TabStaff.stringTunings = #'(5  10 15 20)
+  \relative c''  { c4 d e f }
 }
+
  
diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly
index 3fc3517b3e..f3236c3a38 100644
--- a/input/regression/tablature.ly
+++ b/input/regression/tablature.ly
@@ -10,25 +10,25 @@ from string-number + pitch to number.
 String numbers can be entered as note articulations (inside a chord) and
 chord articulations (outside a chord)
 "
-}
+       }
 
 partition =  {
-    \key e \major
-    <e\5 dis'\4>
-    <e dis'>
-    <<e\5 dis'\4>>
-    <e dis'>\5\4
+  \key e \major
+  <e\5 dis'\4>
+  <e dis'>
+  <<e\5 dis'\4>>
+  <e dis'>\5\4
 }
 
-\score {
-  \context StaffGroup <<
-    \context Staff <<
-	\clef "G_8"
-	\partition
-    >>
-    \context TabStaff <<
-	\partition
-    >>
+
+\context StaffGroup <<
+  \context Staff <<
+    \clef "G_8"
+    \partition
   >>
-}
+  \context TabStaff <<
+    \partition
+  >>
+>>
+
 
diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly
index 2ead2b8307..a2dea75d7c 100644
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -2,7 +2,7 @@
 \version "2.6.0"
 \header {
 
-texidoc = "The @code{\\tag} command marks music expressions with a
+  texidoc = "The @code{\\tag} command marks music expressions with a
 name. These tagged expressions can be filtered out later. This
 mechanism can be used to make different versions of the same music. In
 this example, the top stave displays the music expression with all
@@ -14,40 +14,40 @@ notes and fingerings, but the score has not."
 \layout { raggedright= ##t }
 
 common =
- \relative c''  {
-
-    c1
-    \relative c' <<
-	\tag #'part <<
-	  R1 \\
-	  {
-	      \set fontSize = #-1
-	      c4_"cue" f2 g4 } 
-        >>
-	\tag #'score R1
-     >>
-    c1-\tag #'part ^4
+\relative c''  {
+
+  c1
+  \relative c' <<
+    \tag #'part <<
+      R1 \\
+      {
+	\set fontSize = #-1
+	c4_"cue" f2 g4 } 
+    >>
+    \tag #'score R1
+  >>
+  c1-\tag #'part ^4
 }
 
 
-\score {
-    \simultaneous { 
-    \new Staff {
-	\set Staff.instrument = #"both"
-	\common
-	}
-    \new Staff {
-	\set Staff.instrument = #"part"
-	\keepWithTag #'part \common
-	}
-    \new Staff {
-	\set Staff.instrument = #"score"
-	\keepWithTag #'score \common
-	}
-    }
+
+\simultaneous { 
+  \new Staff {
+    \set Staff.instrument = #"both"
+    \common
+  }
+  \new Staff {
+    \set Staff.instrument = #"part"
+    \keepWithTag #'part \common
+  }
+  \new Staff {
+    \set Staff.instrument = #"score"
+    \keepWithTag #'score \common
+  }
 }
 
 
 
 
 
+
diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 8486bf4650..169be093cc 100644
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -1,26 +1,25 @@
 \version "2.6.0"
 \header {
 
-texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
+  texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
 note heads. By throwing many  mixed tuplets on the queue,
 one may have collisions between ties and beams. 
 " 
 
 }
 
-\score
-{
-    \context Staff \relative c'' 
-    <<
-	{  \times 2/3 { c'8~  c8~ c8~ c8~ c8~ c8 } }
-	\\
-	{ \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }}
-	\\
-	{ \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
-    >>
 
-    \layout {
-	raggedright = ##t
-    }
-}
+\context Staff \relative c'' 
+<<
+  {  \times 2/3 { c'8~  c8~ c8~ c8~ c8~ c8 } }
+  \\
+  { \voiceTwo \times 2/5 { a,4 ~a4 ~a4~ a4~ a4 }}
+  \\
+  { \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
+>>
+
+  \layout {
+    raggedright = ##t
+  }
+
 
diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index 9a8ce15977..14918a5833 100644
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -1,7 +1,7 @@
 
 \version "2.6.0"
 \header{
-texidoc="
+  texidoc="
 When tying chords, the outer ties point outwards, the inner ties
 point away from the center of the staff. The behavior can be overridden 
 by setting explicitly the @code{direction} of a @code{TieColumn}.
@@ -11,14 +11,14 @@ by setting explicitly the @code{direction} of a @code{TieColumn}.
 
 t =  \relative c' {   <c e g> ~ <c e g> }
 
-	\score { 
- \context Voice {
-   \t
-   \transpose c g \t
 
-   \override TieColumn  #'direction = #-1
-   \t
+\context Voice {
+  \t
+  \transpose c g \t
+
+  \override TieColumn  #'direction = #-1
+  \t
 
-  }
 }
 
+
diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly
index 3083b7441c..f6ba9db21e 100644
--- a/input/regression/tie-dots.ly
+++ b/input/regression/tie-dots.ly
@@ -1,13 +1,14 @@
 \version "2.6.0"
 \header {
-texidoc = "Ties should not collide with dots."
+  texidoc = "Ties should not collide with dots."
 }
 
-\score{{\time 9/8 \key f \major\clef bass
+{
+  \time 9/8 \key f \major\clef bass
   g4 d8 bes4.  ~    bes4    a8    \bar "|"
   a8    gis8    d8 f4.    gis,4.    \bar "|"
   a,4.   ~    a,4    r8   r4   r8   \bar "|"
   c4.   ~    c8    a8    g8    f8
-}}
+}
 
 
diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly
index 1ce1d00c16..9feb9e4322 100644
--- a/input/regression/tie-grace.ly
+++ b/input/regression/tie-grace.ly
@@ -1,13 +1,13 @@
 
 \version "2.6.0"
 \header {
-    texidoc = "Tieing a grace to the to a following grace or main note works."
+  texidoc = "Tieing a grace to the to a following grace or main note works."
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {  \context Voice \relative c'' {
-    c4 \grace { c8 ~ c16 ~ } c4 
-  }
+\context Voice \relative c'' {
+  c4 \grace { c8 ~ c16 ~ } c4 
 }
 
+
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index f6047d6cc0..b98b044105 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -2,16 +2,16 @@
 \version "2.6.0"
 \header {
 
-texidoc = "In combination with a beam, the bracket of the tuplet
+  texidoc = "In combination with a beam, the bracket of the tuplet
 bracket is removed. This only happens if there is one beam, as long as
 the bracket."
 
 }
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {  \context Voice\relative c'' {
-\times 2/3 { r  c8[ c8] }
-\times 2/3 {  c8[ c c] }
-\times 2/3 {  c16[ c16]  c8[ c8] }
-}}
+\context Voice\relative c'' {
+  \times 2/3 { r  c8[ c8] }
+  \times 2/3 {  c8[ c c] }
+  \times 2/3 {  c16[ c16]  c8[ c8] }
+}
 
diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index e271729871..69d92a2138 100644
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -1,6 +1,6 @@
 \header {
 
-    texidoc = "The size of the tuplet bracket gap is adjusted to the
+  texidoc = "The size of the tuplet bracket gap is adjusted to the
     width of the text."
 
 }
@@ -8,13 +8,13 @@
 \version "2.6.0"
 
 \layout {
-   indent = 0.0\mm
-   raggedright = ##t
+  indent = 0.0\mm
+  raggedright = ##t
 }
 
-\score{
-     \relative c'' {
-	\set tupletNumberFormatFunction = #fraction-tuplet-formatter
-	\times  17/12  { c8 c4 c8 c8}
-	}
+
+\relative c'' {
+  \set tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \times  17/12  { c8 c4 c8 c8}
 }
+
diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index f7595c18a2..c968531b40 100644
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -1,45 +1,45 @@
 
 \header {
-texidoc = "Tuplet bracket formatting supports numerous options,
+  texidoc = "Tuplet bracket formatting supports numerous options,
 for instance, bracketed (B) and non-bracketed (NB).
 "
 }
- 
+
 
 \version "2.6.0"
 
 
-\score { 
-    \context Voice \relative c'' {
-
- 	\times 2/3 { c'8 c,, c }
- 	\times 2/3 { c'8 c'' c,, }
-
-	
- 	\times 2/3 {  c8[^"NB" c c]  }
-	
- 	\times 2/3 { c8^"B"  c[ c]  }
- 	\times 2/4 { r8_"B"  c,[ c'] r8 }
-	
- 	\override TupletBracket  #'bracket-visibility = #'if-no-beam  
- 	\times 2/3 {  c8[ c c]  }
-	
-	\override TupletBracket  #'direction = #1
- 	\override TupletBracket  #'number-visibility = ##f
- 	\times 2/3 { c8^""^""^"up, no digit"  c[ c]  }
- 	\revert TupletBracket #'number-visibility
-
-	\override TupletBracket  #'bracket-visibility = ##t
-	\override TupletBracket  #'edge-height = #'(0.0 . 0.0)
-	\override TupletBracket  #'shorten-pair = #'(2.0 . 2.0)
-	\times 4/6 { c_"shorter, no edges" f b  b f c}	
-	\revert TupletBracket #'edge-height
-	\revert TupletBracket #'shorten-pair
-    	\override TupletBracket  #'bracket-flare = #'(0.5 . 0.5)
-	\times 2/3 { b^""^""^"angled edges" b b }
- 	\revert TupletBracket #'direction
-	\times 2/3 { b b b }
-
-    }
+
+\context Voice \relative c'' {
+
+  \times 2/3 { c'8 c,, c }
+  \times 2/3 { c'8 c'' c,, }
+
+  
+  \times 2/3 {  c8[^"NB" c c]  }
+  
+  \times 2/3 { c8^"B"  c[ c]  }
+  \times 2/4 { r8_"B"  c,[ c'] r8 }
+  
+  \override TupletBracket  #'bracket-visibility = #'if-no-beam  
+  \times 2/3 {  c8[ c c]  }
+  
+  \override TupletBracket  #'direction = #1
+  \override TupletBracket  #'number-visibility = ##f
+  \times 2/3 { c8^""^""^"up, no digit"  c[ c]  }
+  \revert TupletBracket #'number-visibility
+
+  \override TupletBracket  #'bracket-visibility = ##t
+  \override TupletBracket  #'edge-height = #'(0.0 . 0.0)
+  \override TupletBracket  #'shorten-pair = #'(2.0 . 2.0)
+  \times 4/6 { c_"shorter, no edges" f b  b f c}	
+  \revert TupletBracket #'edge-height
+  \revert TupletBracket #'shorten-pair
+  \override TupletBracket  #'bracket-flare = #'(0.5 . 0.5)
+  \times 2/3 { b^""^""^"angled edges" b b }
+  \revert TupletBracket #'direction
+  \times 2/3 { b b b }
+
 }
 
+
diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly
index f99ce2ec79..85506051dc 100644
--- a/input/regression/tuplet-rest.ly
+++ b/input/regression/tuplet-rest.ly
@@ -2,22 +2,22 @@
 \version "2.6.0"
 \header {
 
-    texidoc = "Tuplets may contain rests. "
+  texidoc = "Tuplets may contain rests. "
 
 }
 
-\score {
-  \context Voice  \relative c'' {
-    \time 2/4
-    \times 2/3 { r c,,, c''' }
-    \times 2/3 { r c c }
-    \times 2/3 { r c r}
-    \times 2/3 { r r r}
-    \times 2/3 { r c e}
-    \times 2/3 { c r e}
-    \times 2/3 { r c g}
-    \times 2/3 { c r g}
-  }
+
+\context Voice  \relative c'' {
+  \time 2/4
+  \times 2/3 { r c,,, c''' }
+  \times 2/3 { r c c  }
+  \times 2/3 { r c r }
+  \times 2/3 { r r r }
+  \times 2/3 { r c e }
+  \times 2/3 { c r e }
+  \times 2/3 { r c g }
+  \times 2/3 { c r g }
 }
 
 
+
diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly
index c8ef756de3..1e40b66a72 100644
--- a/input/regression/tuplet-staffline-collision.ly
+++ b/input/regression/tuplet-staffline-collision.ly
@@ -2,17 +2,17 @@
 \version "2.6.0"
 \header {
 
-texidoc = "Horizontal tuplet brackets are shifted vertically
+  texidoc = "Horizontal tuplet brackets are shifted vertically
 to avoid staff line collisions."
 
 }
 
-    \layout { raggedright= ##t }
+\layout { raggedright= ##t }
 
-\score {  \context Voice\relative c'' {
-\times 2/3 { b'4 b b }
-\times 2/3 { f4 f f }
-\times 2/3 { g4 g g }
-\times 2/3 { a4 a a }
-}}
+\context Voice\relative c'' {
+  \times 2/3 { b'4 b b }
+  \times 2/3 { f4 f f }
+  \times 2/3 { g4 g g }
+  \times 2/3 { a4 a a }
+}
 
diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly
index 564420e1bd..8ccbeebde0 100644
--- a/input/regression/tuplets.ly
+++ b/input/regression/tuplets.ly
@@ -1,8 +1,8 @@
 
 \version "2.6.0"
 \header{
-    
-texidoc="
+  
+  texidoc="
 Tuplets are indicated by a bracket with a number.  There should be no
 bracket if there is a beam exactly  matching  the length of the tuplet.
 The bracket does not interfere with the stafflines, and the number is
@@ -18,21 +18,21 @@ direction as the bracket. The endings can be adjusted with
 }
 \layout { raggedright= ##t }
 
-\score{
-	 \context Voice \relative c'' {
-		 \times 2/3 { a8 b c }
-		 \times 2/3 { r8  b[ f] }
-		 \override TupletBracket  #'bracket-flare = #'(0.5 . 0.5)
-		 \times 2/3 { r8 b r8 }
-		 c4 |
-		 
-		 \times 3/4 { c4 c4 c4 c4 } c4 | 
-		 
-		 \time 6/8
-		 \times 6/9 { c8 c c c c c c c c }
-
-		 }
+
+\context Voice \relative c'' {
+  \times 2/3 { a8 b c }
+  \times 2/3 { r8  b[ f] }
+  \override TupletBracket  #'bracket-flare = #'(0.5 . 0.5)
+  \times 2/3 { r8 b r8 }
+  c4 |
+  
+  \times 3/4 { c4 c4 c4 c4 } c4 | 
+  
+  \time 6/8
+  \times 6/9 { c8 c c c c c c c c }
+
 }
 
 
 
+
diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly
index 426c110720..419bde81c5 100644
--- a/input/regression/voice-follower.ly
+++ b/input/regression/voice-follower.ly
@@ -7,19 +7,19 @@ Whenever a voice switches to another staff a line connecting the notes
 can be printed automatically. This is enabled if the property
 @code{followVoice} is set to true. "
 
-      }
-\score {
-     \relative c'
-    \context PianoStaff <<
-	\set PianoStaff.followVoice = ##t
-	\context Staff = "one" \context Voice {
-	    c1
-	    \change Staff=two
-	    b2 a
 	}
-	\context Staff = "two" {\clef bass \skip 1*2 }
-    >>
-    \layout{ 
-	raggedright = ##t 
-    }
+
+\relative c'
+\context PianoStaff <<
+  \set PianoStaff.followVoice = ##t
+  \context Staff = "one" \context Voice {
+    c1
+    \change Staff=two
+    b2 a
+  }
+  \context Staff = "two" {\clef bass \skip 1*2 }
+>>
+\layout{ 
+  raggedright = ##t 
 }
+
diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 676e289936..1485927094 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,7 +1,7 @@
 \version "2.6.0"
 
 \header {
-texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
+  texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
 
 }
 
@@ -17,12 +17,12 @@ I have attached a file which has several break-volta interactions.
 With the test file and unmodified 1.3.116 I see the following:
 
 Bar 3 - 1st volta spanner centered on first note - prefer it to start
-	closer to key signature (can live with this)
+closer to key signature (can live with this)
 Bar 6 - 1st volta continuation - perfect
 Bar 9 - 2nd volta spanner starts on left edge of key signature - prefer
-	it to start right of key signature
+it to start right of key signature
 Bar 12 	1st volta starts between first two slurred notes in measure -
-	this is not acceptable
+this is not acceptable
 Bar 17	like above with hairpin.
 Bar 23	like above (I had expected this to be OK)
 Bar 20	2nd volta continuation perfect
@@ -40,84 +40,84 @@ Bar 23	Perfect
 %}
 
 voiceB =  {
-    \clef bass
-     \set Staff.instrument = "Bass"
-     \set Staff.instr = "B"
-     \key f \minor 
-     \time 4/4  
-    f1
-    \repeat  volta 2
-    {
-        f1    \break
+  \clef bass
+  \set Staff.instrument = "Bass"
+  \set Staff.instr = "B"
+  \key f \minor 
+  \time 4/4  
+  f1
+  \repeat  volta 2
+  {
+    f1    \break
+  }
+  \alternative
+  {
+    { 	
+      f1 f g \break   
+      f e d  \break   
     }
-    \alternative
-    {
-        { 	
-	  f1 f g \break   
-	  f e d  \break   
-	}
-        {   
-	    f1      | 
-	}
+    {   
+      f1      | 
     }
+  }
 }
 voiceC =  {
-    \repeat volta 2
-    {
-f f 
-     \break
-    }
-    \alternative
-    {
-        f
-        { f f }
-    }
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    f
+    { f f }
+  }
 }
 
 voiceD =  {
-    \repeat volta 2
-    {
-f f 
-     \break
-    }
-    \alternative
-    {
-        {	f
-	}
-        {	f f \break f 
-        }
-    }
+  \repeat volta 2
+  {
+    f f 
+    \break
+  }
+  \alternative
+  {
+    {	f
+      }
+    {	f f \break f 
+      }
+  }
 }
 voiceE =  {
-    \repeat volta 2
-    {
-f f\break
+  \repeat volta 2
+  {
+    f f\break
+  }
+  \alternative
+  {
+    {	
+      f
+
     }
-    \alternative
-    {
-        {	
-	 f
-
-	}
-        {	
-	  f f 
-        }
+    {	
+      f f 
     }
+  }
 }
-\score{
-         <<
 
+<<
 
-	\new Staff
-	{
-	    \voiceB 
-	    \voiceC
-	    \break
-	    \voiceD
-	    \voiceE
-	}
 
-    >>
-	\layout { raggedright =##t }
-}
+  \new Staff
+  {
+    \voiceB 
+    \voiceC
+    \break
+    \voiceD
+    \voiceE
+  }
+
+>>
+  \layout { raggedright =##t }
+
 
diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index 574f78c7b3..7e68b4f39b 100644
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -1,6 +1,6 @@
 \header {
 
-    texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put
+  texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put
     also over other staves than the topmost one in a score."
 
 }
@@ -9,20 +9,20 @@
 
 vmus =  { \repeat volta 2 c1 \alternative { d e } } 
 
-\score  {
-
-     \relative c'' <<
-	\new StaffGroup <<
-	    \context Staff \vmus
-	    \new Staff \vmus
-	>>
-	\new StaffGroup <<
-	    \new Staff <<
-		\set Staff.voltaOnThisStaff = ##t
-		\vmus >>
-	    \new Staff \vmus
-	>>
-    >>
-
-    \layout { raggedright = ##t }
-}
+
+
+\relative c'' <<
+  \new StaffGroup <<
+    \context Staff \vmus
+    \new Staff \vmus
+  >>
+  \new StaffGroup <<
+    \new Staff <<
+      \set Staff.voltaOnThisStaff = ##t
+      \vmus >>
+    \new Staff \vmus
+  >>
+>>
+
+\layout { raggedright = ##t }
+