From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 8 Mar 2004 00:49:59 +0000 (+0000)
Subject: * scm/translation-functions.scm (fraction-tuplet-formatter):
X-Git-Tag: release/2.1.30~38
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8842378bd0fed31bb365c1c8042519df06d14b9a;p=lilypond.git

* scm/translation-functions.scm (fraction-tuplet-formatter):
reverse fraction.

* lily/parser.yy (context_def_spec_block): use \context instead of
\translator.

* Documentation/user/tutorial.itely (Automatic and manual beams):
editing of tutorial.
---

diff --git a/ChangeLog b/ChangeLog
index 4bd99e88fd..63b1f1cc53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-03-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/translation-functions.scm (fraction-tuplet-formatter):
+	reverse fraction.
+
+	* lily/parser.yy (context_def_spec_block): use \context instead of
+	\translator.
+
 	* lily/[a-g].cc: () style cleanup.
 
 	* Documentation/user/tutorial.itely (Automatic and manual beams):
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 8d4c5b6d3b..c6de4acd6a 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -18,6 +18,8 @@ Version 2.1.13
 
 @itemize @bullet
 
+@item Context definitions now use the word @code{\context} instead of @code{\translator}.
+
 @item Property functions may be used as an argument to @code{set!},
 for example
 
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 2ec683475f..10d42d93c2 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -858,10 +858,10 @@ is fixed beforehand.  This is also done with a
 @internalsref{VerticalAlignment} object, created in
 @internalsref{PianoStaff}. In this object the distance between the
 staves is fixed by setting @code{forced-distance}. If you want to
