From: Mark Polesky <markpolesky@yahoo.com>
Date: Mon, 19 Apr 2010 07:15:18 +0000 (-0700)
Subject: Regtests: Update deprecated \relative syntax.
X-Git-Tag: release/2.13.19-1~2^2~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=67201c80eb90b3255b27be1514573826bf64c17b;p=lilypond.git

Regtests: Update deprecated \relative syntax.

* Replace "\relative { }" with "\relative c' { }".
* Fix whitespace.
---

diff --git a/input/regression/accidental-forced-tie.ly b/input/regression/accidental-forced-tie.ly
index e28d873672..78bc724e50 100644
--- a/input/regression/accidental-forced-tie.ly
+++ b/input/regression/accidental-forced-tie.ly
@@ -8,6 +8,6 @@
   ragged-right = ##t
 }
 
-\relative {
-  gis'4 ~ gis!~ gis?
-  }
+\relative c'' {
+  gis4 ~ gis!~ gis?
+}
diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly
index e0656c40ad..cf49337465 100644
--- a/input/regression/auto-beam-no-beam.ly
+++ b/input/regression/auto-beam-no-beam.ly
@@ -1,5 +1,5 @@
 \header {
-    
+
     texidoc = "The autobeamer may be switched off for a single note
     with @code{\\noBeam}."
 
@@ -11,4 +11,4 @@
     ragged-right = ##t
 }
 
