From: hanwen <hanwen>
Date: Thu, 8 Jan 2004 16:54:40 +0000 (+0000)
Subject: * lily/tuplet-bracket.cc (brew_molecule): call after_line_breaking
X-Git-Tag: release/2.1.8~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ed3db50f5824bda586594c3faf77f6890b355661;p=lilypond.git

* lily/tuplet-bracket.cc (brew_molecule): call after_line_breaking
() if dependencies are fluked.

* input/mutopia/F.Schubert/morgenlied.ly: add bar checks.
---

diff --git a/ChangeLog b/ChangeLog
index 6e25639ec9..823b199878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-01-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* input/*ly: run convert-ly
+	
+	* lily/tuplet-bracket.cc (brew_molecule): call after_line_breaking
+	() if dependencies are fluked.
+
+	* scm/document-translation.scm (engraver-doc-string): update on
+	latest string/symbol conventions.
+
+	* lily/translator-ctors.cc: use Scheme_hash_table.
+
 	* lily/translator-def.cc (get_translator_names): new function
 	(add_context_mod): new function
 	(get_accepted): new function
diff --git a/input/ascii-art/as-email.ly b/input/ascii-art/as-email.ly
index 4418a35160..41c2418e14 100644
--- a/input/ascii-art/as-email.ly
+++ b/input/ascii-art/as-email.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/ascii-art/as1.ly b/input/ascii-art/as1.ly
index 6861fce6c8..85fc04cf6d 100644
--- a/input/ascii-art/as1.ly
+++ b/input/ascii-art/as1.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "1.9.8"
+\version "2.1.7"
 
 \score { 
   \context Voice \notes\relative c {
diff --git a/input/ascii-art/as2.ly b/input/ascii-art/as2.ly
index 3c570d5bf1..f9ec2a1389 100644
--- a/input/ascii-art/as2.ly
+++ b/input/ascii-art/as2.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 % test for ascii-art output
 
diff --git a/input/ascii-art/asciiscript5.ly b/input/ascii-art/asciiscript5.ly
index c7d886925e..ae4c9715a7 100644
--- a/input/ascii-art/asciiscript5.ly
+++ b/input/ascii-art/asciiscript5.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/ascii-art/asciiscript9.ly b/input/ascii-art/asciiscript9.ly
index bb623de939..900e93acdd 100644
--- a/input/ascii-art/asciiscript9.ly
+++ b/input/ascii-art/asciiscript9.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly
index b0187f0180..f098bfa4f5 100644
--- a/input/ascii-art/r-as.ly
+++ b/input/ascii-art/r-as.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly
index 073314ae8e..1b94836dc5 100644
--- a/input/ascii-art/standchen-as5.ly
+++ b/input/ascii-art/standchen-as5.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly
index 06c7c1ef45..3bd6706447 100644
--- a/input/ascii-art/standchen-as9.ly
+++ b/input/ascii-art/standchen-as9.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 
 % Process as:
diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly
index f079963be1..ebf0bbf5de 100644
--- a/input/ascii-art/twinkle-as5.ly
+++ b/input/ascii-art/twinkle-as5.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % ASCII Art output
 %
 % Process as:
diff --git a/input/example-1.ly b/input/example-1.ly
index d081d44fd4..40a817561b 100644
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % A simple scale in LilyPond
 %
 % Type:
diff --git a/input/example-2.ly b/input/example-2.ly
index 1fc85134f5..b4bcb5c9ac 100644
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % Some beamed and slurred notes of different taste in LilyPond
 %
 % Type:
diff --git a/input/example-3.ly b/input/example-3.ly
index f653ae059b..8714771e22 100644
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 one =  \notes\relative c{
 	c'' d e f
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 59598b0d65..a0f2465e0c 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.1"
+\version "2.1.7"
 
 \header {
     composer =   "ARTHUR GRAY"
@@ -41,7 +41,7 @@ treble = \new Voice \notes\relative c''{
     | %3
     r4 <cis fis a cis>\arpeggio r8.
 
-    \translator Staff=bass
+    \change Staff=bass
 
     \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) %tweak
 	    
@@ -50,7 +50,7 @@ treble = \new Voice \notes\relative c''{
     | %4
     <dis, a' dis>4)
     
-    \translator Staff=treble
+    \change Staff=treble
     
     \slurUp
     \property PianoStaff.connectArpeggios = ##t
@@ -141,13 +141,13 @@ bass =  \new Voice \notes\relative c{
     r8. e,16(\f_2 <a a,>8[ <b b,>]
     | %2
     <cis cis,>4
-    \translator Staff=treble
+    \change Staff=treble
     \stemDown
     \property Voice.Slur \override #'attachment = #'(stem . stem) %tweak
     <a'' eis cis>4)\arpeggio
     
     \property Voice.Slur \revert #'attachment %tweak
-    \translator Staff=bass
+    \change Staff=bass
     \stemBoth
     
     \property Voice.Slur \revert #'y-free %tweak
@@ -159,13 +159,13 @@ bass =  \new Voice \notes\relative c{
     | %3
     \property Voice.Stem \set #'length = #5 %tweak
     <a a,>4
-    \translator Staff=treble
+    \change Staff=treble
 			    
     \property Voice.Stem \revert #'length %tweak
     \property Voice.Stem \revert #'direction
     \property Voice.Stem \override #'direction = #-1
     <a' fis cis>)\arpeggio
-    \translator Staff=bass
+    \change Staff=bass
     \property Voice.Stem \revert #'direction
     r2
     
diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly
index 3a83b47d61..f83fc41297 100644
--- a/input/mutopia-header.ly
+++ b/input/mutopia-header.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
   title =	"Title"
   subtitle =	"Subtitle"
diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 616c74de86..f8683b8e0b 100644
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -8,7 +8,7 @@
   copyright =   "Public Domain"
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \include "nederlands.ly"
 
@@ -81,9 +81,9 @@ ii =  \context Staff \notes\relative c'{
   r <cis e> r <cis e> | r <b d> r <a d> | r <g b> r <a cis> |
   r <a cis> r <a cis> |
 
-  \translator Staff=bass\voiceOne
+  \change Staff=bass\voiceOne
   r <g b> r <fis a> r <fis a> | r <g bes>
-  \translator Staff=treble\voiceTwo
+  \change Staff=treble\voiceTwo
   r <a c> r <a d> |
 
   r <bes d> r <bes d> | r <g c> r <bes d> | r <c es> r <d g> |
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 49af8024c2..51dd4e2da3 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -26,7 +26,7 @@
 
 }
 
-\version "2.1.3"
+\version "2.1.7"
 manuscriptBreak = { \break }
 \paper  {
     staffheight = 6.0 \mm
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 06892f7294..7eb9d157fc 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -42,7 +42,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.1.1"
+\version "2.1.7"
 
 dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1
 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index ab682d9bd2..e921a6c5b3 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % #(ly:set-point-and-click 'line-column)
 
diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index a6c22044fb..06995fe580 100644
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 %{
  Header for Petites Preludes.
@@ -67,9 +67,9 @@ two =   \notes\relative c{
 	a8.\mordent bes16  g8.\prall f16 |
 	\stemDown
 	f2 e2 |
-	\translator Staff=lower \stemUp
+	\change Staff=lower \stemUp
 	r4 a, bes b |
-	\translator Staff=upper \stemDown\tieDown
+	\change Staff=upper \stemDown\tieDown
 	r16 b' a g  f8. f16 e2 ~ |
 	%5
 	e2 ~ e4 ~ e16 e f! d |
@@ -109,13 +109,13 @@ four =   \notes\relative c{
 	d2 cis |
 	\skip 1*2 |
 	\skip 4*3
-	\translator Staff=upper \stemUp
+	\change Staff=upper \stemUp
 	\property Voice.NoteColumn \override #'horizontal-shift = #1
 	c''4 |
 	%5
 	a gis ~ gis16 gis fis e 
 	\skip 4*1
-	\translator Staff=lower \stemDown
+	\change Staff=lower \stemDown
 	\property Voice.NoteColumn \override #'horizontal-shift = #0
 	\stemUp\tieUp
 	b2 a |
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 6dfd251b51..14dfc673ed 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -38,7 +38,7 @@
 %}
 
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 
@@ -61,7 +61,7 @@ dux =  \context Voice=two \notes \relative c''{
 %%10 
   as4 r8 a bes bes16 a bes8 f |
   g4 r8 g as as g
-  \translator Staff = bass \stemUp 
+  \change Staff = bass \stemUp 
   f |
   r8 
   as, bes c r8 as16 g as8 f8 |
@@ -69,7 +69,7 @@ dux =  \context Voice=two \notes \relative c''{
   f des' c bes c as g f |
 %%15
   g8
- \translator Staff = treble
+ \change Staff = treble
    \stemDown
 
   g'16 fis g8 c, 
@@ -83,10 +83,10 @@ dux =  \context Voice=two \notes \relative c''{
 %%20
   c16 f es d
    c
-  \translator Staff = bass
+  \change Staff = bass
   \stemUp
    bes! as g 
-  f8 \translator Staff = treble
+  f8 \change Staff = treble
   \stemDown
   as' g f |
   es d es f b, c d b |
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index b7ec743366..34b0565b49 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 \include "deutsch.ly"
 
 \include "paper16.ly"
-\version "2.1.1"
+\version "2.1.7"
 
 \header {
   title = "Romanzen"
@@ -19,9 +19,9 @@
   copyright = "Public Domain"
 }
 
-u = { \translator Staff = up  \stemDown }
-m = { \translator Staff = mid  \stemUp  }
-d = { \translator Staff = down  \stemUp }
+u = { \change Staff = up  \stemDown }
+m = { \change Staff = mid  \stemUp  }
+d = { \change Staff = down  \stemUp }
 
 forcedBreak = \break
 
@@ -115,7 +115,7 @@ rightb = \notes \transpose c cis' {
  \property Voice.PhrasingSlur \revert #'extra-offset
  \property Voice.PhrasingSlur \revert #'beautiful
 
- \translator Staff=mid
+ \change Staff=mid
  \relative c { \stemDown \slurDown
   a4^1( g8^1 b4^1 a8^1 |
   f8..^1 f32^1 g8^2  a4.)^1 |
@@ -136,7 +136,7 @@ rightb = \notes \transpose c cis' {
   f4) e8 |
  f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 |
  \tieDown c4.~<f, c  >16\< \tieBoth <f h>~ < f^3 h >8[\>\! < e b^2> \!] |
- \translator Staff=mid
+ \change Staff=mid
  \transpose c' c {
   a4^1( g8^1 b4 a8^2 |
   f8..^1 f32^1 g8^2  a8..)   \slurUp <f f'^3>32( <g g'^4>8 |
@@ -175,7 +175,7 @@ lefta = \notes \transpose c cis {
   \property Voice.NoteColumn \override #'horizontal-shift = #-1 des' s
  }
  >>
- \translator Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp
+ \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp
  f4^1( e8^1 g4^1 f8^1 |
  d8..^1 d32^2 e8^1  f4.) |
  a4^1( g8 b4 a8 |
@@ -229,7 +229,7 @@ leftb = \notes \transpose c cis {
   d) e( f16_4 d_5  c4.)_ \markup { \finger "4-3" }~ |
  \oneVoice
  c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8  c,8) |
- \translator Staff = down \stemDown \tieDown
+ \change Staff = down \stemDown \tieDown
  f16^\pp c f, c e c-3 g c-2 f, c f c |
  d c f, c-3 e c f c-2 f, c-3 e c |
  f c-2 f, c-3 e c ~ c c8 c c16 ~ |
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index b061695b19..6c18d94845 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -30,7 +30,7 @@ virtuoso that taught in Geneva.
 
 %}
 
-\version "1.9.8"
+\version "2.1.7"
 
 \include "mozart-hrn3-defs.ly"
 \include "mozart-hrn3-allegro.ly"
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
index c280ffe204..f2ba62f4e0 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \include  "mozart-hrn3-defs.ly"
 
 allegro =
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index 3ded8e1afa..a2070ed616 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -4,7 +4,7 @@ longgrace = \property Voice.Stem \override #'stroke-style = #'()
 endlonggrace = \property Voice.Stem \revert #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.1.1"
+\version "2.1.7"
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index 4089d6cb67..64b08c77b7 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "1.9.8"
+\version "2.1.7"
 \include  "mozart-hrn3-defs.ly"
 
 romanze = \notes \relative c' {
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
index daf35a0cb3..ef5d0d8929 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 % \include "mozart-hrn3-defs.ly"
 
diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly
index 3206a53654..184525ec0b 100644
--- a/input/no-notation/bar-check.ly
+++ b/input/no-notation/bar-check.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly
index da4ed39e92..82ae4a62be 100644
--- a/input/no-notation/beam-warn.ly
+++ b/input/no-notation/beam-warn.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header	{
 
diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
index f9c92a03c1..7902dd4de3 100644
--- a/input/no-notation/denneboom.ly
+++ b/input/no-notation/denneboom.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 filename = 	 "denneboom.ly"
 enteredby = 	 "jcn"
diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly
index 7b0320b44d..7c8e3544e9 100644
--- a/input/no-notation/die-staff.ly
+++ b/input/no-notation/die-staff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header  {
 texidoc = "a staff should really die, if no one's referencing it."
diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly
index a1eacb87c7..a432f686ce 100644
--- a/input/no-notation/midi-grace.ly
+++ b/input/no-notation/midi-grace.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{ texidoc = "Tests MIDI output with grace notes. " }
 
 \score { 
diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
index aa6e12abd1..844e4c9325 100644
--- a/input/no-notation/midi-transposing.ly
+++ b/input/no-notation/midi-transposing.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Transposing
 The transposing property leaves output invariant, but has effect on MIDI. "
diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly
index 70e5519410..35488164f7 100644
--- a/input/no-notation/midi-tuplets.ly
+++ b/input/no-notation/midi-tuplets.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "
 
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 26d714630c..be41ad5ac5 100644
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly
index f0ad992d04..3b305713aa 100644
--- a/input/no-notation/parse.ly
+++ b/input/no-notation/parse.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % Test parser error
 
diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly
index 6a3da47cef..595c8eeaff 100644
--- a/input/no-notation/parse2.ly
+++ b/input/no-notation/parse2.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % Test parser error
 
diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly
index ee08388019..be74782dca 100644
--- a/input/no-notation/parse3.ly
+++ b/input/no-notation/parse3.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % Test parser error
 
diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly
index 323159f762..c0f6de07de 100644
--- a/input/no-notation/parse4.ly
+++ b/input/no-notation/parse4.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % Test parser error
 
diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly
index c87acd94bb..12a313d1d6 100644
--- a/input/no-notation/parse5.ly
+++ b/input/no-notation/parse5.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 %If you specify two different key sigs at one point, a
 %warning is printed.
 
diff --git a/input/no-notation/pc-direction.ly b/input/no-notation/pc-direction.ly
index eb997f6c91..24df023967 100644
--- a/input/no-notation/pc-direction.ly
+++ b/input/no-notation/pc-direction.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 % move to regtest once it works?
 
diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 2ccb66f51a..5956919c96 100644
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.1.2"
+\version "2.1.7"
 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events
diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly
index 4f9c5d0ee1..54a9de71fa 100644
--- a/input/no-notation/textcresc.ly
+++ b/input/no-notation/textcresc.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="crashes lily"
 }
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index c4687c43e0..e0b87021b9 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
diff --git a/input/regression/+.ly b/input/regression/+.ly
index 75438d20b4..7751617108 100644
--- a/input/regression/+.ly
+++ b/input/regression/+.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?
diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index 8c0a0fdca6..a7e5b3cb04 100644
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Cautionary accidentals are indicated using either
diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 27541916f1..f6e6e14667 100644
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 	texidoc = "If two forced accidentals happen at the same time, only one
 	sharp sign is printed."
diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index 7a7da7c85e..c1a0ce912d 100644
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc = "Ledger lines are shortened when there are accidentals."
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index 8de4a256c9..c9e70e58ea 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 7d912da1ba..e91cd28cc2 100644
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index f6265628a9..d1e87b1230 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea
 the spacing when unbroken."
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 rechts = \notes \relative c' {
   \clef treble
diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 8f66fcb29b..fd73d1ef92 100644
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index b725220887..ddee5e71b0 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -52,7 +52,7 @@ paper block:
 
 
  %}
-\version "1.9.8"
+\version "2.1.7"
 
 upper = \notes \relative c {
 	\clef "treble"
diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index 6a8972f47b..96eea73f99 100644
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index bc48a2bb1a..f2dd8f2627 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8" 
+\version "2.1.7" 
 \header {
 
 texidoc = "The @code{\applyoutput} expression is the most flexible way to
diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index df9a197d85..b13faa8d3f 100644
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -1,6 +1,6 @@
 
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 A square bracket on the left indicates that the player should not
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 2a3754dc44..c242801b44 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index ff300028b9..6c0b2436fb 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.
diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index 98bb715437..7569239afd 100644
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="No auto beams will be put over (manual) repeat bars."
diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index b9561621e2..05b64595ce 100644
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -4,7 +4,7 @@
 texidoc = "Automatic beaming is also done on tuplets."
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \score{
 	\notes\relative c''{
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index cf34e93434..f4c684db74 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc = "Tuplet-spanner should not put (visible) brackets on
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index 98fec82a3f..151d11dd9e 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -5,7 +5,7 @@ texidoc="Test automatic beamer: the last measure should have a single beam."
 
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index e851ab0425..8e9d6b4eeb 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index 595677b041..786d43beb0 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index 8b55ed541b..9a51400d5f 100644
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index afc6ea19fa..87d90160b1 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc="Automatic kneeing. A knee is made when a horizontal
 beam fits in a gap between note heads that is larger than a predefined
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index de2867cca0..b4df6e5579 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -4,7 +4,7 @@
 "
 
 }
-\version "1.9.8"
+\version "2.1.7"
     \paper { raggedright= ##t }
 
 \score { \notes \relative c''  {
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index 82c016ef8c..24c6ea13ba 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -1,6 +1,6 @@
 
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 
     texidoc="Simple beams on middle staffline are allowed to be
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 6103ab3601..d58b2f83c1 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 
 texidoc = "Concave beams should be horizontal. Informally spoken,
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 3e736c9ce8..16d0e5ccbb 100644
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 
@@ -11,9 +11,9 @@ with explicit staff switches)."
 \score {
   \notes \context PianoStaff <<
     \context Staff = "up" \notes\relative c''{
-      b8[ \translator Staff="down" d,, ]
-      c[ \translator Staff="up" c'' ]
-      b,[ \translator Staff="down" d^"no knee" ]
+      b8[ \change Staff="down" d,, ]
+      c[ \change Staff="up" c'' ]
+      b,[ \change Staff="down" d^"no knee" ]
     }
     \context Staff = "down" {
       \clef bass 
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index a0a36e16db..f2e59165f6 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Cross staff  (kneed) beams don't cause extreme slopes."
 }
@@ -10,16 +10,16 @@
     \relative c'' <<
         {
 	    \stemDown
-            f16( \> d b\! \translator Staff = down \stemUp
+            f16( \> d b\! \change Staff = down \stemUp
             \clef treble g ~ < g e>8)
 	    
-	     e[ \translator Staff = up
+	     e[ \change Staff = up
 	    \stemDown
 	    e e]
-	    \translator Staff = down
+	    \change Staff = down
 	    \stemUp
 	    e8.[
-		\translator Staff = up
+		\change Staff = up
 	    \stemDown
 	    e8.]
 	    
diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly
index 9c6a159793..de3acf0888 100644
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index 5f0395ed8f..e492909457 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
     texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index ca4ce35e79..fb86e86c3c 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index 48d49cfbcd..c2bf98eca6 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index f6e74019e4..dfcabaf1c5 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc=" Funky kneed beams with beamlets also work. The beamlets
diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index 79d30c0d5f..f6f99900b8 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
     texidoc = "Knee beaming, complex configurations.  According to
diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index b6b5329f73..c8b8e82cf1 100644
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Point-symmetric beams should receive the same
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index f0744c24d4..c70c0c8f9e 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index 858dfa9bf2..4877eeffbe 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index 09239079e3..8cb0c0648c 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Kneed beams (often happens with cross-staff beams)
@@ -13,9 +13,9 @@ to the last beam.
 	 \context PianoStaff \relative c' <<
 	     \context Staff = SA {
 		 \stemDown
-		  c8[ c16 \translator Staff = SB \stemUp c16 ]
+		  c8[ c16 \change Staff = SB \stemUp c16 ]
 		 \stemBoth
-		  f[ g \translator Staff = SA a c] 
+		  f[ g \change Staff = SA a c] 
 			       }
 	     \context Staff = SB \relative c' {
 \clef bass
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index 9ad6c67f86..067346afec 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Explicit beams may cross barlines. "
 }
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 2ff6c1db1a..3009c73c41 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 
 texidoc=" Beams on ledgered notes should always reach the middle staff
diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly
index b041e6680f..dd718ad13b 100644
--- a/input/regression/beam-postfix-notation.ly
+++ b/input/regression/beam-postfix-notation.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Beams and ties may be entered in postfix notation, separating the
diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly
index a73c3a4f8d..0e1137bfc1 100644
--- a/input/regression/beam-quanting-32nd.ly
+++ b/input/regression/beam-quanting-32nd.ly
@@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden'
 
 }
 
-\version "1.9.9"
+\version "2.1.7"
 
 \score {
     \notes \relative c''{ 
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index f66994b52d..b0533084c0 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index be89dfd10c..d98f737177 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
     texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 38fd6cc8c8..d785ee7234 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -3,7 +3,7 @@
  texidoc = "The number of beams doesn't change on a rest."
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \score { \notes \relative c, {
   \clef bass	 
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index 15347ce0dd..1f09ce7a1e 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
   texidoc="
 Seconds are tricky.  We used to have problems with seconds being too
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index b16c79af64..cf0417a0cf 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
     texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly
index e1cb8cbed5..e7f698467b 100644
--- a/input/regression/beamed-chord.ly
+++ b/input/regression/beamed-chord.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc = "Hairy case for beam, chord, and automatic knees."
diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index cccd3b14c4..0e17f782f3 100644
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Automatic beaming works also in ternary time sigs."
 }
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index b38b6ec99d..7fb2154377 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index a9292803fa..95cca693c6 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Beams (simple)."
 }
diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly
index cc763cb0d2..3540a09bd1 100644
--- a/input/regression/between-systems.ly
+++ b/input/regression/between-systems.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/break.ly b/input/regression/break.ly
index 755b6e92c7..c5fbc2ec3f 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 1f4ea6c6e4..26d2061da4 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index dbf04c1895..b03c5230cd 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Breathing signs are available in different tastes: commas (default),
diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly
index 0c0c59a83d..39ea66c4e6 100644
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="Property chordChanges: display chord names only when
diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly
index 0510863342..e7943b8644 100644
--- a/input/regression/chord-name-entry-11.ly
+++ b/input/regression/chord-name-entry-11.ly
@@ -1,4 +1,4 @@
-\version "1.9.8" 
+\version "2.1.7" 
 
 \header {
 
diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly
index 90be246550..0a3864052f 100644
--- a/input/regression/chord-name-entry.ly
+++ b/input/regression/chord-name-entry.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly
index 25cda8bbb0..8d7ae1f982 100644
--- a/input/regression/chord-name-exceptions.ly
+++ b/input/regression/chord-name-exceptions.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "The property @code{chordNameExceptions} can used
     to store a list of special notations for specific chords.
 
diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly
index 611067decf..44ddf8f7d9 100644
--- a/input/regression/chord-name-major7.ly
+++ b/input/regression/chord-name-major7.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "The layout of the major 7 can be tuned with
 @code{majorSevenSymbol}."
diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly
index f0d7146185..8c1c84b049 100644
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index 6e4bf72b30..8404662be2 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Scripts can also be attached to chord elements."
diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly
index 348ea14774..64b03d4540 100644
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc = "
   Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. 
diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly
index 8f2d1f5a7e..0dd1b95701 100644
--- a/input/regression/chord-tremolo.ly
+++ b/input/regression/chord-tremolo.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index af85f60685..1725812698 100644
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index 0a588922a0..68887d85b4 100644
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8" \header {
+\version "2.1.7" \header {
 
     texidoc = "Octavation signs may be added to clefs.  These
 octavation signs may be placed below or above (meaning an octave
diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly
index b0b3687edf..4ccdb268f7 100644
--- a/input/regression/clefs.ly
+++ b/input/regression/clefs.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index 850d4a4838..332ce4c950 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index 6834095968..a41f71a642 100644
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Collisions for single head notes. "
 }
diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly
index 4e8442cea7..48dbd571ee 100644
--- a/input/regression/collision-dots.ly
+++ b/input/regression/collision-dots.ly
@@ -5,7 +5,7 @@
   on the right side."
 }
 
-\version "1.9.8"
+\version "2.1.7"
     \paper { raggedright= ##t }
 
 
diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 0b2dc6c185..e49a5736a8 100644
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 3f295d71d2..27b7857e79 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc =
 
diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index d74507e5bd..a9dea65812 100644
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "If NoteCollision has merge-differently-dotted set, note
diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index 0db6ea43e4..578751a82a 100644
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -2,7 +2,7 @@
 
     texidoc  = "When merging heads, the dots are merged too."
     }
-\version "2.1.6"
+\version "2.1.7"
 
 \score {
 \notes {
diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index 5ede4c857f..8d73e58fff 100644
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index cc2692cf29..f0b5507c52 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Normal collisions. We have support for polyphony, where the
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index bf7d4f7888..343867fbb3 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index 753f9d93f4..7e129b0181 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 2ac9e404d6..a38d2c8def 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Custodes in various styles."
 }
diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index cbf6d849cf..fe89674e56 100644
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }
diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index dd246b5924..ef9d8fa2dd 100644
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,4 +1,4 @@
-\version "1.9.8" \header{
+\version "2.1.7" \header{
 
 
     texidoc=" Noteheads can have dots, and rests
diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 839fa283d2..95ba4501af 100644
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -8,7 +8,7 @@ texidoc = "Drum notation, although kludgy, should work."
 
 \include "drumpitch-init.ly"
 
-\version "1.9.8"
+\version "2.1.7"
 
 drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index 11e42df9b7..677efb0049 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc = "Broken crescendi should be open on one side."
 }
diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index e1a68c4781..1f8777654b 100644
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {texidoc = "Dynamic letters are kerned, and their weight
 matches that of the hairpin signs.  The dynamic scripts should be
diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index fdb18807fe..da79f7819f 100644
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc=" Dynamics appear below or above the staff.  If multiple
 dynamics are linked with (de)crescendi, they should be on the same
diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index b9142bf8c4..e1ac4db0f4 100644
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc = "Crescendi may start off-notes. In that case, they should  not collapse into flat lines."
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 0465b7f949..954dddbe64 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc  = " Ez-notation prints names in note heads.
diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index 1b9791b5b0..d798a4d53d 100644
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "
 Figured bass is created by the FiguredBass context which eats
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index 42638ae560..37ba338f6a 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "With the new chord syntax it's possible to associate
diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 28f5fc262b..c5e4fe24b9 100644
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Automatic fingering tries to put fingering instructions
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index 9932b1a891..068dfc7f63 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
        texidoc = "
 When put across line breaks, only the part before the line break is
@@ -13,7 +13,7 @@ printed. The line-spanners connects to the Y position of the note  on the next l
 	    \property PianoStaff.followVoice = ##t	    
                 \context Staff=one \notes\relative c''{
 		    a1 \break
-		    \translator Staff=two
+		    \change Staff=two
 		    a,
 		}
         \context Staff=two { \clef bass \skip 1*2 }
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index 8909e45f0a..3d9e5c1db3 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "The magnification can be set for any font. Note
 that this doesn't change variable symbols such as beams or slurs. " }
 
diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index bdb594591f..3a593d8cb8 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index a468da80d6..1e890f4e7e 100644
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index 7779a0bc74..81944583e7 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 93ddebd3ec..bfa5820df5 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
     texidoc = "The autobeamer is not confused by grace notes."
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index 4fa1cdbb48..f77b2c20f1 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Bar line should come before the grace note."
 }
diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index c39e5c88bf..3a57526eb0 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Grace notes do tricky things with timing. If a measure
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index d78efb21e9..ffc86350c7 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -9,6 +9,6 @@ Unbeamed grace notes are not put into normal beams.
     \paper { raggedright= ##t }
 
 
-\version "1.9.8"
+\version "2.1.7"
 \score { \notes\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 0fd6aecec3..2da5aa27a1 100644
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc="@cindex Grace End
diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly
index d43e4784fc..ee9c339ca4 100644
--- a/input/regression/grace-nest.ly
+++ b/input/regression/grace-nest.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \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." 
 
diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly
index 4708200494..105bff0309 100644
--- a/input/regression/grace-nest1.ly
+++ b/input/regression/grace-nest1.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \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." 
 
diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly
index bc73c841a0..eb1bafa9b1 100644
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \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." 
 
diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index f614ac8d19..c73895f739 100644
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Another nested grace situation."
     }
diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index aeb0517127..9714029740 100644
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Another combination of grace note nesting."
 }
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index 4de3cb3884..c7eb20ee58 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Another nested grace situation."
     }
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index e1bb3b172b..01a8818805 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Partcombiner and grace notes can go together."
 }
diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 29f23c1562..3c3e28c3e2 100644
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc = "Stripped version of trip.ly.  Staffs should be of correct length."
 }
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index 5051c70d1d..d181d4ea26 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Pieces may begin with grace notes."
 }
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 170471e59d..7315701fae 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc = "Here startGraceMusic should set no-stem-extend to true;
 the two grace beams should be the same here.
diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index 5464d0b395..75e8fed50b 100644
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header  {
   texidoc = "Grace notes in different voices/staves are synchronized."
 }
diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index b8e056e812..1d7c6cdf88 100644
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Different grace types explained: the base grace switches to smaller type. The appoggiatura also inserts a slur, and the
 acciaccatura inserts a slur and slashes the stem." 
diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index 52b6da4510..948121ccc3 100644
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Grace notes and unfolded repeats.
 Line breaks may happen before  grace  notes.
diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index 9c837d3153..2d4fc03620 100644
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index e3970b90d5..9c5ee30b21 100644
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 716171dcd7..d5d2f643bf 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly
index ec5062115a..30ac62e611 100644
--- a/input/regression/hairpin-dashed.ly
+++ b/input/regression/hairpin-dashed.ly
@@ -1,4 +1,4 @@
-\version  "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc ="Hairpin crescendi may be dashed. "
diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 567c3142f1..91cbd65187 100644
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 09ac793702..ed645ef91e 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc =
 
diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index 823d201bd1..928041192d 100644
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -7,7 +7,7 @@ including alterations. "
 }
 
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 textFlat = \markup {\smaller \musicglyph #"accidentals--1"}
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index 3bd5bbd828..841f87ee7c 100644
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Instrument names are also printed on  partial starting measures."
 }
diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index 456da02175..5d8850e4da 100644
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Staff margins are also markings attached to barlines.  They should be
diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index 150a66f17d..ee9bccc1f2 100644
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "Tests placement of accidentals in every clef. " }
 
 \score { \notes
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 8a9856f9ba..7fb37292bb 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Key signatures appear on key  changes. They may also
diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 2c3d8d783a..c500d983d9 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc ="Polyphonic rhythms and rests don't disturb
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index f162738f8d..902814303b 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index bd962a554f..78b576802e 100644
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc= "Tests lyric extenders. "}
 
diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index 7f40046aa1..c14ebdc9a8 100644
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {texidoc="Tests lyric hyphens. "}
 \score{
 	<<
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index 2e6bea12de..0c2de01f8b 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
   texidoc="Lyric phrasing
 
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index d168e50ac3..2316d0fa6a 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/lyrics-extender.ly b/input/regression/lyrics-extender.ly
index e19717351a..cc01c865f2 100644
--- a/input/regression/lyrics-extender.ly
+++ b/input/regression/lyrics-extender.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
     texidoc =
 
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index cb9fea6d42..ece841ac79 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
     texidoc = "Melismata are triggered by manual beams." 
diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly
index f92aa64b7b..3bf16f3daf 100644
--- a/input/regression/lyrics-multi-stanza.ly
+++ b/input/regression/lyrics-multi-stanza.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Lyrics syllables are aligned according to
diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 14c6b59259..55b158797e 100644
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -3,7 +3,7 @@
     texidoc = "The note markup function is used to make metronome
  markings. It works for a variety of flag dot and duration settings."
 }
-\version "1.9.8"
+\version "2.1.7"
 
 \score { \notes { c4^\markup {
     \note #0 #0 #1
diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index bac0db6a44..a3d9e0e58b 100644
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {texidoc="Stacking of markup scripts."}
 \paper { raggedright = ##t}
 \score { \notes { c''^\markup { "a" \column < "1" \bold "2"  "3" > } } }
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 54b093f4c8..a416e5a8bb 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -8,7 +8,7 @@ of Steve Martland's Dance Works. "
 
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index 15b08cf36c..a4cfa0290f 100644
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
 texidoc = "There is limited support for mensural notation: note head
diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index e52c229e81..d7e1855b16 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -9,7 +9,7 @@ The marking is left aligned with the time signature, if there is one.
     
     }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \score { \notes \relative c'' {   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 }
 \paper {  raggedright = ##t }
diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index 19fef80f72..fb501c2e2e 100644
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly
index cc2d85d66c..b7366e9b98 100644
--- a/input/regression/mmrest-collision.ly
+++ b/input/regression/mmrest-collision.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "Tests a collision between multimeasure rests in
 different voices. " }
 \score {
diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index bcb87a9dc1..8bb9dbcc7b 100644
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc=" You can write molecule callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly
index bf0120c709..2fe246af64 100644
--- a/input/regression/multi-measure-rest-center.ly
+++ b/input/regression/multi-measure-rest-center.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
   texidoc = "The multimeasure rest is centered exactly between bar lines."
diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly
index 1a1cd9e7c7..9b296b91e3 100644
--- a/input/regression/multi-measure-rest-grace.ly
+++ b/input/regression/multi-measure-rest-grace.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 3c6dbb7da4..7e75fccaff 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "This combines instrument names and multimeasure rests (there was an
 interesting bug in 1.3.98). " }
 
diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index 77f3a2a7c4..5ed082757b 100644
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -2,7 +2,7 @@
 independent on prefatory matter in other staves."
 
 	  }
-\version "2.1.6"
+\version "2.1.7"
 
 \score {
 \notes    << \new Staff  { R1 } 
diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index a15a2fea16..ad683e81c7 100644
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header  {
 
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 33f45f16bd..7b2332191e 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 
 texidoc="
diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index 8d5436d5af..475c61afdd 100644
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -11,7 +11,7 @@ dynamics are left over. These are put onto the 2nd measure."
 
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 #(define (notes-to-skip m)
 "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index a45921df8d..104e24743d 100644
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -2,7 +2,7 @@
 texidoc = "New markup syntax."
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 \score {
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index fea0195db2..2d95c668fe 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
     texidoc=" Text is set with empty horizontal dimensions.  The
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 4e69c1d347..76439dd008 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index f2609c4a7a..5be5123953 100644
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc = "Note heads are flipped on the stem to prevent collisions.
diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 8d09d5e2ea..63705f9977 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Note head shapes are settable.  The stem endings should be adjusted
diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index 4b574f9677..0059f64e94 100644
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -1,12 +1,12 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc = "Note head lines (e.g. glissando)
 run between centers of the note heads."
 }
 
-su = \notes{ \translator Staff = up}
-sd = \notes{ \translator Staff = down}
+su = \notes{ \change Staff = up}
+sd = \notes{ \change Staff = down}
 
 \score {
     \context PianoStaff
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 06722e86e5..6e7140cca2 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly
index 80543edb93..7ce44e8ef1 100644
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -8,7 +8,7 @@ line, and the horizontal line doesn't stick out."
 
 
 }
-\version "1.9.8"
+\version "2.1.7"
 
 
 \paper { raggedright = ##t} 
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index fd028918df..a271427c03 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -6,7 +6,7 @@ use of the scheme function @code{set-octavation}.
 "
 
 }
-\version "1.9.8"
+\version "2.1.7"
 
 
 \paper { raggedright = ##t} 
diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly
index 9461bb3595..a4cb9d5895 100644
--- a/input/regression/pc-mmrest.ly
+++ b/input/regression/pc-mmrest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc="Multi measure rests of second voice should not disappear."
 }
diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly
index f29d330c61..5614ee444c 100644
--- a/input/regression/pc-switch-slur.ly
+++ b/input/regression/pc-switch-slur.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="The partcombiner should not combine two small slurs into a big one."
 }
diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly
index becbaec23c..28f2307b43 100644
--- a/input/regression/phrasing-slur.ly
+++ b/input/regression/phrasing-slur.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc="Slurs play well with phrasing slur."
diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index f07ae5a248..3debb0f9c1 100644
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index 06a81a48a1..e16a6f4ed8 100644
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Distances between prefatory items (eg. clef, bar, etc.)
diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly
index 7c79d5919f..7c54c67293 100644
--- a/input/regression/property-once.ly
+++ b/input/regression/property-once.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Once properties take effect during a single time step only."
 }
diff --git a/input/regression/rehearsal-mark.ly b/input/regression/rehearsal-mark.ly
index 4b24bbaa33..4969852dce 100644
--- a/input/regression/rehearsal-mark.ly
+++ b/input/regression/rehearsal-mark.ly
@@ -4,7 +4,7 @@
 can be incremented automatically or manually.  "}
 
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 global =  \notes {
diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly
index 9907799f91..02ca13aa00 100644
--- a/input/regression/repeat-fold.ly
+++ b/input/regression/repeat-fold.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly
index 87a077c525..7c9cc72b8b 100644
--- a/input/regression/repeat-line-break.ly
+++ b/input/regression/repeat-line-break.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index e04a799b82..eeb2066c1b 100644
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly
index 3b057e1647..0f755284bb 100644
--- a/input/regression/repeat-percent.ly
+++ b/input/regression/repeat-percent.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Measure  repeats are supported, and may be nested with beat repeats."
 }
diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly
index c79ace33ea..922fdeb73b 100644
--- a/input/regression/repeat-slash.ly
+++ b/input/regression/repeat-slash.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Beat repeats are supported."
 }
diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly
index 4514bd97b0..09c3b6d70d 100644
--- a/input/regression/repeat-unfold-all.ly
+++ b/input/regression/repeat-unfold-all.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc = "Repeats may be unfolded through the Scheme function @code{unfold-repeats}."
diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly
index ad4eb6a0d7..314aac5d35 100644
--- a/input/regression/repeat-unfold.ly
+++ b/input/regression/repeat-unfold.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly
index 30effa0c48..54b7310e7b 100644
--- a/input/regression/repeat-volta-skip-alternatives.ly
+++ b/input/regression/repeat-volta-skip-alternatives.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "When too few alternatives are present, the first
diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly
index f804c9306c..6f89fe848d 100644
--- a/input/regression/repeat-volta.ly
+++ b/input/regression/repeat-volta.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/rest-collision-default.ly b/input/regression/rest-collision-default.ly
index cd627dfa7a..235401754e 100644
--- a/input/regression/rest-collision-default.ly
+++ b/input/regression/rest-collision-default.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header
 {
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 722c6c4703..4cace5b16e 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly
index a1b2caa602..3a74722372 100644
--- a/input/regression/rest-ledger.ly
+++ b/input/regression/rest-ledger.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Whole and half rests moving outside the staff should get
 ledger lines."
diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index c5f9a42cbf..00ddc14703 100644
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Rests can have pitches--these will be affected by
diff --git a/input/regression/rest.ly b/input/regression/rest.ly
index 8d581dbd36..cddc4ab58c 100644
--- a/input/regression/rest.ly
+++ b/input/regression/rest.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly
index ead2116182..b3cff734c6 100644
--- a/input/regression/rhythmic-staff.ly
+++ b/input/regression/rhythmic-staff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
 
diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index ea5630f81b..fd368a424e 100644
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly
index 932cffb4af..7caf5e5989 100644
--- a/input/regression/script-stack-order.ly
+++ b/input/regression/script-stack-order.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Scripts can be stacked. The order is determined by a
 priority field, but when objects have the same priority, the input
diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly
index 532767fa44..58599225b2 100644
--- a/input/regression/script-stacked.ly
+++ b/input/regression/script-stacked.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \paper { raggedright= ##t }
 
diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index fb1a7e10b1..a5515b365c 100644
--- a/input/regression/size11.ly
+++ b/input/regression/size11.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index 601c187e9a..2c2f95f101 100644
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index 371724c1fa..ffbbe417ba 100644
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index aec8422b25..80369be245 100644
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index ec0d53609c..6d8634c5a1 100644
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index b07aec4780..b36fa9ef56 100644
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 foollilypondbook = "
 \score
 "
diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly
index 6fbb72f88b..56e56da060 100644
--- a/input/regression/slur-area.ly
+++ b/input/regression/slur-area.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
     texidoc = "The area underneath an (up) slur is minimised to improve the shape. "
diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly
index e66495c2c7..c209fe95ce 100644
--- a/input/regression/slur-attachment.ly
+++ b/input/regression/slur-attachment.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 52f2f72c4f..a1fbbecdaf 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index ce19cc7ed4..2f287d94c3 100644
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 The same goes for slurs. They behave decently when broken across
@@ -12,32 +12,32 @@ linebreak.
 	\context PianoStaff <<
 	\context Staff=one \notes\relative c'{
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c  c) |
-		\translator Staff=one
+		 c4( c \change Staff=two c  c) |
+		\change Staff=one
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c  c) |
+		 c4( c \change Staff=two c  c) |
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c  c) |
-		\translator Staff=two
+		 c4( c \change Staff=one c  c) |
+		\change Staff=two
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c  c) |
-		\translator Staff=two
+		 c4( c \change Staff=one c  c) |
+		\change Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c  c) |
+		 c4( \change Staff=one c c  c) |
 		r2
-		\translator Staff=two
+		\change Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c
+		 c4( \change Staff=one c
 		   \break
 		c  c)
 		r2
 %		\stemDown \slurDown
-%		 c4( \translator Staff=two c c \translator Staff=one  c)
+%		 c4( \change Staff=two c c \change Staff=one  c)
 		\stemDown \slurDown
-		 d4( \translator Staff=two c c \translator Staff=one  d)
-		\translator Staff=two
+		 d4( \change Staff=two c c \change Staff=one  d)
+		\change Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c \translator Staff=two  c)
+		 c4( \change Staff=one c c \change Staff=two  c)
 		r1
 	}
 	\context Staff=two \notes\relative c'{
diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index 653e7a641c..5ee7e3cd48 100644
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="Slurs should not get confused by augmentation dots.  We use a lot
 of dots here, to make problems more visible."
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 7bb2b4c834..05a688659c 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Slurs should look nice and symmetric.  The curvature may increase
diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index e423e594ed..787a6a5a58 100644
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
     texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly
index fccc4ec214..3cca5e2e7c 100644
--- a/input/regression/slur-staccato.ly
+++ b/input/regression/slur-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc="Manual hack for slur and staccato."
 }
diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly
index 8bc865d449..028054cf65 100644
--- a/input/regression/slur-stem-broken.ly
+++ b/input/regression/slur-stem-broken.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc="Trend of broken slur with user-overridden stem attachment should also
 follow the same vertical direction it would have had in unbroken state."
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index b41edc3b20..d245c1ec29 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index a7cfe75abc..e7a5ed24e0 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header
 {
     texidoc = "Symmetric figures should lead to symmetric slurs."
diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index 8e8417e21a..c15767326f 100644
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header { 
 texidoc = "Accidentals in different staffs don't effect the
diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index 4b24197ad0..36101c1e6d 100644
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc = "Accidentals don't influence the amount of stretchable space. "
diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly
index 69b87df9c0..4dfd920457 100644
--- a/input/regression/spacing-accidental.ly
+++ b/input/regression/spacing-accidental.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc = "Accidentals sticking out to the left
diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly
index fd64bd7125..ac2652155b 100644
--- a/input/regression/spacing-bar-stem.ly
+++ b/input/regression/spacing-bar-stem.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Downstem notes following a barline are
 printed with some extra space. This is an optical correction similar
diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index 5616da87f6..7f0f8f31f7 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Clef changes at the start of a line get much more space
diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly
index b38ca30378..56d42053e8 100644
--- a/input/regression/spacing-end-of-line.ly
+++ b/input/regression/spacing-end-of-line.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
     texidoc ="Broken matter at the end of line does not upset the
diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly
index fc683b0a3b..1ae5f5ba8f 100644
--- a/input/regression/spacing-ended-voice.ly
+++ b/input/regression/spacing-ended-voice.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."
diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly
index 0b1dd4f38d..eeb69ed8dd 100644
--- a/input/regression/spacing-folded-clef.ly
+++ b/input/regression/spacing-folded-clef.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "A clef can be folded below notes in a different staff, if
 this doesn't disrupt the flow of the notes."
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 1bd00dc9f5..23ae86d3c5 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly
index 0321188527..0b01ee99e2 100644
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "Spacing uses the duration of the notes, but disregards
diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly
index 522e799796..2f64aa2f62 100644
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc = "Grace note spacing. Should be tuned? "
 }
diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly
index 2eba02f4df..1dd77fe473 100644
--- a/input/regression/spacing-knee.ly
+++ b/input/regression/spacing-knee.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "For knees, the spacing correction is such that the
diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index 918fb22937..68ab438227 100644
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc =  "Concurrent tuplets should be spaced equidistantly on
 all staffs.
diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index 315be69b06..50f2f9bb39 100644
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -17,5 +17,5 @@ raggedright = ##t
     }
      }
 
-\version "1.9.8"
+\version "2.1.7"
 
diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index 1d08d875d7..84a94c9851 100644
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Rests get a little less space, since they are narrower.
 However, the feta quarter rest is relatively wide, causing this effect to be
diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly
index 5bf461c997..ff67aa28d3 100644
--- a/input/regression/spacing-short-notes.ly
+++ b/input/regression/spacing-short-notes.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
 texidoc = "Notes that are shorter than the common shortest note, Get a
diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly
index f474dbcfd0..47b17b6fbf 100644
--- a/input/regression/spacing-stem-bar.ly
+++ b/input/regression/spacing-stem-bar.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Upstem notes before a barline are printed with some extra
diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly
index 5a986322b5..12425074dc 100644
--- a/input/regression/spacing-stem-direction.ly
+++ b/input/regression/spacing-stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 
diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index b2742736df..868588151c 100644
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 	texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and only works if
diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly
index d827538dfc..fc1ddc6184 100644
--- a/input/regression/spacing-to-grace.ly
+++ b/input/regression/spacing-to-grace.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc ="Space from a normal note/barline to a grace note is
diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly
index c0115f1cbe..f47499af95 100644
--- a/input/regression/spacing-very-tight.ly
+++ b/input/regression/spacing-very-tight.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "
  When tightly spaced, hinterfleisch -> 0.
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index ba562f59e6..1886a8ea5e 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Span bars draw only in between staff bar lines, so setting those to transparent shows bar lines between systems only.
 "
diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index 0d55bdd5c4..247de66def 100644
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly
index 16fa8a227e..f088dc8fda 100644
--- a/input/regression/staff-tweak.ly
+++ b/input/regression/staff-tweak.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "The staff is a grob, and may be adjusted as well: this one
  shows a staff with 6 thick line, and a slightly large staffspace.
diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index cba123eb4f..3e3743fc61 100644
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,4 +1,4 @@
-\version "2.1.4"
+\version "2.1.7"
 
 \header {
 texidoc = "Stanza numbers are put left of their lyric."
diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly
index 736ce7d17d..73ae30999f 100644
--- a/input/regression/stem-direction.ly
+++ b/input/regression/stem-direction.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly
index f892e42f68..40d6160280 100644
--- a/input/regression/stem-shorten.ly
+++ b/input/regression/stem-shorten.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     
diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly
index 86a29f3da9..9b1ae59904 100644
--- a/input/regression/stem-spacing.ly
+++ b/input/regression/stem-spacing.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 096d832be1..286bbabd92 100644
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 7183bbc5cf..86ef3e34c5 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "LilyPond correctly determines the size of every
diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly
index 6a97ada34b..2bdc183f24 100644
--- a/input/regression/system-start-bracket.ly
+++ b/input/regression/system-start-bracket.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc =
 "
diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly
index 6aa109156b..45f5cc27ea 100644
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "The @code{\\tag} command marks music expressions with a
diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 3980ecf03b..24f79f7a6e 100644
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc= "Text spanners should not repeat start text when broken."
 }
diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly
index 5668b62a72..3a4f6484a7 100644
--- a/input/regression/tie-accidental.ly
+++ b/input/regression/tie-accidental.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/tie-break-accidental.ly b/input/regression/tie-break-accidental.ly
index 78a3250728..a04d7c9171 100644
--- a/input/regression/tie-break-accidental.ly
+++ b/input/regression/tie-break-accidental.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc = "First and second bes (tied across line break)
diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 844cb538c4..2224225359 100644
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
diff --git a/input/regression/tie-chord-partial.ly b/input/regression/tie-chord-partial.ly
index 04e5e7e8e5..69c180ba51 100644
--- a/input/regression/tie-chord-partial.ly
+++ b/input/regression/tie-chord-partial.ly
@@ -6,7 +6,7 @@ putting the Tie engraver at Thread level, and redirecting untied notes
 to a different thread."
 
 }
-\version "1.9.8"
+\version "2.1.7"
     \paper { raggedright= ##t }
 
 \score {
diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index 565860e66e..ae03122c34 100644
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 texidoc="
 When tying chords, the outer slurs point outwards, the inner slurs
diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly
index cfaf565026..96e956ab68 100644
--- a/input/regression/tie-dots.ly
+++ b/input/regression/tie-dots.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Ties should not collide with dots."
 }
diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly
index ad8eadc83f..ee166af335 100644
--- a/input/regression/tie-grace.ly
+++ b/input/regression/tie-grace.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "Tieing a grace to the to a following grace or main note works."
 }
diff --git a/input/regression/tie.ly b/input/regression/tie.ly
index 3f5912c8e1..1e3fe202e9 100644
--- a/input/regression/tie.ly
+++ b/input/regression/tie.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index bfdd5af576..00f3ec82d4 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "In combination with a beam, the bracket of the tuplet
diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 467913024c..53d870fdf5 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc="Manual hack for nested tuplets, move outer tuplet up."
 }
diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 753c685f15..310d7234a2 100644
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -6,7 +6,7 @@ NB should have no bracket, B should have bracket.
 }
  
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 \score { 
diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly
index 71093aa389..814ffdc1f0 100644
--- a/input/regression/tuplet-rest.ly
+++ b/input/regression/tuplet-rest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {texidoc = "Tests tuplet rests. "}
 
 \score {
diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly
index a19e7ef827..881a3097cb 100644
--- a/input/regression/tuplet-staffline-collision.ly
+++ b/input/regression/tuplet-staffline-collision.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc = "Horizontal tuplet brackets are shifted vertically
diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly
index 1190023565..3c257ddb5d 100644
--- a/input/regression/tuplets.ly
+++ b/input/regression/tuplets.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
     
 texidoc="
diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly
index ab60b28730..90fb397815 100644
--- a/input/regression/voice-follower.ly
+++ b/input/regression/voice-follower.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header { texidoc= "
@@ -15,7 +15,7 @@ can be printed automatically. This is enabled if the property
     \property PianoStaff.followVoice = ##t
     \context Staff = one \context Voice {
       c1
-      \translator Staff=two
+      \change Staff=two
       b2 a
     }
     \context Staff = two {\clef bass \skip 1*2 }
diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index b94d628348..4e6bf3e865 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc ="Broken volta spanners behave correctly at left edge in all cases."
diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index ec0188e0c9..39f1db7c6a 100644
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -4,7 +4,7 @@
     texidoc = "By setting @code{voltaOnThisStaff}, repeats can be put on more staffs in a score."
 
 }
-\version "1.9.8"
+\version "2.1.7"
 
 
 vmus = \notes { \repeat volta 2 c1 \alternative { d e } } 
diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index 54bf19c477..f779df0e9c 100644
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
@@ -12,15 +12,15 @@
     \key c \minor
 
 
-<< { \property Voice.Stem \override #'direction = #'()   	\translator Staff = down
+<< { \property Voice.Stem \override #'direction = #'()   	\change Staff = down
     \property Voice.subdivideBeams = ##t	     
  	g16.[
-	\translator Staff = up
-	c'''32 	\translator Staff = down
-	g32 \translator Staff = up
-	c'''32	\translator Staff = down
+	\change Staff = up
+	c'''32 	\change Staff = down
+	g32 \change Staff = up
+	c'''32	\change Staff = down
 	 g16]
-	\translator Staff = up
+	\change Staff = up
 \property Voice.Stem \revert #'direction
 	\property Voice.followVoice = ##t
 	c'''32([ b''16 a''16 gis''16 g''32)]  } \\
@@ -52,7 +52,10 @@
 
 \paper { linewidth = -1.0
 
-	\translator { \StaffContext \consists Horizontal_bracket_engraver }
+	\translator {
+	    \StaffContext
+	    \consists Horizontal_bracket_engraver }
+
 }
 \midi { \tempo 8 = 60 }
 }
diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly
index b3f071508f..74bfd5a4f0 100644
--- a/input/template/gregorian-transcription.ly
+++ b/input/template/gregorian-transcription.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/template/header.ly b/input/template/header.ly
index 1bfb8700b7..097fb3cfce 100644
--- a/input/template/header.ly
+++ b/input/template/header.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index b4eaeb9e92..5590889cf9 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
         title = "Song"
         subtitle = "(tune)"
diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly
index 2bbe2273d2..23d98e43e8 100644
--- a/input/template/melody-chords.ly
+++ b/input/template/melody-chords.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc = "Lead sheet format: chords with melody."
diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 291b9502a6..99c5bcb5bc 100644
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc = "Popsong format: chords, melody and lyrics."
diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index ca00c347f2..9d879732bb 100644
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc = "Melody and lyrics."
diff --git a/input/template/melody.ly b/input/template/melody.ly
index 952eae5788..5a4dae9b08 100644
--- a/input/template/melody.ly
+++ b/input/template/melody.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc = "Only a melody."
diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly
index 69ec17614f..a9abdb1791 100644
--- a/input/template/piano-4-voices.ly
+++ b/input/template/piano-4-voices.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc ="Polyphonic piano music"
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index 33cc264801..7b648e9e89 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.1.1"
+\version "2.1.7"
 \header {
 texidoc ="
   Template that puts dynamics on a separate line, so it is neatly
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 5413878a3e..cd84ccfcd9 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc ="Lyrics between two staffs."
diff --git a/input/template/piano.ly b/input/template/piano.ly
index b941753fb6..6af2917a23 100644
--- a/input/template/piano.ly
+++ b/input/template/piano.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc = "Simple piano music." 
diff --git a/input/template/satb.ly b/input/template/satb.ly
index 08aa43ff32..96c216288b 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "
diff --git a/input/test/+.ly b/input/test/+.ly
index 4440e73cbd..6443c873e2 100644
--- a/input/test/+.ly
+++ b/input/test/+.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?
diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly
index 4f25e21aa2..e17f8ae721 100644
--- a/input/test/ac-extra-voice.ly
+++ b/input/test/ac-extra-voice.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 %% I don't know what this example is supposed to do.  delete it?
 %% It shows how to use the autochange feature together with an extra
diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 4801874ab2..4c693b1155 100644
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index e5dee458d5..594dffca6d 100644
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 texidoc= "@cindex make-music Fingering
diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index df439d9795..c79bbdbc36 100644
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -13,7 +13,7 @@ derived context can then be used in parallel in the same score. (this is not dem
 "
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 #(define (kill-ambitus grob grob-context apply-context)
   (if (memq 'ambitus-interface (ly:get-grob-property grob 'interfaces))
diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
index bcc177173c..9f68b951ab 100644
--- a/input/test/ancient-accidentals.ly
+++ b/input/test/ancient-accidentals.ly
@@ -6,7 +6,7 @@ file lists all of them.
 "
 }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \score { 
   \context Voice \notes\relative c {
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 508806631f..15d4082947 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly
index c994b53cd0..28b24283f3 100644
--- a/input/test/ancient-time.ly
+++ b/input/test/ancient-time.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index dc38f91382..8de938edb0 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "2.1.1"
+\version "2.1.7"
 
 \header {
  texidoc = "@cindex Bagpipe Music
diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index 674c5ad54a..c62a08cb36 100644
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "@cindex Bars Always
diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 7fe68eed0b..e67f69d08b 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Bar line lyric only
 You can move around @code{Bar_engraver} and
 @code{Span_bar_engraver} if you want bar lines on lyrics. "
diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly
index bd8f47a472..602b9e6324 100644
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "@cindex Bar Lines
 Different types of bar lines demonstrated.
diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly
index ed92b5a59a..404a3108c5 100644
--- a/input/test/bar-number-every-five-reset.ly
+++ b/input/test/bar-number-every-five-reset.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc = "@cindex Bar Number Every Fifth Reset
diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly
index f3c5bbb804..17fd7ef0ce 100644
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can also be printed at regular intervals.
 
 " }
 
-\version "2.1.1"
+\version "2.1.7"
 
 \score {
     \context Staff \notes \transpose  c c' {
diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly
index e89fe66f8e..30b8340de2 100644
--- a/input/test/bar-number-show-all.ly
+++ b/input/test/bar-number-show-all.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
     texidoc="@cindex Bar Number Show All
 Second line has bar numbers on start of every measure.
diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly
index c499616751..3e74419f34 100644
--- a/input/test/beam-auto-4-8.ly
+++ b/input/test/beam-auto-4-8.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % keep for now, although merging into beam-auto-override is a possibility.
 \header {
 	texidoc = "@cindex Auto Beaming 4/8
diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index 5e7ef25e00..eebe93b628 100644
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "@cindex Auto Beaming Override
diff --git a/input/test/beam-auto.ly b/input/test/beam-auto.ly
index ddf624cae9..b2735f8c71 100644
--- a/input/test/beam-auto.ly
+++ b/input/test/beam-auto.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc = "@cindex Beaming Presets
 The auto-beam engraver has presets for common time signatures. " }
diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index a568eeb335..1f31ae3b26 100644
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
     texidoc="@cindex Beam Position Control
 
diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly
index 1042fc624d..b947c29cf8 100644
--- a/input/test/beam-count.ly
+++ b/input/test/beam-count.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc="@cindex Beam Count
 
diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly
index 6cfed221a9..23f3bfa803 100644
--- a/input/test/beam-dir-functions.ly
+++ b/input/test/beam-dir-functions.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc = "@cindex Beam Dir Functions
 
diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly
index 69ebed647e..1fb963c782 100644
--- a/input/test/beam-isknee.ly
+++ b/input/test/beam-isknee.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc="@cindex Beam Isknee
 LilyPond can beam across a Piano Staff.
@@ -12,7 +12,7 @@ LilyPond can beam across a Piano Staff.
 	\context Staff=two \notes\relative c'{
 		\clef bass
 % no knee
-		\stemUp  c8[ \translator Staff=one \stemDown g'16 f]
+		\stemUp  c8[ \change Staff=one \stemDown g'16 f]
 		s8
 		s2
 	}
diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly
index 41f33d4713..c550a6ab17 100644
--- a/input/test/beam-neutral-direction.ly
+++ b/input/test/beam-neutral-direction.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc="@cindex Beam Neutral Direction
 When a beam falls in the middle of the staff, LilyPond normally
diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly
index d8d8733382..efba63ec2a 100644
--- a/input/test/beam-rest.ly
+++ b/input/test/beam-rest.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="@cindex Beam Over Rests
diff --git a/input/test/blank-notes.ly b/input/test/blank-notes.ly
index 3de60f2dc8..e8b10ac47b 100644
--- a/input/test/blank-notes.ly
+++ b/input/test/blank-notes.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to invis-notes.ly
 % check if other documents call this "blank notes", though.  I think
 % invisible notes sounds better, but whatever it is, it should be
diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly
index 13a48d058f..29cb3549e1 100644
--- a/input/test/blank-paper-tab.ly
+++ b/input/test/blank-paper-tab.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
 texidoc = "@cindex Blank Paper Tab
diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly
index 06141285d8..b1731df8f5 100644
--- a/input/test/blank-paper.ly
+++ b/input/test/blank-paper.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc="@cindex Blank Paper
 
diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly
index 90359885c2..9f63ab607d 100644
--- a/input/test/boxed-molecule.ly
+++ b/input/test/boxed-molecule.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "@cindex Boxed Molecule
 You can override the molecule callback to draw a box around
diff --git a/input/test/caps.ly b/input/test/caps.ly
index 49bb098c04..db9665e917 100644
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc =  "@cindex Capital Letters
 You can set the font to use small caps.
diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly
index 346bb340ba..d5d690001a 100644
--- a/input/test/cautionaries.ly
+++ b/input/test/cautionaries.ly
@@ -1,4 +1,4 @@
-\version "2.1.1"
+\version "2.1.7"
 \header{
 	texidoc="@cindex Cautionary Accidentals
 LilyPond can display cautionary accidentals in different ways.
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index 16f8c43bd9..896fea3dec 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header  {
     texidoc = "@cindex Chord Names German
 By setting @code{ChordNames.chordRootNamer}, the root
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index b3638d13f9..d89f22b3c7 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 \header {
diff --git a/input/test/chord-names-no-inversions.ly b/input/test/chord-names-no-inversions.ly
index fc2f5e6b43..6d9ab639c2 100644
--- a/input/test/chord-names-no-inversions.ly
+++ b/input/test/chord-names-no-inversions.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc= "@cindex Chord Names No Inversions
 Chord names don't attempt to find inversions and
 bass notes. " }
diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly
index 10b868bf2a..36adb60c85 100644
--- a/input/test/chords-without-melody.ly
+++ b/input/test/chords-without-melody.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 texidoc = "Jazz chords can also be used without notes."
 }
diff --git a/input/test/clef-8-syntax.ly b/input/test/clef-8-syntax.ly
index 6b1be8c613..45a6365cde 100644
--- a/input/test/clef-8-syntax.ly
+++ b/input/test/clef-8-syntax.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "@cindex Chord Octavation
 Appending @code{_8} or @code{^8} to a clef name will
diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly
index 9747831457..b95b424373 100644
--- a/input/test/clef-end-of-line.ly
+++ b/input/test/clef-end-of-line.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
     texidoc = "@cindex Clef End of Line
diff --git a/input/test/clef-manual-control.ly b/input/test/clef-manual-control.ly
index 9a113034df..a3a8ee8519 100644
--- a/input/test/clef-manual-control.ly
+++ b/input/test/clef-manual-control.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header{ texidoc = "
 
 @cindex Clef Manual Control
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index d69a32355e..de1ace728f 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 
 % Ugh, we need to override some LaTeX titling stuff
diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly
index 0dde49d0e5..516e2b74f9 100644
--- a/input/test/count-systems.ly
+++ b/input/test/count-systems.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
     
     texidoc="@cindex Count Systems
diff --git a/input/test/crescendi.ly b/input/test/crescendi.ly
index 62114511b3..c78673d5a0 100644
--- a/input/test/crescendi.ly
+++ b/input/test/crescendi.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc="@cindex Crescendi
 LilyPond can print crescendi in a number of different ways.
diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly
index a9e879020e..22eb71a3c6 100644
--- a/input/test/cue-notes.ly
+++ b/input/test/cue-notes.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % TODO: check to see if this example can be simplified using \small
 % or \tiny.
 \header { texidoc = "@cindex Cue Notes
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index cb3a251be5..13772947b1 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -7,7 +7,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}
 @code{caesura}.
 " }
 
-\version "1.9.8"
+\version "2.1.7"
 
 \include "gregorian-init.ly"
 
diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly
index 679d7bf713..b41409f362 100644
--- a/input/test/drarn-slurs.ly
+++ b/input/test/drarn-slurs.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to slurs-?
 % TODO: find out what drarn means, and if there's an overlap with drarn.ly
 \header{
diff --git a/input/test/drarn.ly b/input/test/drarn.ly
index fa9760b80c..c2c154c74a 100644
--- a/input/test/drarn.ly
+++ b/input/test/drarn.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{texidoc="@cindex Drarn
 You can attach slurs and ties to noteheads.
 " }
diff --git a/input/test/dynamic-absolute-volume.ly b/input/test/dynamic-absolute-volume.ly
index 921b1a236b..b001156f97 100644
--- a/input/test/dynamic-absolute-volume.ly
+++ b/input/test/dynamic-absolute-volume.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "@cindex Dynamic Absolute Volume
 Absolute dynamics have effect in MIDI files.
diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index d8c69e7b18..e0872caae3 100644
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % probably should be merged into refman.
 \header{
     texidoc = "@cindex Dynamic Piu Forte
diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index c2ab7ba4e1..b64c887993 100644
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc = "@cindex Embedded Postscript
 By inserting the @TeX{} command \embeddedps, you can
diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly
index 340d4ba4d8..dd66fad17a 100644
--- a/input/test/embedded-scm.ly
+++ b/input/test/embedded-scm.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % TODO: does this work?  It doesn't do anything with 1.7.20
 \header {texidoc="@cindex Embedded scm
 You can embed scm functions in your scores.
diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly
index b228020dd6..ab216fb262 100644
--- a/input/test/embedded-tex.ly
+++ b/input/test/embedded-tex.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{ texidoc="@cindex Embedded Tex
 You can embed Tex commands in your score. "}
 
diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
index 2c588f82d0..8ccfab85f3 100644
--- a/input/test/engraver-contexts.ly
+++ b/input/test/engraver-contexts.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In
diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index ab5bac7ad9..cf40b9689c 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     
 texidoc = "The notation problem, @emph{what} symbols to create,
diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index d3e1017bbf..77ef7ecc7f 100644
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 % definitely wil be renamed to something.
 %{
diff --git a/input/test/figured-bass-alternate.ly b/input/test/figured-bass-alternate.ly
index 75ef37575d..997e28db78 100644
--- a/input/test/figured-bass-alternate.ly
+++ b/input/test/figured-bass-alternate.ly
@@ -3,7 +3,7 @@
 texidoc = "An alternate method to make bass figures is to use
 markup texts."
 }
-\version "2.1.1"
+\version "2.1.7"
 
 nat = \markup { \musicglyph #"accidentals-0" }
 sh = \markup { \smaller \raise #0.6 \musicglyph #"accidentals-1" }
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index 0e81466d5b..b08dd3980e 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 %possible rename to paper-fill-a4.ly -gp
 % candidate for reg -gp
 % Han says no, but keeping this comment temporarily so that I don't
diff --git a/input/test/follow-thread.ly b/input/test/follow-thread.ly
index 49be030893..1735cefec4 100644
--- a/input/test/follow-thread.ly
+++ b/input/test/follow-thread.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % MERGED: stuff from follow-break.ly to follow-thread.ly
 
 % followVoice: connect note heads with line when thread switches staff 
@@ -15,10 +15,10 @@ property @code{followVoice}. " }
 		\context Staff=one \context Voice {
 			\property Voice.VoiceFollower \set #'style = #'dashed-line
 			c'1
-			\translator Staff=two
+			\change Staff=two
 			b2 a
 % these lines from follow-break.ly:
-			\translator Staff=one
+			\change Staff=one
 			a1
 		    }
 		\context Staff=two {\clef bass \skip 1*3 }
diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly
index 645ba168d7..acdcaeeaab 100644
--- a/input/test/force-hshift.ly
+++ b/input/test/force-hshift.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc="@cindex Force hshift
 Force hshift to override collisions. " }
diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index b5951a2985..a08f12383a 100644
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 
     texidoc="@cindex Gourlay
diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index d02fd0f0e6..94ea6065d4 100644
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     title	= "Gregorian Scripts"
     texidoc     = "@cindex Gregorian Scripts
diff --git a/input/test/harmonic.ly b/input/test/harmonic.ly
index 3b24892c5c..fe8161e264 100644
--- a/input/test/harmonic.ly
+++ b/input/test/harmonic.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc ="@cindex Artificial Harmonics
 For stringed instruments, artificial harmonics are notated with
diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index 7a2029edcd..f7d0bce5cc 100644
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 
 #(define (my-ly-version)
diff --git a/input/test/hshift.ly b/input/test/hshift.ly
index b26902ca76..467f400fe3 100644
--- a/input/test/hshift.ly
+++ b/input/test/hshift.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Horizontal Shift
 You can manually shift notes horizontally. " }
 
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 74518b78b4..f327e902b9 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "
 
diff --git a/input/test/improv.ly b/input/test/improv.ly
index 287908bd8b..4304dbabeb 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 texidoc =
@@ -13,8 +13,8 @@ Noteheads for improvisation have a different shape.
 " }
 
 
-improOn = \notes {\translator Voice = impro }
-improOff = \notes {\translator SquashVoice = melo }
+improOn = \notes {\change Voice = impro }
+improOff = \notes {\change SquashVoice = melo }
 
 global = \notes { s1*3 \bar "|." }
 
diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index 63708f6651..31a7abd483 100644
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Incipit
 This shows how to make an ``incipit'' to indicate scordatora 
 tuning of a violin part, using the clefStyle property.
diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index 2b2d27fcca..8091d8de88 100644
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can name the whole grandstaff in addition to individual staffs. " }
 
diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
index 134f6f39d5..64587b940b 100644
--- a/input/test/lilypond-testpage.ly
+++ b/input/test/lilypond-testpage.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % MERGE with title.ly -gp
 
 %{
diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly
index 93ad626f1c..71091a3b5f 100644
--- a/input/test/maximum-rest-count.ly
+++ b/input/test/maximum-rest-count.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to rest-foo
 \header {
     texidoc = "@cindex Rest Collision Count
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 575eb8b26c..87e4387641 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
diff --git a/input/test/midi-scales.ly b/input/test/midi-scales.ly
index fd48a48280..44a8d7fa01 100644
--- a/input/test/midi-scales.ly
+++ b/input/test/midi-scales.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % candidate for regression.  -gp
 \header {
   texidoc="MIDI and midi2ly test file.  Diff between this and midi2ly.py should be minimal."
diff --git a/input/test/move-accidentals.ly b/input/test/move-accidentals.ly
index 4e78c1c6d7..e9a94a51f1 100644
--- a/input/test/move-accidentals.ly
+++ b/input/test/move-accidentals.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to scheme- or something like that.  -gp
 \header { texidoc= "@cindex Scheme Manual Accidentals
 Positions of accidentals may be manually set. This
diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index b006d3e8a4..91fb1e2f0d 100644
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to scheme- or something like that.  -gp
 \header { texidoc = "@cindex Scheme Move Text
 You can move objects around with scheme.  This example shows how to
diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 9fe7c8d542..cd4da197de 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
@@ -62,7 +62,7 @@ using Scheme functions to avoid typing work. " }
 
 
 
-\version "1.9.8"
+\version "2.1.7"
 
 pat = \notes \transpose c c' \repeat unfold 2 {
   << { \context Staff=up {r8 e16 f g e f g } }
@@ -73,8 +73,8 @@ pat = \notes \transpose c c' \repeat unfold 2 {
   >>
 }
 
-enda = \notes { r8 f,16 a, c f c a, \stemUp c \translator Staff = down
-      a, f, a, f, d, f, d, \translator Staff = up \stemBoth
+enda = \notes { r8 f,16 a, c f c a, \stemUp c \change Staff = down
+      a, f, a, f, d, f, d, \change Staff = up \stemBoth
       r8 g16 h d' f' d' h d' h g h d f e\prall d <e g c'>1^\fermata \bar "|."
 }
 endb = \notes {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."}
diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly
index eabb1fa176..8af5a48bd3 100644
--- a/input/test/nested-groups.ly
+++ b/input/test/nested-groups.ly
@@ -1,4 +1,4 @@
-\version "1.9.8" 
+\version "2.1.7" 
 
 \header{ texidoc="@cindex Nested Staff Groups
 LilyPond can print nested groups of staffs. "
diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index e044a58c0c..0444486aa2 100644
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly
index 86abee963d..cf4bf5821e 100644
--- a/input/test/no-staff.ly
+++ b/input/test/no-staff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
diff --git a/input/test/octave-duplicate.ly b/input/test/octave-duplicate.ly
index 7b51e106cb..4f47a22524 100644
--- a/input/test/octave-duplicate.ly
+++ b/input/test/octave-duplicate.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc="@cindex Octave Doubling
 Octave doubling parts of music. "
 }
diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index eaaafc2cd3..98d26e9e66 100644
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % pretty much a duplicate of extra-staff.ly. candidate for merge or delete. -gp
 
 \header { texidoc = "@cindex Ossia
diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly
index bcf0124b10..fa0ac90317 100644
--- a/input/test/part-combine-moments.ly
+++ b/input/test/part-combine-moments.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % TODO: this example has a ton of text for very little output.
 % Is it all needed?  -gp
 % should this go to regression or be delete'd?   -gp
diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly
index 9cae495334..3b6226fda4 100644
--- a/input/test/part-combine-staff.ly
+++ b/input/test/part-combine-staff.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Part Combine Staff
 You can combine parts on two staffs, as well as two voices. "
 }
diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly
index da77be00a0..c37ab7c06a 100644
--- a/input/test/part-combine.ly
+++ b/input/test/part-combine.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc="@cindex Part Combine
 In orchestral scores and hymns, voices are traditionally combined onto
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index 7df80243ff..256a328436 100644
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % check with invisible-notes or blank-notes.  possible rename. -gp
 \header{ texidoc = "@cindex Partial Blank
 When entering half music (i.e. for students to complete by hand)
diff --git a/input/test/pedal.ly b/input/test/pedal.ly
index e7f383bc4a..6230833d0e 100644
--- a/input/test/pedal.ly
+++ b/input/test/pedal.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc = "@cindex Pedal
 Piano pedal symbols merge stop and start.  The strings are configurable. 
diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly
index c8b9511da1..5602cd9c81 100644
--- a/input/test/phrasing-slur-height.ly
+++ b/input/test/phrasing-slur-height.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header{ texidoc="@cindex Phrasing Slur Height
 Make PhrasingSlur higher, to avoid colission from other slurs. "
 }
diff --git a/input/test/polymetric-differing-notes.ly b/input/test/polymetric-differing-notes.ly
index ff3fc8572a..fdd86409a6 100644
--- a/input/test/polymetric-differing-notes.ly
+++ b/input/test/polymetric-differing-notes.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc="
 
diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly
index 63c689d1bc..8cc7d41358 100644
--- a/input/test/polymetric.ly
+++ b/input/test/polymetric.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc="@cindex Time Signature Multiple
 
diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly
index 46a509cc13..3592f576e1 100644
--- a/input/test/preset-extent.ly
+++ b/input/test/preset-extent.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "
 
 @cindex Preset Extent
diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly
index 91ab8b3d0d..3e5c6552a9 100644
--- a/input/test/repeat-manual.ly
+++ b/input/test/repeat-manual.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Repeat Manual
 You can manually control repeat signs and numbers to produce
 unusual output. "
diff --git a/input/test/repeat-shorter-bracket.ly b/input/test/repeat-shorter-bracket.ly
index dfe53faa70..ff4138a2e0 100644
--- a/input/test/repeat-shorter-bracket.ly
+++ b/input/test/repeat-shorter-bracket.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 	texidoc="
 
diff --git a/input/test/repeat.ly b/input/test/repeat.ly
index e2160baa37..78ecf4de9b 100644
--- a/input/test/repeat.ly
+++ b/input/test/repeat.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to lyric-repeat or repeat-lyric.
 \header{ texidoc = "@cindex Repeat Lyrics
 You can use alternate lyrics as well as alternate notes for repeats. "
diff --git a/input/test/rest-dot-positions.ly b/input/test/rest-dot-positions.ly
index 8404608f8f..7644cc18f4 100644
--- a/input/test/rest-dot-positions.ly
+++ b/input/test/rest-dot-positions.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % candidate for regression.  -gp
 \header { texidoc = "@cindex Rest Dot Positions
 This file tests dotted rests. " }
diff --git a/input/test/rests.ly b/input/test/rests.ly
index 8631d51444..564f6dd272 100644
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {
     texidoc = "@cindex Rests
 
diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly
index 6adb953751..1ad20e94cf 100644
--- a/input/test/reverse-music.ly
+++ b/input/test/reverse-music.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to scheme-something.
 \header { texidoc="@cindex Scheme Reverse Music
 Simple customised music apply. "
diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly
index 1953a35d05..6963896468 100644
--- a/input/test/rhythm-excercise.ly
+++ b/input/test/rhythm-excercise.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Rhythm Exercise
 This example shows a way to generate rhythm exercises with
 LilyPond (e.g. no staff but retaining the barlines). "
diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly
index e2af516cf6..f99145ea08 100644
--- a/input/test/scales-greek.ly
+++ b/input/test/scales-greek.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
   texidoc = "@cindex Scales Greek
 Show different scales."
diff --git a/input/test/scheme-interactions.ly b/input/test/scheme-interactions.ly
index 007ed5bca6..82dfb306dd 100644
--- a/input/test/scheme-interactions.ly
+++ b/input/test/scheme-interactions.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Scheme Interactions
 With @code{ly:export}, you can pass of the result of
 Scheme expressions as lilypond input.  Within a Scheme expression,
diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index 8a0be763d4..62ff7fc519 100644
--- a/input/test/script-abbreviations.ly
+++ b/input/test/script-abbreviations.ly
@@ -1,7 +1,7 @@
 
 % this chart is used in the manual too.
 
-\version "1.9.8"
+\version "2.1.7"
 \header { texidoc = "@cindex Script Abbreviations
 
 Some scripts may be entered using an abbreviation.
diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly
index 3b38c613d1..a63e4bdb28 100644
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 % this chart is used in the manual too.
 
diff --git a/input/test/script-priority.ly b/input/test/script-priority.ly
index ca57399876..585aad7f5a 100644
--- a/input/test/script-priority.ly
+++ b/input/test/script-priority.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Script Priority
 Relative placements of different script types can be controlled
diff --git a/input/test/script-stack.ly b/input/test/script-stack.ly
index 40a6b0f6f0..4ebc914f9a 100644
--- a/input/test/script-stack.ly
+++ b/input/test/script-stack.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Stacked Text Articulation
 You can stack text and articulations. "
diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly
index bfe8e5fb3b..3f840583c1 100644
--- a/input/test/separate-staccato.ly
+++ b/input/test/separate-staccato.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename.  -gp
 
 \header { texidoc="@cindex Seperate Staccato
diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly
index 7cfbfbf970..7d0becae8c 100644
--- a/input/test/slur-attachment-override.ly
+++ b/input/test/slur-attachment-override.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{
 texidoc="@cindex Slur Attachment Override
diff --git a/input/test/slur-beautiful.ly b/input/test/slur-beautiful.ly
index 723bdfbb07..6ec1cf91ee 100644
--- a/input/test/slur-beautiful.ly
+++ b/input/test/slur-beautiful.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % TODO bit too wordy; edit a bit to cut stuff.  -gp
 \header { texidoc ="@cindex Slur Beautiful
 Similarly, the curvature of a slur is adjusted to stay clear of note
diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index 1f60bee86f..9d25005777 100644
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {texidoc = "@cindex Slur, dotted
 You can print different kinds of slurs (dotted, dashed, etc). "
 } 
diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
index aff25e344f..77ff2d15f3 100644
--- a/input/test/slur-manual.ly
+++ b/input/test/slur-manual.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 \header {
 
 
@@ -21,7 +21,7 @@
 	\set #'control-points =
 	#'((0 . -4) (2 . 0) (60 . 0) (63 . 4))
 			   c8( as' f c' as f c as' f
-			   \translator Staff = up
+			   \change Staff = up
 			   \clef treble
 			   c' as f' c as' f c' as
 			   f' c as' f c'4)
diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly
index 3d2771b718..4c0901255f 100644
--- a/input/test/slur-minimum-length.ly
+++ b/input/test/slur-minimum-length.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Slur Minimum Length
 You can set the minimum length of a slur. " 
diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly
index e4afdb16cf..ae3b58535b 100644
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc="@cindex Slur Ugly
 You can get ugly slurs, if you want. "
diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly
index 2aec4f5fc1..8133a150c3 100644
--- a/input/test/spacing-2.ly
+++ b/input/test/spacing-2.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % more yummy regression goodness.  -gp
 \header {
 texidoc = "
diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly
index 6774af8cd3..63d27e532d 100644
--- a/input/test/spanner-after-break-tweak.ly
+++ b/input/test/spanner-after-break-tweak.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Spanner after break
 
diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 3184d8afb0..8ca8d1fc0e 100644
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{texidoc = "@cindex Staff Bracket
 Here's an example of staff brackets. "
diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 9505b6242e..8a791c1bef 100644
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index 6418038c0c..d76c98fbee 100644
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc="@cindex Staff Lines
 Set staff symbol property. "
diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index 91e681647c..14ccc00ce9 100644
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.6"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Staff Size
 
diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly
index 3d59278ce5..880b0cae29 100644
--- a/input/test/staff-space.ly
+++ b/input/test/staff-space.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc ="@cindex Staff Space
 Setting staff space on a staff. "
diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly
index 8044152ce2..d904f0d0a2 100644
--- a/input/test/stem-centered.ly
+++ b/input/test/stem-centered.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to ancient- something.
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads
diff --git a/input/test/stem-cross-staff.ly b/input/test/stem-cross-staff.ly
index 884bf1a3e5..d1821911d9 100644
--- a/input/test/stem-cross-staff.ly
+++ b/input/test/stem-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Stem Cross Staff
 There is no support for putting chords across staves.
diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index 9171863a48..9c303a86e0 100644
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Stem Extend
 You can stop LilyPond from extending stems to the center line. "
diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly
index c43e5068ff..7458780b1e 100644
--- a/input/test/stem-length.ly
+++ b/input/test/stem-length.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc = "@cindex Stem Length
 You can alter the length of stems. "
diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index bf734e4e8d..37bc68a696 100644
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 \header {texidoc = "@cindex Tablature hammer
 You can fake a hammer in tablature with slurs. "
 } 
diff --git a/input/test/tablature.ly b/input/test/tablature.ly
index ab70f5d337..a4fa587e8b 100644
--- a/input/test/tablature.ly
+++ b/input/test/tablature.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header{ texidoc = "@cindex Tabulature
 A sample tablature, with both normal staff and tab.
diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 47fb367ed9..fc1e824262 100644
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.0.0"
+\version "2.1.7"
 
 \header {
 
diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly
index b1863808a6..0f645c5edd 100644
--- a/input/test/text-spanner.ly
+++ b/input/test/text-spanner.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.7"
+\version "2.1.7"
 % TODO: check about other ottava functions.
 
 \header { texidoc = "@cindex text spanner
diff --git a/input/test/textscript.ly b/input/test/textscript.ly
index 02fd55c52b..5d96662aa7 100644
--- a/input/test/textscript.ly
+++ b/input/test/textscript.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Textscript
 Test font selection and scm text markup. "
diff --git a/input/test/tie-cross-voice.ly b/input/test/tie-cross-voice.ly
index 87515b7516..ce582b2cf3 100644
--- a/input/test/tie-cross-voice.ly
+++ b/input/test/tie-cross-voice.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 
 
diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly
index cd006fdfad..4d0c04b680 100644
--- a/input/test/tie-sparse.ly
+++ b/input/test/tie-sparse.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc = "@cindex Tie Sparse
 Setting sparseTies causes only one tie to be
diff --git a/input/test/time-signature-double.ly b/input/test/time-signature-double.ly
index f2685208a5..715669be18 100644
--- a/input/test/time-signature-double.ly
+++ b/input/test/time-signature-double.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc= "
 
diff --git a/input/test/time.ly b/input/test/time.ly
index 1726f7564e..39c4371f53 100644
--- a/input/test/time.ly
+++ b/input/test/time.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % TODO: This file could be old.  Ask about it later.  -gp
 
 \header { texidoc =  "@cindex Time
diff --git a/input/test/timing.ly b/input/test/timing.ly
index 57aa7a3bed..c3fbd2e237 100644
--- a/input/test/timing.ly
+++ b/input/test/timing.ly
@@ -1,5 +1,5 @@
 
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to bar-something.
 
 \header{ texidoc = "@cindex Bar Length
diff --git a/input/test/title.ly b/input/test/title.ly
index 0701660eb1..e70ebbaf76 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 % MERGE with lilypond-
 \header {
   filename =  "title.ly"
diff --git a/input/test/to-xml.ly b/input/test/to-xml.ly
index 286c552215..ec2546e35c 100644
--- a/input/test/to-xml.ly
+++ b/input/test/to-xml.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 fooBar = \notes { << c''4 \\ g'4 >> }
 
diff --git a/input/test/trill.ly b/input/test/trill.ly
index cf50e93c6a..8cd763f3fc 100644
--- a/input/test/trill.ly
+++ b/input/test/trill.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header { texidoc="@cindex Trill
 Show trill line type. "
diff --git a/input/test/trills.ly b/input/test/trills.ly
index 9d2d7fc3eb..51f60bda8e 100644
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
   texidoc="@cindex Trills
diff --git a/input/test/unfold-all-repeats.ly b/input/test/unfold-all-repeats.ly
index 8c548053a2..475fa12f32 100644
--- a/input/test/unfold-all-repeats.ly
+++ b/input/test/unfold-all-repeats.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % regression.  -gp
 
 \header { 
diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly
index b963aaaedb..e1f82afdc9 100644
--- a/input/test/vaticana.ly
+++ b/input/test/vaticana.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % possible rename to ancient-something.
 
 \header { texidoc	= "Ancient Vaticana
diff --git a/input/test/version-output.ly b/input/test/version-output.ly
index 8fe6f8952d..5afcc35da8 100644
--- a/input/test/version-output.ly
+++ b/input/test/version-output.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 
 \header {
     texidoc  = "By putting the output of @code{lilypond-version}
diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index 290d4feff8..67e0a9b653 100644
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,4 +1,4 @@
-\version "1.9.8"
+\version "2.1.7"
 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "
diff --git a/input/tutorial/brahms-original.ly b/input/tutorial/brahms-original.ly
index 4ce3a88523..c56febf8f1 100644
--- a/input/tutorial/brahms-original.ly
+++ b/input/tutorial/brahms-original.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \score {
     \notes\context PianoStaff <<
     \context Staff = up
@@ -8,7 +8,7 @@
             fis4-3_\p(~
             fis16 a)-5 } \\
         {
-            fis16(\> d b\! \translator Staff = down
+            fis16(\> d b\! \change Staff = down
             \clef treble g~ <g e>8) } \\
         { s16
           d'
diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly
index 4326da8e51..b0afd9c514 100644
--- a/input/tutorial/brahms-tweaked.ly
+++ b/input/tutorial/brahms-tweaked.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \score {
     \notes\context PianoStaff <<
     \context Staff = up
@@ -18,7 +18,7 @@
             \property Voice.DynamicLineSpanner
 	      \override #'padding = #5.0
             \tieUp
-            fis16(\> d b\! \translator Staff = down
+            fis16(\> d b\! \change Staff = down
 	    \stemUp
 	    \clef treble g~ <g e>8) } \\
         { s16
diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 1095435965..15ee2be301 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.1.7"
 \header{
 filename = 	 "twinkle-pop.ly"
 xtitle = 	 "Ah, vous dirais-je, maman "
diff --git a/lily/lexer.ll b/lily/lexer.ll
index c658e7bf8a..cd6d840329 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -180,6 +180,7 @@ HYPHEN		--
 
 	yy_pop_state();
 	this->here_input().source_file_->name_ = s;
+	progress_indication (_f("\nRenamed input to `%s'", s.to_str0()));
 	scm_module_define (gh_car (scopes_),
 		     ly_symbol2scm ("input-file-name"),
 		     scm_makfrom0str (s.to_str0()));
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index d8dce6cfcc..c351f374f4 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -106,6 +106,19 @@ Tuplet_bracket::brew_molecule (SCM smob)
   if (!columns.size ())
     return mol.smobbed_copy ();
 
+  
+
+  {
+    SCM lp = me->get_grob_property ("left-position");
+    SCM rp = me->get_grob_property ("right-position");  
+
+    if (!gh_number_p (rp) || !gh_number_p (lp))
+      after_line_breaking (smob);
+  }
+  
+  Real ly = gh_scm2double (me->get_grob_property ("left-position"));
+  Real ry = gh_scm2double (me->get_grob_property ("right-position"));  
+  
   bool equally_long = false;
   Grob * par_beam = parallel_beam (me, columns, &equally_long);
 
@@ -151,8 +164,6 @@ Tuplet_bracket::brew_molecule (SCM smob)
 
   Real w = x1 -x0;
   
-  Real ly = gh_scm2double (me->get_grob_property ("left-position"));
-  Real ry = gh_scm2double (me->get_grob_property ("right-position"));  
   SCM number = me->get_grob_property ("text");
 
   Paper_def *pap = me->get_paper ();