-override this, use a @code{\translator} block as follows:
+override this, use a @code{\context} block as follows:
 @example
   \paper @{
-    \translator @{
+    \context @{
       \PianoStaffContext
       \override VerticalAlignment #'forced-distance = #9
     @}
@@ -965,7 +965,7 @@ Properties of the  @internalsref{SpacingSpanner} must be overridden
 from the @code{\paper} block, since the @internalsref{SpacingSpanner} is
 created before any property commands are interpreted.
 @example
-\paper @{ \translator  @{
+\paper @{ \context  @{
   \ScoreContext
   SpacingSpanner \override #'spacing-increment = #3.0
 @} @}
@@ -1379,7 +1379,7 @@ by referencing a context identifier:
 
 @example
 \paper @{
-  \translator @{
+  \context @{
     @var{context-identifier}
   @}
 @}
@@ -1392,7 +1392,7 @@ Every predefined context has a standard identifier. For example, the
 The context can then be modified by setting or changing properties,
 e.g.
 @example
-\translator @{
+\context @{
   \StaffContext
   Stem \set #'thickness = #2.0
   defaultBarType = #"||"
@@ -1406,7 +1406,7 @@ command will override any predefined settings.
 @refbugs
 
 It is not possible to collect multiple property assignments in a
-variable, and apply to one @code{\translator} definition by
+variable, and apply to one @code{\context} definition by
 referencing that variable.
 
 @node Changing contexts locally
@@ -1425,7 +1425,7 @@ music can be interpreted in a changed context by using the following syntax
 These statements comes between @code{\new} or @code{\context} and the
 music to be interpreted. The @var{context modifications} property
 settings and @code{\remove}, @code{\consists} and @code{\consistsend}
-commands. The syntax is similar to the @code{\translator} block.
+commands. The syntax is similar to the @code{\context} block.
 
 The following example shows how a staff is created with bigger spaces,
 and without a @code{Clef_engraver}.
@@ -1486,7 +1486,7 @@ the middle C is at its default position, the center line:
     c'4 f'4
   }
   \paper {
-    \translator {
+    \context {
       \StaffContext
       \remove Clef_engraver
     }
@@ -1507,7 +1507,7 @@ example, a very simple Staff context is created: one that will put
 note heads on a staff symbol.
 
 @example
-\translator @{
+\context @{
   \type "Engraver_group_engraver"
   \name "SimpleStaff"
   \alias "Staff"
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index ccf6611e67..6531415182 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -349,7 +349,7 @@ note heads, the @code{Note_heads_engraver}.
 
 \score { \topVoice
 \paper {
-       \translator { \VoiceContext
+       \context { \VoiceContext
        \remove "Stem_engraver"
        \remove "Phrasing_slur_engraver"
        \remove "Slur_engraver"
@@ -358,7 +358,7 @@ note heads, the @code{Note_heads_engraver}.
        \remove "Auto_beam_engraver"
        
        }
-       \translator { \StaffContext
+       \context { \StaffContext
        \remove "Accidental_engraver"
        \remove "Key_engraver"
        \remove "Clef_engraver"
@@ -379,7 +379,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
 
 \score { \topVoice
 \paper {
-       \translator { \VoiceContext
+       \context { \VoiceContext
        \remove "Stem_engraver"
        \remove "Phrasing_slur_engraver"
        \remove "Slur_engraver"
@@ -388,7 +388,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
        \remove "Auto_beam_engraver"
        
        }
-       \translator { \StaffContext
+       \context { \StaffContext
        \remove "Accidental_engraver"
        \remove "Key_engraver"
        \remove "Clef_engraver"
@@ -408,7 +408,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
 
 \score { \topVoice
 \paper {
-       \translator { \VoiceContext
+       \context { \VoiceContext
        \remove "Stem_engraver"
        \remove "Phrasing_slur_engraver"
        \remove "Slur_engraver"
@@ -416,7 +416,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
        \remove "Beam_engraver"
        \remove "Auto_beam_engraver"
        }
-       \translator { \StaffContext
+       \context { \StaffContext
        \remove "Accidental_engraver"
        \remove "Key_engraver"
        \remove "Bar_engraver"
@@ -434,14 +434,14 @@ And the @code{Stem_engraver} adds stems:
 
 \score { \topVoice
 \paper {
-       \translator { \VoiceContext
+       \context { \VoiceContext
        \remove "Phrasing_slur_engraver"
        \remove "Slur_engraver"
        \remove "Script_engraver"
        \remove "Beam_engraver"
        \remove "Auto_beam_engraver"
        }
-       \translator { \StaffContext
+       \context { \StaffContext
        \remove "Accidental_engraver"
        \remove "Key_engraver"
        \remove "Bar_engraver"
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 18e3ff57c2..786549989d 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -306,7 +306,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
     r1 r2 r4 r8 r16 r32 r64 r64 
   }
   \paper {
-    \translator {
+    \context {
       \StaffContext
         \remove "Clef_engraver"
         \override StaffSymbol #'transparent = ##t 
@@ -1011,7 +1011,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to
    }
    \paper {
        raggedright = ##t
-       \translator { \StaffContext
+       \context { \StaffContext
          \consists "Measure_grouping_engraver"
    }}}
 @end lilypond 
@@ -1957,7 +1957,7 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to
 	c4\startGroup
         c4\stopGroup\stopGroup
   }
-  \paper { \translator {
+  \paper { \context {
 	    \StaffContext \consists "Horizontal_bracket_engraver"
 	}}}
 @end lilypond
@@ -2821,7 +2821,7 @@ mus = \drums  { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc
     \paper {
     %% need to do this, because of indented @itemize
     linewidth= 9 \cm 
-    \translator { \ScoreContext
+    \context { \ScoreContext
     \override BarNumber #'transparent =##T
 }}}
 @end lilypond
@@ -3582,7 +3582,7 @@ To apply, add the @internalsref{Ambitus_engraver} to the
 
 @example
   \paper @{
-    \translator @{
+    \context @{
       \VoiceContext
       \consists Ambitus_engraver
     @}
@@ -3610,7 +3610,7 @@ lower = \notes \relative c {
     >>
   }
   \paper {
-    \translator {
+    \context {
       \StaffContext
       \consists Ambitus_engraver
     }
@@ -4541,7 +4541,7 @@ in this example disappears in the second line:
   >>
   \paper {
     linewidth = 6.\cm 
-    \translator { \RemoveEmptyStaffContext }
+    \context { \RemoveEmptyStaffContext }
   }
 }
 @end lilypond
@@ -4832,11 +4832,11 @@ select ancient accidentals.   Supported styles are
     \paper {
         raggedright = ##t 
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator{
+        \context{
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5219,7 +5219,7 @@ following table:
     \paper {
 	indent = 0.0
 	raggedright = ##t
-	\translator {
+	\context {
 	    \StaffContext
 	    \remove Staff_symbol_engraver
 	    \remove Clef_engraver
@@ -5293,7 +5293,7 @@ as shown in the following example:
 
 @example
 \paper @{
-  \translator @{
+  \context @{
      \StaffContext
      \consists Custos_engraver
      Custos \override #'style = #'mensural
@@ -5312,7 +5312,7 @@ The result looks like this:
 	g'
     }
     \paper {
-	\translator {
+	\context {
 	    \StaffContext
 	    \consists Custos_engraver
 	}
@@ -5352,11 +5352,11 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel} and
     \paper {
 	raggedright = ##t 
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator{
+        \context{
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5528,7 +5528,7 @@ To engrave white mensural ligatures, in the paper block the
 
 @example
     \paper @{
-        \translator @{
+        \context @{
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Mensural_ligature_engraver
@@ -5569,7 +5569,7 @@ For example,
         \[ e1 f1 a\breve g\longa \]
     }
     \paper {
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Mensural_ligature_engraver
@@ -5652,11 +5652,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5665,7 +5665,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5694,11 +5694,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5707,7 +5707,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5728,11 +5728,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5741,7 +5741,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5765,11 +5765,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5778,7 +5778,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5804,11 +5804,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5817,7 +5817,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5838,11 +5838,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5851,7 +5851,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5876,11 +5876,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5889,7 +5889,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5915,11 +5915,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5928,7 +5928,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5953,11 +5953,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -5966,7 +5966,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -5987,11 +5987,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6000,7 +6000,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6024,11 +6024,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6037,7 +6037,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6062,11 +6062,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6075,7 +6075,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6096,11 +6096,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6109,7 +6109,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6133,11 +6133,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6146,7 +6146,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6167,11 +6167,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6180,7 +6180,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6205,11 +6205,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6218,7 +6218,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6239,11 +6239,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6252,7 +6252,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6277,11 +6277,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6290,7 +6290,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6311,11 +6311,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6324,7 +6324,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6349,11 +6349,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6362,7 +6362,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6383,11 +6383,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6396,7 +6396,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6417,11 +6417,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6430,7 +6430,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6454,11 +6454,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6467,7 +6467,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6488,11 +6488,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6501,7 +6501,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6522,11 +6522,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6535,7 +6535,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6559,11 +6559,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6572,7 +6572,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6593,11 +6593,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6606,7 +6606,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6627,11 +6627,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6640,7 +6640,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6664,11 +6664,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6677,7 +6677,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6698,11 +6698,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6711,7 +6711,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6732,11 +6732,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6745,7 +6745,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6769,11 +6769,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6782,7 +6782,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6803,11 +6803,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6816,7 +6816,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6837,11 +6837,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6850,7 +6850,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6874,11 +6874,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6887,7 +6887,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6908,11 +6908,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6921,7 +6921,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -6946,11 +6946,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     }
     \paper {
         interscoreline = 1
-        \translator {
+        \context {
             \ScoreContext
             \remove "Bar_number_engraver"
         }
-        \translator {
+        \context {
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
@@ -6959,7 +6959,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
         }
-        \translator {
+        \context {
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
@@ -7550,7 +7550,7 @@ used in music aimed at beginners:
 @lilypond[raggedright,verbatim,staffsize=26]
 \score {
   \notes { c'2 e'4 f' | g'1 }
-  \paper { \translator { \EasyNotation } } 
+  \paper { \context { \EasyNotation } } 
 }
 @end lilypond
 
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4e9dd81d40..dada5aa994 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1367,7 +1367,7 @@ in @ref{Polyphony}.
 
 @cindex staff switch, manual
 @cindex cross staff voice, manual
-@cindex @code{\translator}
+@cindex @code{\context}
 
 Piano music is always typeset in two staves connected by a brace.
 Printing such a staff is similar to the polyphonic example in
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 255710e664..1ae83509c0 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -336,11 +336,11 @@ lowerDynamics = \notes{
 	>>
     >>
     \paper {
-	\translator {
+	\context {
 	    \ScoreContext
 	    \remove Bar_number_engraver
         }
-	\translator {
+	\context {
 	    \type "Engraver_group_engraver"
 	    \name Dynamics
 	    \consists "Output_property_engraver"
@@ -361,7 +361,7 @@ lowerDynamics = \notes{
 	    \consistsend "Axis_group_engraver"
     	}
 
-	\translator {
+	\context {
 	    \PianoStaffContext
 	    \accepts Dynamics
 	    \override VerticalAlignment #'forced-distance = #7
diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index df15e6e7c8..26a5955909 100644
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -7,7 +7,7 @@
   copyright = "Public Domain"
 }
 
-\version "2.1.28"
+\version "2.1.29"
 
 \include "nederlands.ly"
 
@@ -145,7 +145,7 @@ lower = \context Staff \notes \relative c{
     >>
 
   \paper {
-    \translator{
+    \context{
 	    \VoiceContext
     }
   }
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index a3de838949..086eeeaf01 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.1.28"
+\version "2.1.29"
 manuscriptBreak = { \break }
 
 
@@ -165,21 +165,21 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
     >>
 
     \paper {
-	\translator {
+	\context {
 	    \LyricsContext
 	    minimumVerticalExtent = #'(-1.0 . 0)
 	}
-	\translator {
+	\context {
 	    \ScoreContext
 	    \override Beam #'thickness = #0.55
 	    \override SpacingSpanner #'spacing-increment = #1.0
 	    \override Slur #'height-limit = #1.5
 	}
-	\translator {
+	\context {
 	    \PianoStaffContext
 	    \override VerticalAlignment #'forced-distance = #10
 	}
-	\translator {
+	\context {
 	    \StaffContext
 	    minimumVerticalExtent = #'(-3. . 6)
 	}
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index f91fb2d6e8..3762e487b1 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.28"
+\version "2.1.29"
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
@@ -451,7 +451,7 @@ bassStaff = \context Staff = bass<<
 	textheight = 270.0\mm
 	linewidth = 180.0\mm
 
-	\translator { \RemoveEmptyStaffContext }
+	\context { \RemoveEmptyStaffContext }
     }
     \midi{
 	\tempo 4 = 54
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 9b01d60b8c..08a53867c7 100644
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 % #(ly:set-point-and-click 'line-column)
 
@@ -150,11 +150,11 @@ sarabandeCelloStaff = \context Staff <<
 
 % size perversions
 smallerPaper = \paper {
-    \translator { \StaffContext
+    \context { \StaffContext
 		  fontSize = #-1
 		  \override StaffSymbol  #'staff-space = #0.8
 		  }
-    \translator { \ScoreContext
+    \context { \ScoreContext
 		   \override SpacingSpanner #'spacing-increment = #0.96
 		}
 	
@@ -166,7 +166,7 @@ baerPaper = \paper {
     indent = 7. \mm
     linewidth =183.5 \mm
     interscoreline=4.0\mm
-    \translator {
+    \context {
 	     \ScoreContext
 %	     \override System #'print-function = #box-grob-stencil
     }
diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index 40366a419c..40587b59e4 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 "2.1.28"
+\version "2.1.29"
 
 %{
  Header for Petites Preludes.
@@ -151,7 +151,7 @@ global = \notes{
 	>>
 	\paper{
 		linewidth = 17.0 \cm  
-		\translator {
+		\context {
 		    \ScoreContext
 		    \override SpacingSpanner #'spacing-increment = #2.0
 		}
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index fe332dfa19..c98b4dc7b6 100644
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -36,7 +36,7 @@
 %}
 
 
-\version "2.1.28"
+\version "2.1.29"
 
 
 
@@ -207,7 +207,7 @@ bassdux = \context Voice=three \notes \relative c' {
 
     \paper {
         linewidth = 18.0 \cm
-	\translator { \ScoreContext
+	\context { \ScoreContext
 	\override SpacingSpanner #'spacing-increment = #1.0
 	\override SpacingSpanner #'shortest-duration-space = #1.9	
 	}
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index fee197358c..69d79029ec 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"
 
 #(set-global-staff-size 16)
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
   title = "Romanzen"
@@ -274,14 +274,14 @@ leftb = \notes \transpose c cis {
     % textheight = 29.8 \cm
     pagenumber = no
     linewidth = 17.0 \cm
-    \translator {
+    \context {
       \RemoveEmptyStaffContext
     }
-    \translator {
+    \context {
       \ScoreContext
       \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8)
     }
-    \translator {
+    \context {
       \PianoStaffContext
       \override VerticalAlignment #'forced-distance = #13.0
     }
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index 3b4f3ce45d..e92caca81d 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 = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
-\version "2.1.28"
+\version "2.1.29"
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
@@ -30,7 +30,7 @@ stopGraceMusic= \sequential {
 }
 
 \paper{
-    \translator {
+    \context {
         \ScoreContext
         skipBars = ##t
         midiInstrument = #"french horn"
@@ -46,7 +46,7 @@ stopGraceMusic= \sequential {
         \override Beam #'space-function = #(lambda (beam mult) 0.8)
         \override Slur #'beautiful = #0.3
     }
-    \translator {
+    \context {
         \StaffContext
         minimumVerticalExtent = #'(-4.5 . 4.5)
     }
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index a9e35c61c3..46e9e3c041 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 "2.1.28"
+\version "2.1.29"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
@@ -149,7 +149,7 @@ violoncello = \notes \relative c' {
   	\paperSixteen
   	indent=100.0\mm
   	linewidth=150.0\mm
-    \translator {
+    \context {
       \RemoveEmptyStaffContext
     }
   }
diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 077836dafc..425c5973fd 100644
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events
@@ -14,7 +14,7 @@ theMusic = \context Staff \notes { c4 d8-. }
   (map (lambda (x) (display x) (newline))  lst))
 
 listener = \paper {
- \translator {
+ \context {
    \VoiceContext
    \type "Recording_group_engraver"
    recordEventSequence = #notice-the-events
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 008ff0bca0..9b730473da 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -92,7 +92,7 @@ verba = \context Lyrics = "verba" \lyrics {
     indent = 0.0
     raggedright = ##t
     packed = ##t
-    \translator {
+    \context {
       \ScoreContext
       \remove Bar_number_engraver
 %     \override SpacingSpanner #'spacing-increment = #0.5
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index 3de1981e8a..a817631e90 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -23,7 +23,7 @@ switched on or off via the @code{join-heads} property.
 paper block:
 
 @example
-\translator @{
+\context @{
   \ScoreContext
   breakAlignOrder = #'(
     instrument-name
@@ -42,7 +42,7 @@ paper block:
 
  
 @example
-\translator @{
+\context @{
   \VoiceContext
   \consists Ambitus_engraver
   Ambitus \set #'note-head-style = #'noteheads-2mensural
@@ -52,7 +52,7 @@ paper block:
 
 
  %}
-\version "2.1.28"
+\version "2.1.29"
 
 upper = \notes \relative c {
 	\clef "treble"
@@ -76,7 +76,7 @@ lower = \notes \relative c {
 		\new Staff { \lower }
 	>> }
 	\paper {
-	       \translator {
+	       \context {
 			\ScoreContext
 			breakAlignOrder = #'(
 				instrument-name
@@ -91,7 +91,7 @@ lower = \notes \relative c {
 				custos
 			)
 		}
-		\translator {
+		\context {
 			\VoiceContext
 			\consists Ambitus_engraver
 		}
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 345d169ef3..2edd20831c 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
@@ -12,7 +12,7 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
 	}
     \paper {
         raggedright = ##t
-	\translator{
+	\context{
 	    \StaffContext
 	    connectArpeggios = ##t
 	}
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index c393f4dd2e..a753923fff 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -6,7 +6,7 @@ beam."
 
 }
 
-\version "2.1.28"
+\version "2.1.29"
 
 
 
@@ -18,7 +18,7 @@ beam."
     a1 a2 a4 a8 a16 a32 a64 a64 
   }
   \paper {
-    \translator {
+    \context {
       \StaffContext
 	\remove "Clef_engraver"
 %%	\remove "Staff_symbol_engraver"
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index d516ed3644..044f462488 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -22,7 +22,7 @@ be increased.
   }
   \paper {
     raggedright = ##t
-    \translator {
+    \context {
 	\ScoreContext
 	\override BarNumber #'break-visibility = #all-visible
     }
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index cfd9a70a58..d5fe97d6f0 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was
@@ -15,7 +15,7 @@ Completion heads are not fooled by polyphony with a different rhythm.
 	>>
 
 	\paper {
-		\translator{
+		\context{
 			\VoiceContext
 			\remove "Note_heads_engraver"
 			\consists "Completion_heads_engraver"
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index 6b44310e35..934c90c3c2 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header{
 texidoc="
@@ -19,7 +19,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr
   c2. c8 d4 e f g a b c2.. b8 a g16 f4 e d c8. c2 
   }
   \paper{
-    \translator{
+    \context{
       \VoiceContext
       \remove "Note_heads_engraver"
       \consists "Completion_heads_engraver"
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 58eac04632..7c90bb7d24 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
     texidoc = "Custodes may be engraved in various styles."
 }
@@ -24,7 +24,7 @@
 	\break < d' a' f''>1
     }
     \paper {
-	\translator {
+	\context {
 	    \StaffContext
 	    \consists Custos_engraver
 	}
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 2421bba5da..d0da1c8db0 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
@@ -7,7 +7,7 @@ You also get ledger lines, of course."
 
 \score {
         \notes { c'2 e'4 f' | g'1 b8 }
-        \paper { \translator { \EasyNotation }
+        \paper { \context { \EasyNotation }
 		 raggedright = ##t
 	     } 
 }
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index 406d6da145..5e3fac44e7 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.28"
+\version "2.1.29"
 
 \header{
 
@@ -25,7 +25,7 @@ The engraver does no time-keeping, so it involves some trickery to get
     }
     \paper{
         linewidth = 50.\mm indent = 0
-	\translator{
+	\context{
 	       \StaffContext
 	       % makes for handier debugging
 	       % \remove Clef_engraver
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 3ddc31cc94..1f1b3c7545 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header { texidoc =
 
@@ -28,7 +28,7 @@ alignment; this should not confuse the mechanism.
    \new Staff {  e4 e e e s1 e4 e e e s1 }
  >>
  \paper {
-  \translator {
+  \context {
    \RemoveEmptyStaffContext
   }
  }
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index aa9c6ada7f..e98f5791ce 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -24,7 +24,7 @@ r c16[ c c]
 	indent = 0.0 \cm
 	linewidth = 3.4 \cm
 
-	\translator {
+	\context {
 	    \StaffContext \remove "Time_signature_engraver"
 	}
 	
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 3f93f087a3..e430cdbbff 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header{
 texidoc="
@@ -25,11 +25,11 @@ lyrics do not collide with barlines.
 	>>
 	\paper {
 		raggedright = ##t
-		\translator {
+		\context {
 			\ScoreContext
 			\accepts "LyricsWithBars"
 		}
-		\translator {
+		\context {
 			\LyricsContext
 			\consists "Bar_engraver"
 			\name "LyricsWithBars"
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 2ec1004316..ddde5f13e4 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
-\version "2.1.28"
+\version "2.1.29"
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
@@ -25,7 +25,7 @@ brackets above beats when the beats of a time signature are grouped.  "
 	 }
 	 \paper  {
 	     raggedright = ##t
-	     \translator { \StaffContext
+	     \context { \StaffContext
 			   \consists "Measure_grouping_engraver"
 			   }
 	     }
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 1718c3a65d..09299ea82e 100644
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header { texidoc = "There are both long and short intstrument names.
 Engraving instrument names should not be confused by the
 multimeasure rests. " }
@@ -10,7 +10,7 @@ multimeasure rests. " }
 	      \notes{c''1 \break R1 }
 	    >>
 	 \paper {
-	    \translator { \StaffContext
+	    \context { \StaffContext
 	    \consists Instrument_name_engraver
 
 	    }
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index d6492ed319..77f3269bfa 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header{
 
 texidoc="
@@ -27,7 +27,7 @@ are used then a different symbol is used.
 \time 8/4 R1*2
 }
 	\paper {
-	\translator {
+	\context {
 		\ScoreContext
 		skipBars = ##t
 	}
diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index 9fa89b2896..74fddde33e 100644
--- a/input/regression/new-markup-scheme.ly
+++ b/input/regression/new-markup-scheme.ly
@@ -5,7 +5,7 @@
     texts using a similar syntax as @code{\\markup}."
 
     }
-\version "2.1.28"
+\version "2.1.29"
 \score {
     \notes {
         \fatText
@@ -56,7 +56,7 @@
     \paper { 
         raggedright = ##t
         indent = #0
-        \translator {
+        \context {
             \StaffContext
             \remove Time_signature_engraver 
         }
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index f5ab8eddc7..bdc7f1da8b 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -29,7 +29,7 @@ analysis brackets start and end.
     }
 
     \paper {
-	\translator {
+	\context {
 	    \StaffContext \consists "Horizontal_bracket_engraver"
 	}
 	raggedright = ##t
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 830d4702d1..85aed36b86 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
@@ -13,7 +13,7 @@ adjusted accordingly.  "
   }
   \paper {
 
-\translator { \StaffContext
+\context { \StaffContext
 \override StaffSymbol #'line-count = #3
 }  }
   \midi { }
diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index ef834483db..fbed7b02fb 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
     texidoc = "Clef changes at the start of a line get much more space
@@ -17,7 +17,7 @@ than clef changes halfway the line."
       }>>
     }
     \paper { raggedright = ##t
-\translator { \StaffContext
+\context { \StaffContext
 	      TimeSignature = \turnOff
 	 }
 
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 838b617fb3..6c0c313b38 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
@@ -13,7 +13,7 @@ show where columns are in the score."
 
 	\paper { raggedright = ##t
 
-	\translator { \ScoreContext
+	\context { \ScoreContext
 	  \override NonMusicalPaperColumn #'print-function = #Paper_column::print
 	  \override PaperColumn #'print-function = #Paper_column::print	  
 	  \override NonMusicalPaperColumn #'font-family = #'roman
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index f0318b1f4a..94616a041b 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
@@ -15,7 +15,7 @@ bar lines to transparent, they are shown only between systems.
   \new Staff { f1 f1 f1}
  >>
  \paper {
-  \translator {
+  \context {
    \StaffContext
    \override BarLine #'transparent = ##t
   }
diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly
index 6f53e49849..d2461aa7b8 100644
--- a/input/regression/stem-spacing.ly
+++ b/input/regression/stem-spacing.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header{
 texidoc="
@@ -28,7 +28,7 @@ In this example, space for opposite pointed stems is adjusted.
   }
   \paper {
     raggedright = ##t
-    \translator { \ScoreContext
+    \context { \ScoreContext
     \override SpacingSpanner #'stem-spacing-correction = #0.0
   }  }
 }
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 3332eb33d3..808dd9d653 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
     texidoc = "The size of every system is correctly determined; this 
@@ -14,7 +14,7 @@
 }
 
     \paper { 
-	 \translator {
+	 \context {
 	     \ScoreContext
 	     \override System #'print-function = #box-grob-stencil
 	     }
diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index c30c02dc43..207a8245db 100644
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
@@ -55,7 +55,7 @@
     \paper {
 	raggedright = ##t 
 
-	\translator {
+	\context {
 	    \StaffContext
 	    \consists Horizontal_bracket_engraver
 	}
diff --git a/input/template/header.ly b/input/template/header.ly
index 9afcfe033b..7d6a064417 100644
--- a/input/template/header.ly
+++ b/input/template/header.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index dcef4efc42..f5ec4f66dd 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
         title = "Song"
         subtitle = "(tune)"
@@ -239,8 +239,8 @@ drumContents = {
 >>
         \paper {
                 linewidth = 15.0 \cm
-                \translator { \RemoveEmptyStaffContext }
-                \translator {
+                \context { \RemoveEmptyStaffContext }
+                \context {
                         \ScoreContext
                         \override BarNumber #'padding = #3
                         \override RehearsalMark #'padding = #2
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index 391d9bad4e..f164161137 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 texidoc ="
   Dynamics on a separate line, neatly centered between staffs.
@@ -33,7 +33,7 @@ pedal = \notes {
     \context Dynamics=pedal \pedal
   >>
   \paper {
-    \translator {
+    \context {
       \type "Engraver_group_engraver"
       \name Dynamics
       \alias Voice % So that \cresc works, for example.
@@ -57,21 +57,21 @@ pedal = \notes {
 
       \consistsend "Axis_group_engraver"
     }
-    \translator {
+    \context {
       \PianoStaffContext
       \accepts Dynamics
       \override VerticalAlignment #'forced-distance = #7
     }
   }
   \midi {
-    \translator {
+    \context {
       \type "Performer_group_performer"
       \name Dynamics
       \consists "Piano_pedal_performer"
       \consists "Span_dynamic_performer"
       \consists "Dynamic_performer"
     }
-    \translator {
+    \context {
       \PianoStaffContext
       \accepts Dynamics
     }
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 3c7a8de783..40f14af8a8 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
   texidoc ="Lyrics between two staffs."
@@ -28,11 +28,11 @@ text = \lyrics {
     >>  
   >>
   \paper {
-    \translator {
+    \context {
       \GrandStaffContext
       \accepts "Lyrics"
     }
-    \translator {
+    \context {
       %\LyricsContext
       \LyricsContext
       \consists "Bar_engraver"
diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index b38223c43e..16b457594c 100644
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 \header {
   texidoc ="Classical song format: one staff with melody and lyrics,
 and piano accompaniment."
@@ -39,7 +39,7 @@ lower = \notes\relative c {
       >>
   >>
   \paper {
-      \translator { \RemoveEmptyStaffContext }
+      \context { \RemoveEmptyStaffContext }
   }  
   \midi { }  
 }
diff --git a/input/template/satb.ly b/input/template/satb.ly
index 3a9f865ae0..73d8a8a641 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
     texidoc = "
@@ -42,7 +42,7 @@ bassWords = \lyrics { ho4 ho ho ho }
 	  
 	  >>
   \paper {
-    \translator {
+    \context {
 
 	% a little smaller so lyrics can be closer to the staff. 
 	\StaffContext
diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index 1fff67fb4f..9623cd83ba 100644
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -13,7 +13,7 @@ in the same score (not demonstrated in this file).
 "
 }
 
-\version "2.1.28"
+\version "2.1.29"
 
 #(define (kill-ambitus grob grob-context apply-context)
   (if (memq 'ambitus-interface (ly:grob-property grob 'interfaces))
@@ -52,7 +52,7 @@ voiceB = \notes \relative c' {
   \paper {
     raggedright = ##t
 
-    \translator {
+    \context {
 	\VoiceContext
       \consists Ambitus_engraver
     }
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 8b87d16559..1e787b9f6e 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -221,13 +221,13 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	textheight = 26.0\cm
 	linethickness = #(/ staffspace 5.0)
 	indent = 0.0
-	\translator {
+	\context {
 	    \ScoreContext
 	    \accepts MensuralStaff
 	    \accepts GregorianStaff
 %	    timing = ##f %%%%%%%% FIXME: this has no effect
 	}
-	\translator {
+	\context {
 	    \VoiceContext
 	    \name MensuralVoice
 	    \alias Voice
@@ -239,7 +239,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \override Rest #'style = #'mensural
 	    autoBeaming = ##f
 	}
-	\translator {
+	\context {
 	    \VoiceContext
 	    \name GregorianVoice
 	    \alias Voice
@@ -248,7 +248,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \override NoteHead #'style = #'vaticana_punctum
 	    autoBeaming = ##f
 	}
-	\translator {
+	\context {
 	    \StaffContext
 	    \name MensuralStaff
 	    \alias Staff
@@ -265,7 +265,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    clefPosition = #-2
 	    clefOctavation = #0 
 	}
-	\translator {
+	\context {
 	    \StaffContext
 	    \name GregorianStaff
 	    \alias Staff
@@ -284,7 +284,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    clefPosition = #1
 	    clefOctavation = #0 
 	}
-	\translator {
+	\context {
 	    \RemoveEmptyStaffContext
 	    \accepts MensuralVoice
 	    \accepts GregorianVoice
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 8bc33a46ed..df8950220b 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
  texidoc = "@cindex Bagpipe Music
@@ -12,7 +12,7 @@ Bagpipe music may contain a lot of grace notes.
 \paper {
   linewidth = 14.0 \cm
   indent = 0.0 \cm
-  \translator { \StaffContext
+  \context { \StaffContext
   	\override TimeSignature #'style = #'C
 %  	\override TimeSignature #'visibility-function = #begin-of-line-visible
   	\override TimeSignature #'break-visibility = #begin-of-line-visible
diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index c6299e10ef..b948e29b97 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header { texidoc = "@cindex Bar line lyric only
 You can move @code{Bar_engraver} and @code{Span_bar_engraver} to 
 a different engraving context, if you want, for example, bar lines 
@@ -19,21 +19,21 @@ on lyrics. "
 
 \paper  {
 	raggedright = ##t
-\translator {
+\context {
   \LyricsContext
   \consists Bar_engraver
   % need procedure, since lyrics doesn't have a staff_sym engraver.
   \override BarLine #'bar-size-procedure = #(lambda (x) 3.0)
 }
-\translator {
+\context {
   \LyricsContext
   \consists "Span_bar_engraver"
 }
-\translator{
+\context{
   \ChoirStaffContext
   \remove "Span_bar_engraver"
 }
-\translator {
+\context {
   \StaffContext
   \remove "Bar_engraver"
 }
diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly
index bfe8082306..71605a94ad 100644
--- a/input/test/blank-paper-tab.ly
+++ b/input/test/blank-paper-tab.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
     
 texidoc = "@cindex Blank Paper Tab
@@ -16,7 +16,7 @@ emptymusic = \notes { \repeat unfold 4  { s1\break }  \bar "|." }
 
 
   \paper {
-    \translator {
+    \context {
       \ScoreContext
       \remove Bar_number_engraver
     }
diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly
index c05179fde4..c2074c4ec9 100644
--- a/input/test/blank-paper.ly
+++ b/input/test/blank-paper.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
   texidoc="@cindex Blank Paper
 
@@ -13,7 +13,7 @@ A blank music paper can be produced also by using invisible notes, and removing
     \repeat unfold 3 { c1 \break }
   }
   \paper {
-    \translator {
+    \context {
       \ScoreContext
       \override TimeSignature #'transparent = ##t
       \override NoteHead #'transparent = ##t
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index e92b418d83..26c21fe007 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
@@ -27,6 +27,6 @@ scm = \chords {
     \context Voice {  \scm } >>
 \paper {
     raggedright = ##t 
-    \translator {\ChordNamesContext \consists Instrument_name_engraver }}
+    \context {\ChordNamesContext \consists Instrument_name_engraver }}
 
 }
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 1443c9c5db..0c648ac775 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 
 \header {
@@ -145,7 +145,7 @@ banterProperties = \sequential {
     >>
     \paper {
 	indent = 3.\cm
-	\translator { 
+	\context { 
 	    \ChordNamesContext
 	    \consists Instrument_name_engraver
 	}
diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly
index 747ddb3c13..2c397852ba 100644
--- a/input/test/chords-without-melody.ly
+++ b/input/test/chords-without-melody.ly
@@ -1,4 +1,4 @@
-\version "2.1.26"
+\version "2.1.29"
 \header {
 texidoc = "Jazz chord names can also be printed without notes."
 }
@@ -12,7 +12,7 @@ texidoc = "Jazz chord names can also be printed without notes."
 		}
 	}
 	\paper{
-		\translator{
+		\context{
 			\ChordNamesContext
 
 			\override BarLine #'bar-size = #4
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index f05f6d269b..28a06033c7 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -134,10 +134,10 @@ violoncello = \notes \relative c' {
       \paperSixteen
       indent=100.0\mm
       linewidth=150.0\mm
-      \translator {
+      \context {
 	  \RemoveEmptyStaffContext
       }
-      \translator {
+      \context {
 	  \OrchestralScoreContext
 	  \override TimeSignature #'style = #'C
       }
diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index 70dbe7c003..3a74115088 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,
@@ -31,7 +31,7 @@ Staff context.
 % setup for Request->Element conversion. Guru-only
 %
 
-MyStaffContext=\translator {
+MyStaffContext=\context {
 	\type "Engraver_group_engraver"
 	\name Staff
 
@@ -72,7 +72,7 @@ MyStaffContext=\translator {
 }
 
 
-MyVoiceContext = \translator {
+MyVoiceContext = \context {
 	\type "Engraver_group_engraver"
 	\name Voice
 
@@ -129,13 +129,13 @@ MyVoiceContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
       }
 }
 
 
-MyStaffContext = \translator {
+MyStaffContext = \context {
     \MyStaffContext
     \consists "Staff_symbol_engraver"
 }
@@ -143,12 +143,12 @@ MyStaffContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyStaffContext = \translator {
+MyStaffContext = \context {
     \MyStaffContext
       \consists "Clef_engraver"
     \remove "Pitch_squash_engraver"
@@ -157,12 +157,12 @@ MyStaffContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyVoiceContext = \translator {
+MyVoiceContext = \context {
     \MyVoiceContext
     \consists "Stem_engraver"
     }
@@ -170,12 +170,12 @@ MyVoiceContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyVoiceContext = \translator {
+MyVoiceContext = \context {
     \MyVoiceContext
     	\consists "Beam_engraver"
 }
@@ -183,12 +183,12 @@ MyVoiceContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyVoiceContext= \translator {
+MyVoiceContext= \context {
     \MyVoiceContext
     \consists "Phrasing_slur_engraver"
     \consists "Slur_engraver"
@@ -199,12 +199,12 @@ MyVoiceContext= \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyStaffContext = \translator {
+MyStaffContext = \context {
     \MyStaffContext
  \consists "Bar_engraver"
     \consists "Time_signature_engraver"
@@ -214,12 +214,12 @@ MyStaffContext = \translator {
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
 
-MyStaffContext = \translator
+MyStaffContext = \context
  { \MyStaffContext
  \consists "Accidental_engraver"    
      \consists "Key_engraver"
@@ -227,7 +227,7 @@ MyStaffContext = \translator
 \score {
   \topVoice
   \paper {
-      \translator { \MyStaffContext }
-      \translator { \MyVoiceContext }
+      \context { \MyStaffContext }
+      \context { \MyVoiceContext }
             }
 }
diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 5d64e1ecca..a7a16bdb34 100644
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 % definitely wil be renamed to something.
 %{
@@ -45,7 +45,7 @@ a piece. "
 	>>
   	\paper {
 		raggedright = ##t
-		\translator{
+		\context{
 			\ScoreContext
 
 		}
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index 28b80fcd1a..2cb99ca30f 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 %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
@@ -36,7 +36,7 @@ This should fill a4 paper. "
 		textheight = 297.0\mm - 7.0\mm
 		papersize = "a4"
 		linewidth = 15.0\mm
-		\translator {
+		\context {
 			\StaffContext
 			minimumVerticalExtent = #(cons 0 0)
 		}
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 0abe5e432c..bfb16dfd42 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header { texidoc = "
 
@@ -26,7 +26,7 @@ texts, so they should be switched off.
 	>>
 	\paper{
 		linewidth=140.\mm
-		\translator {
+		\context {
 			\VoiceContext
 			soloADue = ##f
 		}
diff --git a/input/test/improv.ly b/input/test/improv.ly
index 613f544df0..a1084ce589 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header {
 
     texidoc =
@@ -41,7 +41,7 @@ global = \notes { s1*3 \bar "|." }
 	>>
     >>
     \paper { 
-	\translator {
+	\context {
 	    \VoiceContext
 	    \consists Pitch_squash_engraver
 	}
diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index fce6b129e9..caa95d8399 100644
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }
@@ -14,6 +14,6 @@ individual @code{Staff}s. " }
 
 \paper {
 raggedright = ##t
-\translator { \GrandStaffContext \consists "Instrument_name_engraver" }
+\context { \GrandStaffContext \consists "Instrument_name_engraver" }
 }}
 
diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index ee4ac26b6e..8af869698a 100644
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header { texidoc	= "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, an notes
@@ -33,7 +33,7 @@ verba = \context Lyrics = "verba" \lyrics {
     indent = 0.0
     raggedright = ##t
     packed = ##t
-    \translator {
+    \context {
       \ScoreContext
       \remove Bar_number_engraver
       timing = ##f
diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly
index 291909b4c4..54e370014a 100644
--- a/input/test/lyric-hyphen-retain.ly
+++ b/input/test/lyric-hyphen-retain.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -40,7 +40,7 @@ c16[ c c c]
 	indent = 0.0 \cm
 	linewidth = 3.4 \cm
 
-	\translator {
+	\context {
 	    \StaffContext \remove "Time_signature_engraver"
 	}
 	
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index bf149f69a4..6cc62f9491 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
@@ -47,7 +47,7 @@ voice = \notes \transpose c c' {
     >>
     \paper {
 	linethickness = \staffspace / 5.0
-	\translator {
+	\context {
 	    \VoiceContext
 	    \name MensuralVoice
 	    \alias Voice
@@ -55,7 +55,7 @@ voice = \notes \transpose c c' {
 	    \consists Mensural_ligature_engraver
 	    \override NoteHead #'style = #'mensural
 	}
-	\translator {
+	\context {
 	    \StaffContext
 	    \name MensuralStaff
 	    \alias Staff
@@ -72,11 +72,11 @@ voice = \notes \transpose c c' {
 	    clefPosition = #-2
 	    clefOctavation = #-0
 	}
-	\translator {
+	\context {
 	    \RemoveEmptyStaffContext
 	    \accepts MensuralVoice
         }
-	\translator {
+	\context {
 	    \ScoreContext
 	    \accepts MensuralStaff
 	}
diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 5adf00aa77..a1a734a955 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \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 "2.1.28"
+\version "2.1.29"
 
 pat = \notes \transpose c c' \repeat unfold 2 {
   << { \context Staff=up {r8 e16 f g e f g } }
@@ -130,7 +130,7 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
     }
   >>
   \paper {
-    \translator {
+    \context {
       \PianoStaffContext
       \override VerticalAlignment #'forced-distance = #10
     }
diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index a706304caa..186a851bc0 100644
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
@@ -15,7 +15,7 @@ have been removed.
   }
   \paper {
     raggedright = ##t
-    \translator {
+    \context {
       \StaffContext
       whichBar = #""
       \remove "Time_signature_engraver"
diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly
index b260b4fe38..6af69b5ba3 100644
--- a/input/test/no-staff.ly
+++ b/input/test/no-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
@@ -11,7 +11,7 @@ corresponding engraver.
   \notes { c4 d4 e8 d8 }
   \paper {
     raggedright = ##t
-    \translator {
+    \context {
       \StaffContext
       \remove Staff_symbol_engraver
       \consists Pitch_squash_engraver
diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index bd90ace911..dee8270f58 100644
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -4,7 +4,7 @@
     @code{RemoveEmptyStaffContext} take out the unused parts.
 " }
 
-\version "2.1.28"
+\version "2.1.29"
 
 \score {
     \notes\relative c''
@@ -32,8 +32,8 @@
 
     \paper {
 	raggedright= ##t
-	\translator {\RemoveEmptyStaffContext}
-	\translator {
+	\context {\RemoveEmptyStaffContext}
+	\context {
 	    \ScoreContext
 	    \remove System_start_delimiter_engraver
 	    }
diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly
index 48f42bf554..1995cdff92 100644
--- a/input/test/polymetric.ly
+++ b/input/test/polymetric.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header{ texidoc="@cindex Time Signature Multiple
 
@@ -35,11 +35,11 @@ lines seem to distort the regular spacing.
 
     \paper{
     	raggedright = ##t
-	\translator{
+	\context{
 	    \ScoreContext
 	    \remove "Timing_engraver"
 	}
-	\translator{
+	\context{
 	    \StaffContext
 	    \consists "Timing_engraver"
 	    \alias "Timing"
diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly
index 6a67a7faec..c0a4ade634 100644
--- a/input/test/rhythm-excercise.ly
+++ b/input/test/rhythm-excercise.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 \header { texidoc = "@cindex Rhythm Exercise
 Rythmic exercises may be produced by removing the @code{Clef} engraver,
 putting all notes to the same pitch and using transparent staff lines.
@@ -8,7 +8,7 @@ putting all notes to the same pitch and using transparent staff lines.
 \score { \notes { c4 c4 c8[ c8]  c2 c2 }
 
 	 \paper {
-	     \translator { \StaffContext
+	     \context { \StaffContext
 			   \override StaffSymbol #'transparent = ##t
 			   \consists Pitch_squash_engraver
 			   \remove Clef_engraver
diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly
index 4620fbbe3a..ee14b737f1 100644
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header { texidoc="@cindex Slur Ugly
 Strange slurs can be produced by setting properties by hand. "
@@ -21,13 +21,13 @@ baseWalk = \notes \relative c {
   >>
   \paper {
     raggedright = ##t
-    \translator {
+    \context {
       \VoiceContext
       \override Slur #'beautiful = #5.0
       \override Slur #'direction = #1
       \override Stem #'direction = #-1
     }
-    \translator {
+    \context {
       \PianoStaffContext
       \override VerticalAlignment #'threshold = #'(5 . 5)
     }
diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 8bb5126183..7d7b97d19a 100644
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -37,12 +37,12 @@ what you would expect.)
  >>
 
 \paper {
-	\translator {
+	\context {
 		\ScoreContext
 		\accepts StaffContainer
 		\denies Staff
 	}
-	\translator {
+	\context {
 		\type Engraver_group_engraver
 		\consists Clef_engraver
 		\consists Time_signature_engraver
@@ -52,7 +52,7 @@ what you would expect.)
 		
 		\name StaffContainer
 	}
-	\translator {
+	\context {
 		\StaffContext
 		\remove Axis_group_engraver
 		\remove Separating_line_group_engraver
diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly
index 748ff8639f..f9e6ac88f7 100644
--- a/input/test/staff-space.ly
+++ b/input/test/staff-space.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 
 \header{ texidoc ="@cindex Staff Space
 By just increasing @code{staff-space} on a staff, you may produce strange
@@ -16,7 +16,7 @@ results. "
 	   f[ c']
 	 }
 >>
-\paper {  \translator  {
+\paper {  \context  {
       \StaffContext
       \override StaffSymbol #'staff-space = #5.5
       }
diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 36d1cfaf43..fb46171ac7 100644
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.28"
+\version "2.1.29"
 
 \header {
 
@@ -23,7 +23,7 @@ time and key signatures and clef at the beginning of the extra stave.
     }
   }
   \paper {
-    \translator {
+    \context {
       \ScoreContext
       \consists Span_bar_engraver
       % Avoid a vertical line at the beginning of the system:
@@ -31,7 +31,7 @@ time and key signatures and clef at the beginning of the extra stave.
       % Incorporate the new context in the hierarchy
       \accepts "TemporaryStaff"
     }
-    \translator {
+    \context {
       \StaffContext
       \name "TemporaryStaff"
       \alias "Staff"
diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 3676ffdbab..12bdc0c943 100644
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 %{
    \markup in titles is WIP, only available in direct PostScript output
    process and view this file doing:
diff --git a/input/test/title.ly b/input/test/title.ly
index 1c9f8af327..880990d860 100644
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -1,4 +1,4 @@
-\version "2.1.28"
+\version "2.1.29"
 % MERGE with lilypond-
 \header {
   filename = "title.ly"
diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh
index 3160e65a4b..9bab78f80f 100644
--- a/lily/include/music-output-def.hh
+++ b/lily/include/music-output-def.hh
@@ -32,7 +32,7 @@ public:
   VIRTUAL_COPY_CONSTRUCTOR (Music_output_def, Music_output_def);
 
   Context *get_group_translator (String type) const;
-  void assign_translator (SCM transdef);
+  void assign_context_def (SCM transdef);
   SCM find_context_def (SCM name) const;
   String outname_string () ;
   SCM get_scmvar (String id)const;
diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 068b8594cb..9ead9e7d8c 100644
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -67,7 +67,7 @@ Music_output_def::mark_smob (SCM m)
 }
 
 void
-Music_output_def::assign_translator (SCM transdef)
+Music_output_def::assign_context_def (SCM transdef)
 {
   Context_def *tp = unsmob_context_def (transdef);
   assert (tp);
diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 007aa9d1ee..86b2c3368e 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -83,7 +83,6 @@ static Keyword_ent the_key_tab[]={
   {"tempo", TEMPO},
   {"time", TIME_T},
   {"times", TIMES},
-  {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
   {"transposition", TRANSPOSITION},
   {"type", TYPE},
diff --git a/lily/parser.yy b/lily/parser.yy
index 8b376f692e..c1a98226f3 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -299,7 +299,6 @@ yylex (YYSTYPE *s,  void * v)
 %token TEMPO
 %token TIMES
 %token TIME_T
-%token TRANSLATOR
 %token TRANSPOSE
 %token TRANSPOSITION
 %token TYPE
@@ -335,7 +334,7 @@ yylex (YYSTYPE *s,  void * v)
 %token <scm>	MUSIC_OUTPUT_DEF_IDENTIFIER
 %token <scm>	NUMBER_IDENTIFIER
 %token <scm>	EVENT_IDENTIFIER
-%token <scm>	MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
+%token <scm>	MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER
 %token <scm>	STRING_IDENTIFIER SCM_IDENTIFIER 
 %token <scm>	RESTNAME
 %token <scm>	STRING   
@@ -386,7 +385,7 @@ yylex (YYSTYPE *s,  void * v)
 %type <music>	music_property_def context_change
 %type <scm> context_prop_spec 
 %type <scm> Music_list 
-%type <scm> property_operation context_mod translator_mod optional_context_mod
+%type <scm> property_operation context_mod context_def_mod optional_context_mod
 %type <outputdef>  music_output_def_body music_output_def_head
 %type <music>	post_event tagged_post_event
 %type <music> command_req 
@@ -394,7 +393,7 @@ yylex (YYSTYPE *s,  void * v)
 %type <scm>	string bare_number number_expression number_term number_factor 
 %type <score>	score_block score_body
 
-%type <scm>	translator_spec_block translator_spec_body
+%type <scm>	context_def_spec_block context_def_spec_body
 %type <music> 	tempo_event
 %type <scm>	script_abbreviation
 
@@ -540,7 +539,7 @@ identifier_init:
 		$$ = $1->self_scm ();
 		scm_gc_unprotect_object ($$);
 	}
-	| translator_spec_block {
+	| context_def_spec_block {
 		$$ = $1;
 	}
 	| Music  {
@@ -562,23 +561,23 @@ identifier_init:
 	}
 	;
 
-translator_spec_block:
-	TRANSLATOR '{' translator_spec_body '}'
+context_def_spec_block:
+	CONTEXT '{' context_def_spec_body '}'
 		{
 		$$ = $3;
 	}
 	;
 
-translator_spec_body:
+context_def_spec_body:
 	/**/ {
 		$$ = Context_def::make_scm ();
 		unsmob_context_def ($$)->set_spot (THIS->here_input ());
 	}
-	| TRANSLATOR_IDENTIFIER	{
+	| CONTEXT_DEF_IDENTIFIER	{
 		$$ = $1;
 		unsmob_context_def ($$)->set_spot (THIS->here_input ());
 	}
-	| translator_spec_body GROBDESCRIPTIONS embedded_scm {
+	| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
 		Context_def*td = unsmob_context_def($$);
 
 		for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) {
@@ -589,7 +588,7 @@ translator_spec_body:
 							tag, gh_cons (ly_cdar (p), SCM_EOL)));
 		}
 	}
-	| translator_spec_body context_mod {
+	| context_def_spec_body context_mod {
 		unsmob_context_def ($$)->add_context_mod ($2);		
 	}
 	;
@@ -694,8 +693,8 @@ music_output_def_body:
 	| music_output_def_body assignment  {
 
 	}
-	| music_output_def_body translator_spec_block	{
-		$$->assign_translator ($2);
+	| music_output_def_body context_def_spec_block	{
+		$$->assign_context_def ($2);
 	}
 	| music_output_def_body tempo_event  {
 		/*
@@ -1121,7 +1120,7 @@ re_rhythmed_music:
 
 context_change:
 	CHANGE STRING '=' STRING  {
-		Music*t= MY_MAKE_MUSIC("TranslatorChange");
+		Music*t= MY_MAKE_MUSIC("ContextChange");
 		t-> set_property ("change-to-type", scm_string_to_symbol ($2));
 		t-> set_property ("change-to-id", $4);
 
@@ -1149,7 +1148,7 @@ property_operation:
 	}
 	;
 
-translator_mod:
+context_def_mod:
 	CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
 	| CONSISTS { $$ = ly_symbol2scm ("consists"); }
 	| REMOVE { $$ = ly_symbol2scm ("remove"); }
@@ -1165,7 +1164,7 @@ translator_mod:
 
 context_mod:
 	property_operation { $$ = $1; }
-	| translator_mod STRING {
+	| context_def_mod STRING {
 		$$ = scm_list_2 ($1, $2);
 	}
 	;
@@ -2421,7 +2420,7 @@ My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid)
 		return NUMBER_IDENTIFIER;
 	} else if (unsmob_context_def (sid)) {
 		*destination = unsmob_context_def (sid)->clone_scm();
-		return TRANSLATOR_IDENTIFIER;
+		return CONTEXT_DEF_IDENTIFIER;
 	} else if (unsmob_score (sid)) {
 		Score *sc =  new Score (*unsmob_score (sid));
 		*destination =sc->self_scm ();
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 8398c68af3..4cbadfea83 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.28"
+\version "2.1.29"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
@@ -108,14 +108,14 @@ paperTwentysix = \paper {
 \paper { \paperTwenty }
 
 partCombineListener = \paper {
- \translator {
+ \context {
 	  \VoiceContext
 	  \consists Note_heads_engraver
 	  \consists Rest_engraver
 	  \type "Recording_group_engraver"
 	  recordEventSequence = #notice-the-events-for-pc
  }
- \translator { \ScoreContext skipTypesetting = ##t }
+ \context { \ScoreContext skipTypesetting = ##t }
 }
 
 #(set-part-combine-listener partCombineListener)
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6918d9722f..53c9f11029 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,6 +1,6 @@
-\version "2.1.28"
+\version "2.1.29"
 
-\translator {
+\context {
     \name Global
 
     \accepts Score
@@ -13,7 +13,7 @@
 % setup for Request->Element conversion. Guru-only
 %
 
-\translator {
+\context {
 	\type "Engraver_group_engraver"
 	\name Staff
 
@@ -62,7 +62,7 @@
 
 }
 
-\translator {
+\context {
     \StaffContext
     \type "Engraver_group_engraver"
     \name DrumStaff
@@ -85,7 +85,7 @@
 }
 
 
-\translator {
+\context {
     \type "Engraver_group_engraver"
     \name InnerChoirStaff
     \consists "System_start_delimiter_engraver"
@@ -101,7 +101,7 @@
     \accepts "ChordNames"
 }
 
-\translator {
+\context {
 	\InnerChoirStaffContext
 	\name ChoirStaff
 	
@@ -113,7 +113,7 @@
 }
 
 
-\translator{
+\context{
     \type "Engraver_group_engraver"
     
     \consists "Output_property_engraver"	
@@ -152,7 +152,7 @@
 }
 
 
-\translator {
+\context {
     \type "Engraver_group_engraver"
     \name Voice
 
@@ -213,7 +213,7 @@
     \consists "Skip_event_swallow_translator"
 }
 
-\translator {
+\context {
     \VoiceContext
     \name DrumVoice
     \alias Voice
@@ -242,7 +242,7 @@
     \consists "Skip_event_swallow_translator"
 }
 
-\translator{
+\context{
     \type "Engraver_group_engraver"
     \name GrandStaff
     localKeySignature = #'()
@@ -259,7 +259,7 @@
     \accepts "Staff"
 }
 
-\translator{
+\context{
     \GrandStaffContext
     \name "PianoStaff"
     \alias "GrandStaff"
@@ -279,7 +279,7 @@
     instr = #'()
 }
 
-\translator {
+\context {
     \type "Engraver_group_engraver"
     \name InnerStaffGroup
     localKeySignature = #'()
@@ -300,7 +300,7 @@
     \accepts "ChordNames"
 }
 
-\translator {
+\context {
     \InnerStaffGroupContext
     \name StaffGroup
     
@@ -317,7 +317,7 @@ connected vertically.  "
 }
 
 
-\translator{
+\context{
     \type "Engraver_group_engraver"
     \consistsend "Hara_kiri_engraver"
     minimumVerticalExtent = #'(-1.2 . 2.4)
@@ -339,7 +339,7 @@ printing of a single line of lyrics.  "
     \override SeparationItem #'padding = #0.2
 }
 
-\translator {
+\context {
     \type "Engraver_group_engraver"
     \name NoteNames
     \consistsend "Axis_group_engraver"
@@ -356,7 +356,7 @@ printing of a single line of lyrics.  "
     \consists "Separating_line_group_engraver"
 }
 
-\translator {
+\context {
     \type "Engraver_group_engraver"
     \name ChordNames
     \description "Typesets chord names."
@@ -375,14 +375,14 @@ printing of a single line of lyrics.  "
 }
 
 
-RemoveEmptyStaffContext= \translator {
+RemoveEmptyStaffContext= \context {
     \StaffContext
     \remove "Axis_group_engraver"
     \consistsend "Hara_kiri_engraver"
     \override Beam #'auto-knee-gap = #'()
 }
 
-AncientRemoveEmptyStaffContext = \translator {
+AncientRemoveEmptyStaffContext = \context {
     %% why not add by default?
     
     \RemoveEmptyStaffContext
@@ -390,7 +390,7 @@ AncientRemoveEmptyStaffContext = \translator {
     \accepts "GregorianTranscriptionVoice"
 }
 
-\translator {
+\context {
     \type Score_engraver
     \name Score
     localKeySignature = #'()
@@ -564,11 +564,11 @@ AncientRemoveEmptyStaffContext = \translator {
     
 }
 
-OrchestralScoreContext = \translator {
+OrchestralScoreContext = \context {
 	\ScoreContext
 }
 
-EasyNotation = \translator {
+EasyNotation = \context {
 	\ScoreContext
 	\override NoteHead #'print-function = #Note_head::brew_ez_stencil
 	\override NoteHead #'Y-extent-callback = #'()
@@ -577,7 +577,7 @@ EasyNotation = \translator {
 
 
 
-\translator {
+\context {
 	\type "Engraver_group_engraver"
 	\name FiguredBass 
 	\consists "Figured_bass_engraver"
@@ -589,7 +589,7 @@ EasyNotation = \translator {
 	\consistsend "Hara_kiri_engraver"
 }
 
-\translator {
+\context {
     \name "Devnull"
     \type "Engraver_group_engraver"
 
@@ -601,7 +601,7 @@ EasyNotation = \translator {
     \description "Silently discards all musical information given to this context. "
     }
 
-\translator {
+\context {
       \VoiceContext
       \name "TabVoice"
       \consists "Tab_note_heads_engraver"
@@ -623,7 +623,7 @@ EasyNotation = \translator {
       \remove Accidental_engraver
 }
 
-\translator {
+\context {
       \StaffContext
       \alias "Staff"
       \name "TabStaff"
@@ -655,12 +655,12 @@ EasyNotation = \translator {
 %
 % If I try to do so, I get "error: unknown escaped string:
 % `\VaticanaStaffContext'" in params-init.ly.  If I also move
-% "\translator { \Vaticana*Context }" from params-init.ly to the end
+% "\context { \Vaticana*Context }" from params-init.ly to the end
 % of gregorian-init.ly, then I get "error: parse error, unexpected
-% TRANSLATOR: \translator { \VaticanaStaffContext }" in
+% TRANSLATOR: \context { \VaticanaStaffContext }" in
 % gregorian-init.ly. --jr
 
-\translator {
+\context {
   \VoiceContext
   \name "VaticanaVoice"
   \alias "Voice"
@@ -689,7 +689,7 @@ EasyNotation = \translator {
   \override TextSpanner #'edge-text = #'("" . "")
 }
 
-\translator {
+\context {
   \StaffContext
   \name "VaticanaStaff"
   \alias "Staff"
@@ -729,7 +729,7 @@ EasyNotation = \translator {
   % Score.barAlways = ##t
 }
 
-\translator {
+\context {
   \VoiceContext
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
@@ -754,7 +754,7 @@ EasyNotation = \translator {
   \override TextSpanner #'enclose-bounds = #1
   \override TextSpanner #'edge-text = #'("" . "")
 }
- \translator {
+ \context {
   \StaffContext
   \name "GregorianTranscriptionStaff"
   \alias "Staff"
diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly
index 0a7791d079..9d70875f87 100644
--- a/ly/part-paper-init.ly
+++ b/ly/part-paper-init.ly
@@ -1,10 +1,10 @@
-\version "2.1.28"
+\version "2.1.29"
 
 % JUNKME
 %part-paper-init.ly
 
 \paper {
-	\translator { \OrchestralPartStaffContext }
-	\translator { \ScoreContext skipBars = ##t }
+	\context { \OrchestralPartStaffContext }
+	\context { \ScoreContext skipBars = ##t }
 }
 
diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 2bb450759a..7d550b7ed6 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,9 +1,9 @@
-\version "2.1.28"
+\version "2.1.29"
 
 				%
 				% setup for Request->Element conversion. Guru-only
 				%
-\translator {
+\context {
     \type "Staff_performer"
     \name Staff
     \accepts Voice
@@ -12,19 +12,19 @@
     \consists "Tempo_performer"
     \consists "Time_signature_performer"
 }
-\translator {
+\context {
     \name Global
     \accepts Score
 \description "Hard coded entry point for LilyPond. Cannot be tuned."
     }
-\translator {
+\context {
     \StaffContext
     \name DrumStaff
     midiInstrument = #"drums"
     \accepts DrumVoice
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name Voice
     \consists "Dynamic_performer"
@@ -38,51 +38,51 @@
 }
 
 
-\translator {
+\context {
     \VoiceContext
     \remove "Note_performer"
     \consists "Drum_note_performer" 
     \name DrumVoice
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name FiguredBass 
     \consists "Swallow_performer"
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name GrandStaff
     \accepts RhythmicStaff
     \accepts Staff
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name "PianoStaff"
     \accepts Staff
     \accepts DrumStaff
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name "TabVoice"
     \consists "Swallow_performer"
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \name "Devnull"
     \consists "Swallow_performer"
 }
-\translator {
+\context {
     \type "Performer_group_performer"
     \name "TabStaff"
     \accepts "TabVoice"
 }
 
-\translator {
+\context {
     \type "Score_performer"
 
     \name Score
@@ -112,7 +112,7 @@
 }
 
 
-\translator {
+\context {
     \type "Staff_performer" % Performer_group_performer ?
     \consists "Lyric_performer"
     \name Lyrics
@@ -120,7 +120,7 @@
     \consists "Tempo_performer"
 }
 
-\translator{
+\context{
     \type "Performer_group_performer"
     \name ChoirStaff
     \accepts Staff
@@ -128,19 +128,19 @@
 }
 
 
-\translator {
+\context {
     \type "Staff_performer"
     \accepts ChordNameVoice
     \name ChordNames
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
     \consists "Note_performer"
     \name ChordNameVoice	
 }
 
-\translator {
+\context {
     \type "Performer_group_performer"
 
     \name StaffGroup
@@ -148,6 +148,6 @@
     \accepts DrumStaff
 }
 
-\translator { \StaffContext \name RhythmicStaff }
+\context { \StaffContext \name RhythmicStaff }
 
 
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 410e4e4fce..2e3130b45f 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -492,7 +492,7 @@ individually. Syntax @code{\\outputproperty @var{predicate} @var{prop}
 	(types . (general-music span-event text-span-event))
 	))
     
-    (TranslatorChange
+    (ContextChange
      . (
 	(description .	"Change staffs in Piano staff. Syntax @code{\\translator Staff = @var{new-id}}.")
 	(internal-class-name . "Music")
diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index 4d29666293..ded01eadfc 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -5,10 +5,11 @@
   (number->string (ly:music-property mus 'denominator)))
 
 (define-public (fraction-tuplet-formatter mus)
-  (string-append (number->string (ly:music-property mus 'numerator))
-		 ":"
-		 (number->string (ly:music-property mus 'denominator))
-		 ))
+  (string-append
+   (number->string (ly:music-property mus 'denominator))
+   ":"
+   (number->string (ly:music-property mus 'numerator))
+   ))
 
 
 ;; metronome marks
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 5f3ae138d5..fc5e6c27b5 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1982,10 +1982,11 @@ new syntax for setting \\arpeggioBracket"""))
 
 def conv (str):
 	str = re.sub (r'\\center([^-])', '\\center-align\\1', str)
+	str = re.sub (r'\\translator', '\\context', str)
 	return str
 
 conversions.append (((2,1,29), conv,
-		     '\\center -> \\center-align'))
+		     '\\center -> \\center-align, \\translator -> \\context'))
 
 ################################
 #	END OF CONVERSIONS