-\relative  { c8 c-\noBeam c c }
+\relative c' { c8 c-\noBeam c c }
diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly
index 3806b37c02..a66224e66b 100644
--- a/input/regression/backend-excercise.ly
+++ b/input/regression/backend-excercise.ly
@@ -6,27 +6,27 @@
 
 \paper { ragged-right = ##t }
 
-\relative {
+\relative c'' {
   \new StaffGroup \new PianoStaff <<
     \new Staff
       {
 	\ottava #1
-	\times 2/3 {  c'8[\< f]( f''\!)  }
+	\times 2/3 { c8[\< f]( f''\!) }
 	\ottava #0
 	<f,, \5>4
 
 	\override TextScript #'color = #red
 	g4^"red"
       }
-    
+
     \new Staff \relative c'' {
       \makeClusters { <g a>8 <e a> <g a>4 }
-      
+
       \override Glissando #'style = #'zigzag
       \slurDashed
       f2( \glissando f')
       \easyHeadsOn
-      f e 
+      f e
     }
   >>
 }
diff --git a/input/regression/beam-beamlet-break.ly b/input/regression/beam-beamlet-break.ly
index fd29e25909..2801a78562 100644
--- a/input/regression/beam-beamlet-break.ly
+++ b/input/regression/beam-beamlet-break.ly
@@ -1,7 +1,7 @@
 \header {
   texidoc = "beamlets don't run to end of line if there are no other
   beamlets on the same height."
-  
+
 }
 \version "2.12.0"
 
@@ -9,7 +9,7 @@
   raggedright = ##t
 }
 
-\relative {
+\relative c' {
   \time 1/4
   \override Beam #'breakable = ##t
   r16 r16. c32[ c16 \break c8. ] r16
diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index 33b37bd29a..625cceb9ed 100644
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -3,7 +3,7 @@
   texidoc = "This file tests a few standard beam quants, taken from
     Ted Ross' book. If LilyPond finds another quant, the correct quant
     is printed over the beam."
-  
+
 }
 
 \version "2.12.0"
@@ -13,85 +13,85 @@
   #(define debug-beam-quanting #t)
 }
 
-filler = \new Voice \relative  {
+filler = \new Voice \relative c' {
   \hideNotes
   e4 e
 }
-				% 
+				%
 
 %%
 %% Ross p108--112
-primes = \relative {
-  \time 3/4 
+primes = \relative c' {
+  \time 3/4
   \assertBeamQuant #'(0 . 0)  #'(0 . 0)
   c8[ c]
   \filler
   \assertBeamQuant #'(1 . -1)  #'(1 . -1)
   d8[ d]
-  
+
   \filler
-  
+
   \assertBeamQuant #'(1 . 0)  #'(1 . 0)
   e8[ e]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(2 . -1)  #'(2 . -1)
   f8[ f]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(2 . 0)  #'(2 . 0)
   g8[ g]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(2 . 1)  #'(2 . 1)
   a8[ a]
   \filler
-  
+
 %{
   \once \override Beam #'inspect-quants = #'(2.2 . 2.2)
-  \assertBeamQuant 
+  \assertBeamQuant
   a8[ a]
   \filler
-  
+
 %}
-  
+
 }
 
 
-seconds = \relative {
-  
+seconds = \relative c' {
+
   \assertBeamQuant #'(0 . 0)  #'(0 . 1)
   a8[ b]
   \filler
-  
+
 
   \assertBeamQuant #'(0 . 0)  #'(0 . 1)
   b8[ c]
   \filler
-  
+
 
   \assertBeamQuant #'(0 . 0)  #'(0 . 1)
   c8[ d]
   \filler
-  
+
   \assertBeamQuant #'(1 . -1)  #'(1 . 0)
   d8[ e]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(1 . 0)  #'(1 . 1)
   e8[ f]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(2 . -1)  #'(2 . 0)
   f8[ g]
   \filler
-  
-  
+
+
   \assertBeamQuant #'(2 . 0)  #'(2 . 1)
   g8[ a]
   \filler
@@ -101,13 +101,13 @@ seconds = \relative {
   \filler
 }
 
-filler = \new Voice \relative  {
+filler = \new Voice \relative c' {
   \hideNotes
   e4 e4.
 }
 
-				% Ross, p122 
-primeSixteenths = \relative {
+				% Ross, p122
+primeSixteenths = \relative c' {
   \stemUp
   \assertBeamQuant #'(0 . -1)  #'(0 . -1)
   g16[ g]
diff --git a/input/regression/chord-tremolo-stem-direction.ly b/input/regression/chord-tremolo-stem-direction.ly
index d385510ca7..01ed127ce1 100644
--- a/input/regression/chord-tremolo-stem-direction.ly
+++ b/input/regression/chord-tremolo-stem-direction.ly
@@ -10,7 +10,7 @@
   ragged-right = ##t
 }
 
-\relative {
+\relative c {
   \stemDown
-  \repeat tremolo 16 {d,32 a'32 }
-} 
+  \repeat tremolo 16 { d32 a'32 }
+}
diff --git a/input/regression/chromatic-scales.ly b/input/regression/chromatic-scales.ly
index d0b0298731..b6d9458b72 100644
--- a/input/regression/chromatic-scales.ly
+++ b/input/regression/chromatic-scales.ly
@@ -7,7 +7,7 @@ space and line equal to one semitone.
 "
 }
 
-scales = \relative {
+scales = \relative c' {
   a ais b c cis d dis e f fis g gis
   a
 }
diff --git a/input/regression/clip-systems.ly b/input/regression/clip-systems.ly
index 590f7a67ff..7107a09e83 100644
--- a/input/regression/clip-systems.ly
+++ b/input/regression/clip-systems.ly
@@ -25,7 +25,7 @@ The result will be files named
 #(define output-suffix "1")
 
 origScore = \score{
-    \relative {
+    \relative c' {
       \set Staff.instrumentName = #"bla"
       c1
       d
diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly
index 7acb4befbc..fe815ee292 100644
--- a/input/regression/collision-manual.ly
+++ b/input/regression/collision-manual.ly
@@ -8,7 +8,7 @@
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   << {  f
 	\override NoteColumn #'force-hshift = #0.1
 	f } \\
diff --git a/input/regression/color.ly b/input/regression/color.ly
index 9f4f875292..9067f9e5bb 100644
--- a/input/regression/color.ly
+++ b/input/regression/color.ly
@@ -8,7 +8,7 @@ Use the @code{\override} and @code{\revert} expressions to set the
 
 \paper { ragged-right = ##t }
 
-\relative {
+\relative c' {
   \override Accidental #'color = #darkgreen
   \override Beam #'color = #cyan
   \override NoteHead #'color = #darkyellow
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 908e54f0e0..1ecd62a787 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -5,7 +5,7 @@
 You also get ledger lines, of course."
 }
 
-\relative {
+\relative c' {
   \easyHeadsOn
   f1 e
   f2 e
diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly
index a216d3d9d9..9f106e719a 100644
--- a/input/regression/finger-chords-order.ly
+++ b/input/regression/finger-chords-order.ly
@@ -9,7 +9,7 @@ is independent of up/down direction."
 
 \paper { ragged-right = ##t }
 
-\relative {
+\relative c' {
 	%% input order is not 1 2 3 , output is.
 	<c-1 g'-3 e-2  b'-4 d-5 f-6 a-7 c-8 > 4
 
diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly
index 39c9b6849a..553747d478 100644
--- a/input/regression/font-family-override.ly
+++ b/input/regression/font-family-override.ly
@@ -7,8 +7,8 @@
 
 \version "2.12.0"
 
-\paper  {
-  % change for other default global staff size. 
+\paper {
+  % change for other default global staff size.
   myStaffSize = #20
 
 
@@ -18,11 +18,11 @@
 
       lilypond -dshow-available-fonts blabla
 
-  to show all fonts available in the process log.  
-  
+  to show all fonts available in the process log.
+
   %}
 
-  
+
   #(define fonts
     (make-pango-font-tree "Times New Roman"
                           "Nimbus Sans"
@@ -34,9 +34,9 @@
      (/ myStaffSize 20)))
 }
 
-\relative {
+\relative c'' {
 
-  c'^\markup { roman: foo \bold bla \italic bar \italic \bold baz }
+  c^\markup { roman: foo \bold bla \italic bar \italic \bold baz }
   c'_\markup {
     \override #'(font-family . sans)
     {
@@ -49,4 +49,4 @@
       mono: foo \bold bla \italic bar \italic \bold baz
     }
   }
-}  
+}
diff --git a/input/regression/instrument-name-dynamic.ly b/input/regression/instrument-name-dynamic.ly
index f7faa7e09d..13601d308b 100644
--- a/input/regression/instrument-name-dynamic.ly
+++ b/input/regression/instrument-name-dynamic.ly
@@ -11,7 +11,7 @@
   indent = 0\cm
 }
 
-\relative {
+\relative c' {
   \set Staff.shortInstrumentName = "foo"
   f1 | f1 | f1 |
   f1\< | f1 | f1\! |
diff --git a/input/regression/laissez-vibrer-ties.ly b/input/regression/laissez-vibrer-ties.ly
index 934bf27091..ddb36f1dd7 100644
--- a/input/regression/laissez-vibrer-ties.ly
+++ b/input/regression/laissez-vibrer-ties.ly
@@ -15,7 +15,7 @@ They have fixed size. Their formatting can be tuned with
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   <c e g>\laissezVibrer r4
   <c f g>\laissezVibrer r
   <c d f g>\laissezVibrer r
diff --git a/input/regression/landscape.ly b/input/regression/landscape.ly
index 477e67babb..735d64ae3e 100644
--- a/input/regression/landscape.ly
+++ b/input/regression/landscape.ly
@@ -3,7 +3,7 @@
 \header { texidoc = " Scores may be printed in landscape mode."}
 
 
-pattern = \relative { a b c d \break }
+pattern = \relative c' { a b c d \break }
 
 \book {    
     \score {
diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly
index 04ec6a9f95..aa2c160e9b 100644
--- a/input/regression/ledger-line-shorten.ly
+++ b/input/regression/ledger-line-shorten.ly
@@ -8,7 +8,7 @@ that ledger lines stay separate."
     ragged-right = ##t
 }
 
-\relative {
+\relative c' {
 \time 2/4 
 
 c4
diff --git a/input/regression/line-dash-small-period.ly b/input/regression/line-dash-small-period.ly
index e55b6ec602..3245486ac3 100644
--- a/input/regression/line-dash-small-period.ly
+++ b/input/regression/line-dash-small-period.ly
@@ -7,7 +7,7 @@
 
 \version "2.12.0"
 
-\relative {
+\relative c' {
   \override Staff.OttavaBracket #'dash-period = #0.1
   \override Score.OttavaBracket #'dash-fraction = #1
 
diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly
index 4072c40d7b..11e3f44cbd 100644
--- a/input/regression/lyric-melisma-manual.ly
+++ b/input/regression/lyric-melisma-manual.ly
@@ -10,7 +10,7 @@
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   \set melismaBusyProperties = #'()
   c d( e) f f( e) e e  }
 \addlyrics
diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly
index bc1f016967..dcf29c023d 100644
--- a/input/regression/lyrics-tenor-clef.ly
+++ b/input/regression/lyrics-tenor-clef.ly
@@ -15,5 +15,5 @@
     ragged-right = ##t
 }
 
-\relative { \clef "G_8" c c c c }
+\relative c' { \clef "G_8" c c c c }
 \addlyrics { bla bla bla bla }
diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly
index 8c686ec5ba..145073e0e9 100644
--- a/input/regression/markup-score.ly
+++ b/input/regression/markup-score.ly
@@ -22,11 +22,11 @@ tuning = \markup {
     subsubtitle = \markup { "Originalstimmung:" \tuning }
 }
 
-\relative {
+\relative c'' {
     \time 4/8
-    \times 2/3 { c'8 d e } \times 2/3 {c d e}
     \times 2/3 { c8 d e } \times 2/3 {c d e}
-    g8 a8 g8 a 
-    g8 a8 g8 a 
+    \times 2/3 { c8 d e } \times 2/3 {c d e}
+    g8 a8 g8 a
+    g8 a8 g8 a
 }
 
diff --git a/input/regression/midi-dynamics.ly b/input/regression/midi-dynamics.ly
index ee18823a3d..551e4b44d7 100644
--- a/input/regression/midi-dynamics.ly
+++ b/input/regression/midi-dynamics.ly
@@ -8,7 +8,7 @@
 \version "2.12.0"
 
 \score {
-  \relative {
+  \relative c' {
 
     \set midiMinimumVolume = #0.0
     \set midiMaximumVolume = #1.0
diff --git a/input/regression/midi-microtone-off.ly b/input/regression/midi-microtone-off.ly
index 893ed44626..1d61f74d00 100644
--- a/input/regression/midi-microtone-off.ly
+++ b/input/regression/midi-microtone-off.ly
@@ -8,8 +8,8 @@
 
 \score
 {
-  
-  \relative  {
+
+  \relative c' {
     a geseh \acciaccatura a geseh
   }
 
diff --git a/input/regression/midi-pedal.ly b/input/regression/midi-pedal.ly
index c599902164..a0eec3be25 100644
--- a/input/regression/midi-pedal.ly
+++ b/input/regression/midi-pedal.ly
@@ -8,7 +8,7 @@
 \version "2.12.0"
 
 \score {
-  \relative {
+  \relative c' {
     {
       { c16 e g c }
       
diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 7b455e74f8..89371b2a30 100644
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -1,12 +1,12 @@
 \header {
-    
+
     texidoc = "newlyrics, multiple stanzas, multiple lyric voices."
-    
+
 }
 \layout { ragged-right = ##t }
 <<
-    \new Staff \relative {
-	d'2 d c4 bes a2 \break
+    \new Staff \relative c'' {
+	d2 d c4 bes a2 \break
     }
     \addlyrics {
 	My first Li -- ly song,
@@ -14,7 +14,7 @@
     \addlyrics {
 	Not much can go wrong!
     }
-    \new Staff \relative {
+    \new Staff \relative c' {
 	\clef bass
 	d2 d c4 bes a2 \break
     }
diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly
index b1445374ad..5ef50400fe 100644
--- a/input/regression/override-nest.ly
+++ b/input/regression/override-nest.ly
@@ -6,7 +6,7 @@ next example, the @code{beamed-lengths} property of the @code{Stem}
 grob is tweaked."
 }
 
-\relative {
+\relative c' {
   \override Stem #'details #'beamed-lengths = #'(6 10 8)
   c8[ c] c16[ c] c32[ c]
   \revert Stem #'details
diff --git a/input/regression/page-spacing-loose-lines-after.ly b/input/regression/page-spacing-loose-lines-after.ly
index da6c0ceb10..65bd242c3d 100644
--- a/input/regression/page-spacing-loose-lines-after.ly
+++ b/input/regression/page-spacing-loose-lines-after.ly
@@ -13,8 +13,8 @@ gets spaced appropriately."
   }
 }
 <<
-    \new Staff \relative {
-	d'2 d c4 bes a2 \break
+    \new Staff \relative c'' {
+	d2 d c4 bes a2 \break
     }
     \addlyrics {
 	My first Li -- ly song,
diff --git a/input/regression/page-spacing-loose-lines-before.ly b/input/regression/page-spacing-loose-lines-before.ly
index 715d33e09a..66cfb814a8 100644
--- a/input/regression/page-spacing-loose-lines-before.ly
+++ b/input/regression/page-spacing-loose-lines-before.ly
@@ -20,8 +20,8 @@ is spaced appropriately."
   \new Lyrics \lyricmode {
     Not2 much can4 go wrong!
   }
-  \context Voice = "voice" \relative {
-    d'2 d c4 bes a2
+  \context Voice = "voice" \relative c'' {
+    d2 d c4 bes a2
   }
 >>
 
diff --git a/input/regression/page-spacing-loose-lines-between.ly b/input/regression/page-spacing-loose-lines-between.ly
index 241e40f7a6..3f549c42b9 100644
--- a/input/regression/page-spacing-loose-lines-between.ly
+++ b/input/regression/page-spacing-loose-lines-between.ly
@@ -19,8 +19,8 @@ which measures distances between spaceable staves."
     My2 first Li4 -- ly song,2
     My2 first Li4 -- ly song,2
   }
-  \context Voice = "voice" \relative {
-    d'2 d c4 bes a2 \break
+  \context Voice = "voice" \relative c'' {
+    d2 d c4 bes a2 \break
     d'2 d c4 bes a2
   }
   \new Lyrics \lyricmode {
diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly
index fe84708be8..fa1f9e0172 100644
--- a/input/regression/page-top-space.ly
+++ b/input/regression/page-top-space.ly
@@ -11,7 +11,7 @@ first system can be forced to be uniform."
 \book {
   \score {
 
-    \relative {
+    \relative c' {
       c1\break\pageBreak
       c1\break\pageBreak
       c1
diff --git a/input/regression/page-turn-page-breaking-repeats.ly b/input/regression/page-turn-page-breaking-repeats.ly
index 73224244e3..e383ad29d6 100644
--- a/input/regression/page-turn-page-breaking-repeats.ly
+++ b/input/regression/page-turn-page-breaking-repeats.ly
@@ -23,7 +23,7 @@ long gap at the beginning or at the end of the repeat.
   }
 
   \score {
-    \relative {
+    \relative c' {
       \set Score.skipBars = ##t
       % this should be kept on one page
       \repeat volta 2 {
diff --git a/input/regression/parenthesize.ly b/input/regression/parenthesize.ly
index 737e2c00d2..22a5068cda 100644
--- a/input/regression/parenthesize.ly
+++ b/input/regression/parenthesize.ly
@@ -14,7 +14,7 @@
 
 \version "2.12.0"
 
-\relative {
+\relative c' {
   c4 -\parenthesize -.
 
   \override ParenthesesItem #'padding = #0.1
diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index 3757d4bc7a..9dc8705430 100644
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -8,12 +8,12 @@ and only after chords, solo or polyphony."
 vone =  \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g }
 vtwo =  \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g }
 
-comment = \relative { s1*2 s2_"a2" s2 s2_"no a2" s2 s4 s4 s4_"a2" } 
+comment = \relative c' { s1*2 s2_"a2" s2 s2_"no a2" s2 s4 s4 s4_"a2" }
 
 \layout { ragged-right = ##T }
 
-\new Staff << \set Score.skipBars = ##t 
+\new Staff << \set Score.skipBars = ##t
    \partcombine \vone \vtwo
    \comment
 >>
- 
+
diff --git a/input/regression/property-nested-revert.ly b/input/regression/property-nested-revert.ly
index 139169ad2c..74a6023cb6 100644
--- a/input/regression/property-nested-revert.ly
+++ b/input/regression/property-nested-revert.ly
@@ -8,7 +8,7 @@ Scheme list syntax."
 
 \version "2.12.0"
 
-\relative {
+\relative c' {
   f2 \glissando c
   \override Glissando #'bound-details #'right #'Y = #4
   f2 \glissando c |
diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly
index 6ce70dfe06..da9f25d977 100644
--- a/input/regression/quote-tuplet.ly
+++ b/input/regression/quote-tuplet.ly
@@ -8,7 +8,7 @@
 
 }
 
-foo = \relative {
+foo = \relative c' {
   \times 2/3 { c4 c c } \times 2/3 { c4 c c }
 }
 
diff --git a/input/regression/rehearsal-mark-align-priority.ly b/input/regression/rehearsal-mark-align-priority.ly
index c4a6b525ec..5c127ed85d 100644
--- a/input/regression/rehearsal-mark-align-priority.ly
+++ b/input/regression/rehearsal-mark-align-priority.ly
@@ -6,7 +6,7 @@
 
 \version "2.12.0"
   
-\relative {
+\relative c' {
   \override Score.RehearsalMark #'break-align-symbols = #'(clef key-signature staff-bar)
   c1
   \clef "bass"
diff --git a/input/regression/rehearsal-mark-align-staff-context.ly b/input/regression/rehearsal-mark-align-staff-context.ly
index 4fd1171c14..baca1fdda4 100644
--- a/input/regression/rehearsal-mark-align-staff-context.ly
+++ b/input/regression/rehearsal-mark-align-staff-context.ly
@@ -16,7 +16,7 @@ another context."
   }
 }
 
-\relative {
+\relative c' {
   c1 \mark "foo"
   c1
   \key cis \major
diff --git a/input/regression/rehearsal-mark-align.ly b/input/regression/rehearsal-mark-align.ly
index d1f2fefe17..70fc70aa22 100644
--- a/input/regression/rehearsal-mark-align.ly
+++ b/input/regression/rehearsal-mark-align.ly
@@ -9,7 +9,7 @@
 
 \version "2.12.0"
   
-\relative {
+\relative c' {
   c1 \mark "foo"
   c1
   \key cis \major
diff --git a/input/regression/relative-repeat.ly b/input/regression/relative-repeat.ly
index 4cf17989f0..f0520cc304 100644
--- a/input/regression/relative-repeat.ly
+++ b/input/regression/relative-repeat.ly
@@ -3,7 +3,7 @@
   }
 \version "2.12.0"
 
-\relative {
+\relative c' {
   \repeat "unfold" 3
   { f2 bes2 }
   \alternative { a1 e b } 
diff --git a/input/regression/score-text.ly b/input/regression/score-text.ly
index b662217acd..290a0e60f6 100644
--- a/input/regression/score-text.ly
+++ b/input/regression/score-text.ly
@@ -10,16 +10,16 @@
     line-width = #110
 }
 
-%% using Book and Score to get text in lilypond-book 
+%% using Book and Score to get text in lilypond-book
 \book {
     \markup {
 	\fill-line { "High up above" }
     }
     \score {
 	<<
-	    \relative {
+	    \relative c {
 		\clef bass
-		d,2 d c4 bes a2 \break
+		d2 d c4 bes a2 \break
 		c2 c d4 f g2
 	    }
 	    \addlyrics {
@@ -51,4 +51,4 @@
 	    }
 	}
     }
-}
\ No newline at end of file
+}
diff --git a/input/regression/skiptypesetting-bar-check.ly b/input/regression/skiptypesetting-bar-check.ly
index 14721f0bee..2868c18542 100644
--- a/input/regression/skiptypesetting-bar-check.ly
+++ b/input/regression/skiptypesetting-bar-check.ly
@@ -6,7 +6,7 @@ texidoc = "skipTypesetting doesn't affect bar checks."
 
 }
 
-\relative {
+\relative c' {
   c4
   \set Score.skipTypesetting = ##t
   c4 c4
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index f2c524e823..a10b4c3489 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -35,7 +35,7 @@ in unbroken state.
     <bis f' b>) s2..\break
     \stemNeutral
 
-    \new Voice \relative  {
+    \new Voice \relative c' {
 	c'8[( c c c] g2 ~ | \break
 	g1) | \break
 	\slurDown c8[( c] g4 ~ g2 ~ | \break
diff --git a/input/regression/slur-cross-staff-beam.ly b/input/regression/slur-cross-staff-beam.ly
index 43230682be..dff288e811 100644
--- a/input/regression/slur-cross-staff-beam.ly
+++ b/input/regression/slur-cross-staff-beam.ly
@@ -4,10 +4,10 @@
   texidoc = "Slurs that depend on a cross-staff beam are not calculated until after line-breaking."
 }
 
-\paper{ ragged-right=##t }
+\paper { ragged-right=##t }
 \score {
     \new PianoStaff <<
-    \context Staff = rh \relative { c'8([ d) \change Staff = lh c,] }
+    \context Staff = rh \relative c'' { c8([ d) \change Staff = lh c,] }
     \context Staff = lh { s4. }
     >>
-}
\ No newline at end of file
+}
diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly
index 93386d8a1b..792c857d6e 100644
--- a/input/regression/slur-double.ly
+++ b/input/regression/slur-double.ly
@@ -6,7 +6,7 @@
 \version "2.12.0"
 
 \layout { ragged-right = ##t }
-\relative {
+\relative c' {
     \set doubleSlurs = ##t
     <c e>4 ( <d f> <c e> <d f> )
 }
diff --git a/input/regression/slur-manual.ly b/input/regression/slur-manual.ly
index 36ab15345e..25425aecd9 100644
--- a/input/regression/slur-manual.ly
+++ b/input/regression/slur-manual.ly
@@ -9,7 +9,7 @@ the given pair. "
 \version "2.12.0"
 
 \paper { ragged-right = ##T }
-\relative {
+\relative c' {
   \override Slur #'positions = #'(-4 . -5)
   e( f g)
 }
diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index a1b1ee4506..c18da3cb2f 100644
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -7,7 +7,7 @@
     one big file, since changing one score parameter for one situation
     may affect several other situations.
 
-    Tunable parameters are in @file{scm/slur.scm}. 
+    Tunable parameters are in @file{scm/slur.scm}.
 "
 
 }
@@ -18,9 +18,9 @@
 %    #(define debug-slur-scoring #t)
 }
 
-\relative {
-  
-    \grace e'=''16( d8.[) c16]
+\relative c'' {
+
+    \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2
     << {c=''8.([ es16] bes4~bes )}
@@ -28,20 +28,20 @@
        {r8  <as es> r <f des> r }
     >>
     \new Voice { \voiceOne b='8[ c16( d])  }
-    g,='8[( a b b! ]  c4  bes) 
+    g,='8[( a b b! ]  c4  bes)
     bes='8( f' des bes) as4( bes)
     r8 d( f e d c b a)
     cis=''4( d)  f=''16( e)    d( c)
     s4
-    
+
     c=''2(~c8 d16 c b8 a)
-    
+
     <c,=' g>4 ( f <g b>) f
     <c g>^( f <g b>) f
     <c g>_( f <g b>)
     <g b>_( g  <b d>)
     <g b>_( \stemDown g \stemNeutral  <b d>)
-    c,='^( c'' c) 
+    c,='^( c'' c)
     c,,^( c'')
     c,,^( c')
     | b='2( a4) s4
@@ -54,14 +54,14 @@
     | << { b='8[( c]) } \\
 	 { b='8[( c]) }>>
 
-    
+
     s2.|
     e4( dis4)
-    e4( dis4) 
+    e4( dis4)
     g,='16( b d fis)
     \clef bass a,,=8[ e16(f] g[ a b d,)]  s4 | \break
     e=8[( f] g[ a b d,)]  s4 |
-    
+
     \clef treble
     \new Voice {
 	\slurDown
diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly
index eb5bae7aea..9fa1199e46 100644
--- a/input/regression/slur-tuplet.ly
+++ b/input/regression/slur-tuplet.ly
@@ -12,7 +12,7 @@ This may not work if the slur starts after the tuplet.  "
 %  #(define debug-slur-scoring #t)
 }
 
-\relative {
+\relative c' {
   \slurUp
   \override TupletBracket #'bracket-visibility = ##f
   \override Slur #'(details region-size)  = #6
diff --git a/input/regression/song-basic-nonenglish.ly b/input/regression/song-basic-nonenglish.ly
index 4538db7ff0..091799dfd0 100644
--- a/input/regression/song-basic-nonenglish.ly
+++ b/input/regression/song-basic-nonenglish.ly
@@ -4,7 +4,7 @@
 
 \festivalsyl #"song-basic-nonenglish.xml" { \tempo 4 = 100 }
 {
-\relative { c e g r }
+\relative c' { c e g r }
 \addlyrics { ov -- čá -- ci }
 }
 #(ly:progress "song-basic-nonenglish")
diff --git a/input/regression/song-basic.ly b/input/regression/song-basic.ly
index 06d3e3b4f7..556a522441 100644
--- a/input/regression/song-basic.ly
+++ b/input/regression/song-basic.ly
@@ -5,7 +5,7 @@
 \festival #"song-basic.xml" { \tempo 4 = 100 }
 {
 \time 3/4
-\relative { c2 r2 e4 g2. }
+\relative c' { c2 r2 e4 g2. }
 \addlyrics { play the game }
 }
 #(ly:progress "song-basic")
diff --git a/input/regression/song-breathe.ly b/input/regression/song-breathe.ly
index f0484c130e..1acc955a60 100644
--- a/input/regression/song-breathe.ly
+++ b/input/regression/song-breathe.ly
@@ -5,7 +5,7 @@
 \festival #"song-breathe.xml" { \tempo 4 = 100 }
 {
 \time 3/4
-\relative { c2 e \breathe g }
+\relative c' { c2 e \breathe g }
 \addlyrics { play the game }
 }
 #(ly:progress "song-breathe")
diff --git a/input/regression/song-skip-noword.ly b/input/regression/song-skip-noword.ly
index 17e578f945..75c71122ce 100644
--- a/input/regression/song-skip-noword.ly
+++ b/input/regression/song-skip-noword.ly
@@ -4,7 +4,7 @@
 #(set! *skip-word* #f)
 
 \festival #"song-skip-noword.xml" { \tempo 4 = 100 }
-\relative { c c g' }
+\relative c' { c c g' }
 \addlyrics {
   twin -- \skip 4
   kle
diff --git a/input/regression/song-skip.ly b/input/regression/song-skip.ly
index 825e548cae..1302c3174c 100644
--- a/input/regression/song-skip.ly
+++ b/input/regression/song-skip.ly
@@ -3,7 +3,7 @@
 \include "festival.ly"
 
 \festival #"song-skip.xml" { \tempo 4 = 100 }
-\relative { c c g' }
+\relative c' { c c g' }
 \addlyrics {
   twin -- \skip 4
   kle
diff --git a/input/regression/song-stanzas.ly b/input/regression/song-stanzas.ly
index 51fa612507..a172778073 100644
--- a/input/regression/song-stanzas.ly
+++ b/input/regression/song-stanzas.ly
@@ -5,7 +5,7 @@
 \festival #"song-stanzas.xml" { \tempo 4 = 100 }
 {
 \time 3/4
-\relative { c2 e4 g2. }
+\relative c' { c2 e4 g2. }
 \addlyrics { play the game }
 \addlyrics { speel het spel }
 \addlyrics { joue le jeu }
diff --git a/input/regression/song-tempo.ly b/input/regression/song-tempo.ly
index 7eec2b6d4e..193aa50e25 100644
--- a/input/regression/song-tempo.ly
+++ b/input/regression/song-tempo.ly
@@ -5,7 +5,7 @@
 \festival #"song-tempo.xml" { \tempo 4=90 }
 {
 \time 3/4
-\relative { c4 e g \tempo 4=60 c, e g }
+\relative c' { c4 e g \tempo 4=60 c, e g }
 \addlyrics { do re mi do re mi }
 }
 #(ly:progress "song-tempo")
diff --git a/input/regression/spacing-bar-whole-measure.ly b/input/regression/spacing-bar-whole-measure.ly
index eac6426ea6..c5e2b5fa97 100644
--- a/input/regression/spacing-bar-whole-measure.ly
+++ b/input/regression/spacing-bar-whole-measure.ly
@@ -9,7 +9,7 @@
   ragged-right=##t
 }
 
-\new Staff \relative {
+\new Staff \relative c' {
   \override Score.NonMusicalPaperColumn #'stencil = #ly:paper-column::print
   \override Score.NonMusicalPaperColumn #'layer = #1
   
diff --git a/input/regression/spacing-horizontal-skyline.ly b/input/regression/spacing-horizontal-skyline.ly
index bf59899597..ea7b37be1e 100644
--- a/input/regression/spacing-horizontal-skyline.ly
+++ b/input/regression/spacing-horizontal-skyline.ly
@@ -9,8 +9,8 @@
   ragged-right = ##t
   }
 
-\relative {
-  \stemUp c''4...*1/2
+\relative c''' {
+  \stemUp c4...*1/2
 
   ceses,,!
   eses!
@@ -19,6 +19,6 @@
   ceses!
   geses'!
   ceses,!
-  
+
 }
-  
+
diff --git a/input/regression/spacing-packed.ly b/input/regression/spacing-packed.ly
index 138dbf01b3..0023f613cd 100644
--- a/input/regression/spacing-packed.ly
+++ b/input/regression/spacing-packed.ly
@@ -12,7 +12,7 @@
 
 \version "2.12.0"
 
-\relative {
+\relative c' {
   \override Score.SpacingSpanner #'packed-spacing = ##t
   c2 d4 f8[ g] a
 }
diff --git a/input/regression/spacing-section.ly b/input/regression/spacing-section.ly
index 065cb423df..d29a6236f5 100644
--- a/input/regression/spacing-section.ly
+++ b/input/regression/spacing-section.ly
@@ -12,7 +12,7 @@ the 4/16, and a 16th in the second section takes as much space as a
   ragged-right = ##t
   }
 \version "2.12.0"
-\relative {
+\relative c' {
   \time 2/4
   c4 c8 c 
   c8 c c4 c16[ c c8] c4
diff --git a/input/regression/spacing-stick-out.ly b/input/regression/spacing-stick-out.ly
index d89ee89e22..b042ae1abc 100644
--- a/input/regression/spacing-stick-out.ly
+++ b/input/regression/spacing-stick-out.ly
@@ -11,7 +11,7 @@
 
 \layout { ragged-right = ##t } 
 
-\relative {
+\relative c' {
   \override Score.PaperColumn #'keep-inside-line = ##t 
   c1 c1^"This is a really long text" c
 }
diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index c3bcc78b6a..1e66ebc3c9 100644
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -1,8 +1,8 @@
 \header {
-  
+
   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 
+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."
 
 }
@@ -13,9 +13,9 @@ large on smaller staves."
   ragged-right = ##t
 }
 
-melody = \relative {
+melody = \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 }
+  s1-\f c8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d }
 }
 
 <<
@@ -26,8 +26,6 @@ melody = \relative {
     \melody
   }
   \new Staff {
-    \relative c' {
-      \melody
-    }
+    \melody
   }
 >>
diff --git a/input/regression/stem-stemlet.ly b/input/regression/stem-stemlet.ly
index 5603b34457..c7584449c7 100644
--- a/input/regression/stem-stemlet.ly
+++ b/input/regression/stem-stemlet.ly
@@ -8,7 +8,7 @@ length can be set with @code{stemlet-length}."
 \version "2.12.0"
 \layout { ragged-right = ##t }
 
-\relative {
+\relative c' {
     \override Stem #'stemlet-length = #0.75
     c8[ r8 c16 r16 c8]
     c4
diff --git a/input/regression/string-number.ly b/input/regression/string-number.ly
index 1b8692de79..af62a3f36a 100644
--- a/input/regression/string-number.ly
+++ b/input/regression/string-number.ly
@@ -9,7 +9,7 @@ positioning mechanism as finger instructions."
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   <c\1 e\2 g\3>
   c4
   \set fingeringOrientations = #'(down left up)
diff --git a/input/regression/test-output-distance.ly b/input/regression/test-output-distance.ly
index 84bb5773d7..834c3b3af3 100644
--- a/input/regression/test-output-distance.ly
+++ b/input/regression/test-output-distance.ly
@@ -18,5 +18,5 @@ it should always show up in the output-distance testing. "
   ragged-right = ##f
 }
 
-\relative { c4 d f8_\f[ g-.] }
+\relative c' { c4 d f8_\f[ g-.] }
 
diff --git a/input/regression/tie-arpeggio.ly b/input/regression/tie-arpeggio.ly
index e402303b19..f7f8b1f0ed 100644
--- a/input/regression/tie-arpeggio.ly
+++ b/input/regression/tie-arpeggio.ly
@@ -12,7 +12,7 @@
 \version "2.12.0"
 
 \paper { ragged-right =  ##t }
-\relative {
+\relative c' {
   c~ e~ g~ <c, e g>
   \set tieWaitForNote = ##t
   c~ e~ g~ <c, e g>
diff --git a/input/regression/tie-broken-minimum-length.ly b/input/regression/tie-broken-minimum-length.ly
index c7e9c512ee..601f81e1b5 100644
--- a/input/regression/tie-broken-minimum-length.ly
+++ b/input/regression/tie-broken-minimum-length.ly
@@ -13,7 +13,7 @@ has a @code{minimum-length} of 5."
   line-width = 40.0\mm
 }
 
-\relative {
+\relative c' {
   \override Tie #'minimum-length = #5
   f2. f16  f  f  f ~ | \break
   f1
diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly
index d5ab64e1e0..fa74427671 100644
--- a/input/regression/tie-chord-partial.ly
+++ b/input/regression/tie-chord-partial.ly
@@ -8,7 +8,7 @@
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   <c~ e g>  <c e g~> <c e g>
 }
 
diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly
index 182639ac6c..329166d582 100644
--- a/input/regression/trill-spanner-pitched.ly
+++ b/input/regression/trill-spanner-pitched.ly
@@ -12,6 +12,6 @@
   ragged-right = ##t
 }
 
-\relative {
+\relative c' {
   \pitchedTrill c4.\startTrillSpan es f\stopTrillSpan
 }
diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index d8c5c5c9d5..86793cf96a 100644
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -9,14 +9,14 @@ You may have to install additional fonts.
 Red Hat Fedora
 
     taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \
-	 ttfonts-zh_CN fonts-ja fonts-hebrew 
+	 ttfonts-zh_CN fonts-ja fonts-hebrew
 
 Debian GNU/Linux
 
    apt-get install emacs-intl-fonts xfonts-intl-.* \
 	ttf-kochi-gothic ttf-kochi-mincho \
-	xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
-%} 
+	xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi
+%}
 
 \header {
 
@@ -26,7 +26,7 @@ Pango based backend.  Depending on the fonts installed, this fragment
 will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
 
 "
-  
+
 }
 
 % Cyrillic font
@@ -34,19 +34,19 @@ bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricmode { 
+hebrew = \lyricmode {
   זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-japanese = \lyricmode {  
+japanese = \lyricmode {
   いろはにほへど ちりぬるを
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず 
+  あさきゆめみじ ゑひもせず
 }
 
 % "a legal song to you"
-portuguese = \lyricmode { 
+portuguese = \lyricmode {
   à vo -- cê uma can -- ção legal
 }
 
@@ -54,7 +54,7 @@ portuguese = \lyricmode {
   ragged-right = ##T
 }
 
-\relative  { 
+\relative c' {
   c2 d e f g f e
 }
 \addlyrics { \bulgarian }