From: hanwen <hanwen>
Date: Fri, 13 Feb 2004 22:02:39 +0000 (+0000)
Subject: * scripts/convert-ly.py (FatalConversionError.subst_in_trans):
X-Git-Tag: release/2.1.27~68
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bbced93308b2e1002b9d81979ca0c41f7dccfca8;p=lilypond.git

* scripts/convert-ly.py (FatalConversionError.subst_in_trans):
conversion rule for \translator{}. Apply everywhere.

* lily/parser.yy (music_property_def): set property for \once in
the PropertyMusic itself, not the ContextSpec.
(property_operation): change syntax within \translator { }

* scm/define-music-properties.scm (all-music-properties): clean up.

* VERSION: 2.1.22 released

* input/GNUmakefile (SUBDIRS): remove ascii-art
---

diff --git a/ChangeLog b/ChangeLog
index 3ccf9c0e6c..8fa2ed45b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2004-02-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scripts/convert-ly.py (FatalConversionError.subst_in_trans):
+	conversion rule for \translator{}. Apply everywhere.  
+
 	* lily/parser.yy (music_property_def): set property for \once in
 	the PropertyMusic itself, not the ContextSpec.
+	(property_operation): change syntax within \translator { }
 
 	* scm/define-music-properties.scm (all-music-properties): clean up.
 
diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely
index c055d73db2..9be7fb35ef 100644
--- a/Documentation/user/internals.itely
+++ b/Documentation/user/internals.itely
@@ -365,7 +365,7 @@ and without a @code{Clef_engraver}.
 <<
   \new Staff { c4 es4 g2 }
   \new Staff \with {
-        StaffSymbol \set #'staff-space = #(magstep 1.5)
+        \override StaffSymbol #'staff-space = #(magstep 1.5)
         fontSize = #1.5
         \remove "Clef_engraver"
   } {
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index ba5bc8a411..8e8e179dcb 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -315,8 +315,8 @@ r1 r2 r4 r8 r16 r32 r64 r64
     \translator {
       \StaffContext
         \remove "Clef_engraver"
-        StaffSymbol \set #'transparent = ##t 
-        TimeSignature \set #'transparent = ##t 
+        \override StaffSymbol #'transparent = ##t 
+        \override TimeSignature #'transparent = ##t 
         \consists "Pitch_squash_engraver"
     }
   }
@@ -2848,8 +2848,8 @@ mus = \drums  { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc
     << \new DrumStaff\with {
             \remove Bar_engraver
             \remove Time_signature_engraver
-            Stem \set #'transparent = ##t
-            Stem \set #'Y-extent-callback = ##f
+            \override Stem #'transparent = ##t
+            \override Stem #'Y-extent-callback = ##f
             minimumVerticalExtent = #'(-4.0 . 5.0)
     } \mus
         \context Lyrics \nam 
@@ -2858,7 +2858,7 @@ mus = \drums  { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc
     %% need to do this, because of indented @itemize
     linewidth= 9 \cm 
     \translator { \ScoreContext
-    BarNumber \set #'transparent =##T
+    \override BarNumber #'transparent =##T
 }}}
 @end lilypond
 
@@ -2878,10 +2878,10 @@ mus = \drums  { timh ssh timl ssl cb s16 }
         \context DrumStaff \with {
             \remove Bar_engraver
             \remove Time_signature_engraver
-            Stem \set #'transparent = ##t
-            Stem \set #'Y-extent-callback = ##f
-            StaffSymbol \override #'line-count = #2
-            StaffSymbol \override #'staff-space = #2
+            \override Stem #'transparent = ##t
+            \override Stem #'Y-extent-callback = ##f
+            \override StaffSymbol #'line-count = #2
+            \override StaffSymbol #'staff-space = #2
             minimumVerticalExtent = #'(-3.0 . 4.0)
             drumStyleTable = #timbales-style
         } \mus
@@ -2901,12 +2901,12 @@ mus = \drums  { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
             \remove Bar_engraver
             \remove Time_signature_engraver
             drumStyleTable = #congas-style
-            StaffSymbol \override #'line-count = #2
+            \override StaffSymbol #'line-count = #2
             
             %% this sucks; it will lengthen stems.
-            StaffSymbol \override #'staff-space = #2
-            Stem \set #'transparent = ##t
-            Stem \set #'Y-extent-callback = ##f
+            \override StaffSymbol #'staff-space = #2
+            \override Stem #'transparent = ##t
+            \override Stem #'Y-extent-callback = ##f
         } \mus
         \context Lyrics \nam 
     >>
@@ -2923,13 +2923,13 @@ mus = \drums  { boh boho bohm ssh bol bolo bolm ssl s16 }
         \context DrumStaff\with {
             \remove Bar_engraver
             \remove Time_signature_engraver
-            StaffSymbol \override #'line-count = #2
+            \override StaffSymbol #'line-count = #2
             drumStyleTable = #bongos-style
            
             %% this sucks; it will lengthen stems.
-            StaffSymbol \override #'staff-space = #2
-            Stem \set #'transparent = ##t
-            Stem \set #'Y-extent-callback = ##f
+            \override StaffSymbol #'staff-space = #2
+            \override Stem #'transparent = ##t
+            \override Stem #'Y-extent-callback = ##f
         } \mus
         \context Lyrics \nam 
     >>
@@ -2946,10 +2946,10 @@ mus = \drums  { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
         \context DrumStaff\with{
             \remove Bar_engraver
             drumStyleTable = #percussion-style
-            StaffSymbol \override #'line-count = #1
+            \override StaffSymbol #'line-count = #1
             \remove Time_signature_engraver
-            Stem \set #'transparent = ##t
-            Stem \set #'Y-extent-callback = ##f
+            \override Stem #'transparent = ##t
+            \override Stem #'Y-extent-callback = ##f
         } \mus
         \context Lyrics \nam 
     >>
@@ -5612,7 +5612,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5621,8 +5621,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5654,7 +5654,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5663,8 +5663,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5688,7 +5688,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5697,8 +5697,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5725,7 +5725,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5734,8 +5734,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5764,7 +5764,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5773,8 +5773,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5798,7 +5798,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5807,8 +5807,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5836,7 +5836,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5845,8 +5845,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5875,7 +5875,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5884,8 +5884,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5913,7 +5913,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5922,8 +5922,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5947,7 +5947,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5956,8 +5956,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -5984,7 +5984,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -5993,8 +5993,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6022,7 +6022,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6031,8 +6031,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6056,7 +6056,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6065,8 +6065,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6093,7 +6093,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6102,8 +6102,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6127,7 +6127,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6136,8 +6136,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6165,7 +6165,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6174,8 +6174,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6199,7 +6199,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6208,8 +6208,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6237,7 +6237,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6246,8 +6246,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6271,7 +6271,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6280,8 +6280,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6309,7 +6309,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6318,8 +6318,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6343,7 +6343,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6352,8 +6352,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6377,7 +6377,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6386,8 +6386,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6414,7 +6414,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6423,8 +6423,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6448,7 +6448,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6457,8 +6457,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6482,7 +6482,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6491,8 +6491,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6519,7 +6519,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6528,8 +6528,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6553,7 +6553,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6562,8 +6562,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6587,7 +6587,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6596,8 +6596,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6624,7 +6624,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6633,8 +6633,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6658,7 +6658,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6667,8 +6667,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6692,7 +6692,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6701,8 +6701,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6729,7 +6729,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6738,8 +6738,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6763,7 +6763,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6772,8 +6772,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6797,7 +6797,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6806,8 +6806,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6834,7 +6834,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6843,8 +6843,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6868,7 +6868,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6877,8 +6877,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
@@ -6906,7 +6906,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \StaffContext
             \remove "Clef_engraver"
             \remove "Key_engraver"
-            StaffSymbol \set #'transparent = ##t
+            \override StaffSymbol #'transparent = ##t
             \remove "Time_signature_engraver"
             \remove "Bar_engraver"
             minimumVerticalExtent = ##f
@@ -6915,8 +6915,8 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             \VoiceContext
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
-            NoteHead \set #'style = #'vaticana_punctum
-            Stem \set #'transparent = ##t
+            \override NoteHead #'style = #'vaticana_punctum
+            \override Stem #'transparent = ##t
         }
     }
 }
diff --git a/VERSION b/VERSION
index 892d972eef..ed63965fde 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=22
+PATCH_LEVEL=23
 MY_PATCH_LEVEL=
 
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index d24d38ee1d..db0f4cd552 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -188,7 +188,7 @@ def write_fontlist (file, global_info, charmetrics):
     \translator{
       \ScoreContext
       \remove "Bar_number_engraver"
-      TextScript \override #'extra-X-extent = #'(-1 . 1)
+      \override TextScript #'extra-X-extent = #'(-1 . 1)
     }
     \translator{
       \StaffContext
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 033c62c6e5..1aef409f0a 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -353,8 +353,8 @@ lowerDynamics = \notes{
 	    \consists "Dynamic_engraver"
 	    \consists "Text_engraver"
 
-	    TextScript \override #'font-size = #2
-	    TextScript \override #'font-shape = #'italic
+	    \override TextScript #'font-size = #2
+	    \override TextScript #'font-shape = #'italic
 
 	    \consists "Skip_event_swallow_translator"
 
@@ -364,7 +364,7 @@ lowerDynamics = \notes{
 	\translator {
 	    \PianoStaffContext
 	    \accepts Dynamics
-	    VerticalAlignment \override #'forced-distance = #7
+	    \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 f032de77be..249decf4a7 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.22"
+\version "2.1.23"
 
 \include "nederlands.ly"
 
@@ -144,9 +144,9 @@ lower = \context Staff \notes \relative c{
   \paper {
     \translator{
 	    \VoiceContext
-	    Slur \override #'attachment = #'(stem . stem)
-	    autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 1 4)
-	    autoBeamSettings \override #'(end 1 16 * *) = #(ly:make-moment 1 4)
+	    \override Slur #'attachment = #'(stem . stem)
+	    \override autoBeamSettings #'(end 1 8 * *) = #(ly:make-moment 1 4)
+	    \override autoBeamSettings #'(end 1 16 * *) = #(ly:make-moment 1 4)
     }
   }
   \midi {
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 416e7c3c65..e6b28ad4d3 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -19,14 +19,15 @@
     chooses line breaks differently.
 
     Further manual tweaks: the slur in measure 12 has been flattened
-    manually. The beam in measure 3, left-hand, technically is wrong,
-    but has been added following the original.
+manually. The beam in measure 3, left-hand, technically is wrong, but
+has been added following the original. The crescendo in measure 4 has
+been lowered
 
 "
 
 }
 
-\version "2.1.22"
+\version "2.1.23"
 manuscriptBreak = { \break }
 
 
@@ -170,13 +171,13 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
 	}
 	\translator {
 	    \ScoreContext
-	    Beam \override #'thickness = #0.55
-	    SpacingSpanner \set #'spacing-increment = #1.0
-	    Slur \set #'height-limit = #1.5
+	    \override Beam #'thickness = #0.55
+	    \override SpacingSpanner #'spacing-increment = #1.0
+	    \override Slur #'height-limit = #1.5
 	}
 	\translator {
 	    \PianoStaffContext
-	    VerticalAlignment \override #'forced-distance = #10
+	    \override VerticalAlignment #'forced-distance = #10
 	}
 	\translator {
 	    \StaffContext
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 48dc67195e..c744adc3b0 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.22"
+\version "2.1.23"
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 273ea88be5..8e8ea65114 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.22"
+\version "2.1.23"
 
 % #(ly:set-point-and-click 'line-column)
 
@@ -152,10 +152,10 @@ sarabandeCelloStaff = \context Staff <<
 smallerPaper = \paper {
     \translator { \StaffContext
 		  fontSize = #-1
-		  StaffSymbol \override  #'staff-space = #0.8
+		  \override StaffSymbol  #'staff-space = #0.8
 		  }
     \translator { \ScoreContext
-		   SpacingSpanner \override #'spacing-increment = #0.96
+		   \override SpacingSpanner #'spacing-increment = #0.96
 		}
 	
     indent = 5.6 \mm
@@ -168,7 +168,7 @@ baerPaper = \paper {
     interscoreline=4.0\mm
     \translator {
 	     \ScoreContext
-%	     System \override #'print-function = #box-grob-stencil
+%	     \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 fd26dc6e3f..4d2b7bb74a 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.22"
+\version "2.1.23"
 
 %{
  Header for Petites Preludes.
@@ -153,7 +153,7 @@ global = \notes{
 		linewidth = 17.0 \cm  
 		\translator {
 		    \ScoreContext
-		    SpacingSpanner \set #'spacing-increment = #2.0
+		    \override SpacingSpanner #'spacing-increment = #2.0
 		}
 	}
 	\midi{ \tempo 4 = 40 }
diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index db7a991564..da9e01a695 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.22"
+\version "2.1.23"
 
 
 
@@ -208,8 +208,8 @@ bassdux = \context Voice=three \notes \relative c' {
     \paper {
         linewidth = 18.0 \cm
 	\translator { \ScoreContext
-	SpacingSpanner \override #'spacing-increment = #1.0
-	SpacingSpanner \override #'shortest-duration-space = #1.9	
+	\override SpacingSpanner #'spacing-increment = #1.0
+	\override SpacingSpanner #'shortest-duration-space = #1.9	
 	}
     }
     \header{
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 7a5250149e..1ca6649002 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.22"
+\version "2.1.23"
 
 \header {
   title = "Romanzen"
@@ -279,11 +279,11 @@ leftb = \notes \transpose c cis {
     }
     \translator {
       \ScoreContext
-      SpacingSpanner \override #'common-shortest-duration = #(ly:make-moment 1 8)
+      \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8)
     }
     \translator {
       \PianoStaffContext
-      VerticalAlignment \override #'forced-distance = #13.0
+      \override VerticalAlignment #'forced-distance = #13.0
     }
   }
   \midi { \tempo 8=100 }
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index d6cf0e8baa..3075cb59db 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.22"
+\version "2.1.23"
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
@@ -35,16 +35,16 @@ stopGraceMusic= \sequential {
         skipBars = ##t
         midiInstrument = #"french horn"
         %% try to mimic Breitkopf
-        RehearsalMark \override #'padding = #1
-        MultiMeasureRest \override #'padding = #0.5
+        \override RehearsalMark #'padding = #1
+        \override MultiMeasureRest #'padding = #0.5
         restNumberThreshold = #1
 
-	RehearsalMark \override #'font-series = #'bold
-	RehearsalMark \override #'font-size = #6
+	\override RehearsalMark #'font-series = #'bold
+	\override RehearsalMark #'font-size = #6
 
-        Beam \override #'thickness = #0.6
-        Beam \override #'space-function = #(lambda (beam mult) 0.8)
-        Slur \override #'beautiful = #0.3
+        \override Beam #'thickness = #0.6
+        \override Beam #'space-function = #(lambda (beam mult) 0.8)
+        \override Slur #'beautiful = #0.3
     }
     \translator {
         \StaffContext
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 38906c4e89..458d08dfad 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.22"
+\version "2.1.23"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 1c97a6e9e5..9b96a992fa 100644
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index 772a3b35c3..4e1d21b64e 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -95,7 +95,7 @@ verba = \context Lyrics = "verba" \lyrics {
     \translator {
       \ScoreContext
       \remove Bar_number_engraver
-%     SpacingSpanner \set #'spacing-increment = #0.5
+%     \override SpacingSpanner #'spacing-increment = #0.5
       timing = ##f
 
       % Maybe don't do this except for transcription -- it may produce
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index 8e252f7c20..ec5c035f97 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -52,7 +52,7 @@ paper block:
 
 
  %}
-\version "2.1.22"
+\version "2.1.23"
 
 upper = \notes \relative c {
 	\clef "treble"
diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 1b68ecf110..d1cbb63ec3 100644
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index b11aca4081..b4f4605aff 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -5,7 +5,7 @@ texidoc="Test automatic beamer: the last measure should have a single beam."
 
 }
 
-\version "2.1.22"
+\version "2.1.23"
 
 
 
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index 43b6bdc841..0d4262238d 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
@@ -24,7 +24,7 @@ The padding should be increased, to prevent clashes at the start of the line.
     raggedright = ##t
     \translator {
 	\ScoreContext
-	BarNumber \override #'break-visibility = #all-visible
+	\override BarNumber #'break-visibility = #all-visible
     }
   }
 }
diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index 28ef1ecbbb..de0bd49fc5 100644
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index 8491c2b661..0ea3b4a80d 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header{
 texidoc="
diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 006cb18352..8c9bcfdaa3 100644
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
     texidoc = "Custodes in various styles."
 }
diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index 4782932a5a..a89f86be54 100644
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 texidoc = " Ez-notation prints names in note heads.
diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index dc88f0ebf5..b04eb2aee0 100644
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "2.1.22"
+\version "2.1.23"
 
 \header{
 
diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index f7681d6235..20b13c6f41 100644
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header { texidoc =
 
diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index 0a95242c02..45cc46c831 100644
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 38ab94473b..dbf879b98a 100644
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header{
 texidoc="
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 439f37af4a..23b17c7b81 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -7,7 +7,7 @@ brackets above beats when you set beatGrouping.  "
 
 }
 
-\version "2.1.22"
+\version "2.1.23"
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
diff --git a/input/regression/mmrest-collision.ly b/input/regression/mmrest-collision.ly
index eae168b141..37a2683a91 100644
--- a/input/regression/mmrest-collision.ly
+++ b/input/regression/mmrest-collision.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header { texidoc = "Tests a collision between multimeasure rests in
 different voices. " }
 \score {
diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index d8299eda15..9607523904 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.22"
+\version "2.1.23"
 \header { texidoc = "This combines instrument names and multimeasure rests (there was an
 interesting bug in 1.3.98). " }
 
diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 9df4b3a631..bbd16b65bb 100644
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header{
 
 texidoc="
diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index 8da3750daf..3e92205ee3 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.22"
+\version "2.1.23"
 \score {
     \notes {
         \fatText
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 4773e7126c..150c69d159 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 30997a2098..28e705efe7 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
@@ -14,7 +14,7 @@ adjusted.  "
   \paper {
 
 \translator { \StaffContext
-StaffSymbol \override #'line-count = #3
+\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 e5e9c75a64..1b94c069aa 100644
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc = "Clef changes at the start of a line get much more space
diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index 7d1e012d07..c688544bfe 100644
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
@@ -14,10 +14,10 @@ show where columns are in the score."
 	\paper { raggedright = ##t
 
 	\translator { \ScoreContext
-	  NonMusicalPaperColumn \override #'print-function = #Paper_column::print
-	  PaperColumn \override #'print-function = #Paper_column::print	  
-	  NonMusicalPaperColumn \override #'font-family = #'roman
-	  PaperColumn \override #'font-family = #'roman	  
+	  \override NonMusicalPaperColumn #'print-function = #Paper_column::print
+	  \override PaperColumn #'print-function = #Paper_column::print	  
+	  \override NonMusicalPaperColumn #'font-family = #'roman
+	  \override PaperColumn #'font-family = #'roman	  
 
 	}
 	}}
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 3e8f3f462b..4914895ea2 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 texidoc = "Span bars draw only in between staff bar lines, so setting those to transparent shows bar lines between systems only.
 "
@@ -16,7 +16,7 @@ texidoc = "Span bars draw only in between staff bar lines, so setting those to t
  \paper {
   \translator {
    \StaffContext
-   BarLine \override #'transparent = ##t
+   \override BarLine #'transparent = ##t
   }
   raggedright =##t 
  }
diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly
index e4100b6784..ae41bf3034 100644
--- a/input/regression/stem-spacing.ly
+++ b/input/regression/stem-spacing.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header{
 texidoc="
@@ -29,7 +29,7 @@ effects.  In this example, space for opposite pointed stems is adjusted.
   \paper {
     raggedright = ##t
     \translator { \ScoreContext
-    SpacingSpanner \override #'stem-spacing-correction = #0.0
+    \override SpacingSpanner #'stem-spacing-correction = #0.0
   }  }
 }
  
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 40081c2bcf..2b879ad88e 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc = "LilyPond correctly determines the size of every
@@ -16,7 +16,7 @@
     \paper { 
 	 \translator {
 	     \ScoreContext
-	     System \override #'print-function = #box-grob-stencil
+	     \override System #'print-function = #box-grob-stencil
 	     }
     }
 }
diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index 9ec78d8026..f574fa4586 100644
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index d77b4248f3..1f6d279e72 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
         title = "Song"
         subtitle = "(tune)"
@@ -242,8 +242,8 @@ drumContents = {
                 \translator { \RemoveEmptyStaffContext }
                 \translator {
                         \ScoreContext
-                        BarNumber \override #'padding = #3
-                        RehearsalMark \override #'padding = #2
+                        \override BarNumber #'padding = #3
+                        \override RehearsalMark #'padding = #2
                         skipBars = ##t
                 }
         }
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index c060be3f2d..ef338474de 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 texidoc ="
   Dynamics on a separate line, neatly centered between staffs.
@@ -48,10 +48,10 @@ pedal = \notes {
       \consists "Dynamic_engraver"
       \consists "Text_engraver"
 
-      TextScript \override #'font-size = #2
-      TextScript \override #'font-shape = #'italic
-      DynamicText \override #'extra-offset = #'(0 . 2.5)
-      Hairpin \override #'extra-offset = #'(0 . 2.5)
+      \override TextScript #'font-size = #2
+      \override TextScript #'font-shape = #'italic
+      \override DynamicText #'extra-offset = #'(0 . 2.5)
+      \override Hairpin #'extra-offset = #'(0 . 2.5)
 
       \consists "Skip_event_swallow_translator"
 
@@ -60,7 +60,7 @@ pedal = \notes {
     \translator {
       \PianoStaffContext
       \accepts Dynamics
-      VerticalAlignment \override #'forced-distance = #7
+      \override VerticalAlignment #'forced-distance = #7
     }
   }
   \midi {
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 9e97a1f0b4..833fdb9118 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
   texidoc ="Lyrics between two staffs."
diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index 29c5b9a802..ee730190f0 100644
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 \header {
   texidoc ="Classical song format: one staff with melody and lyrics,
 and piano accompaniment."
diff --git a/input/template/satb.ly b/input/template/satb.ly
index a7114facc5..e851da4ca0 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc = "
diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly
index e0dc17fc8c..8850ceb644 100644
--- a/input/test/ac-extra-voice.ly
+++ b/input/test/ac-extra-voice.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 %% I don't know what this example is supposed to do.  delete it?
 %% It shows how to use the autochange feature together with an extra
@@ -47,7 +47,7 @@ accompany = \repeat unfold 4  \basloopje
     \paper {
 	\translator{ 
 	    \StaffContext
-	    autoBeamSettings \override #'(end * * * *)
+	    \override autoBeamSettings #'(end * * * *)
 	 = #(ly:make-moment 1 2)
 	}
     }
diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index 36bc590c01..895002b34b 100644
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -13,7 +13,7 @@ derived context can then be used in parallel in the same score. (this is not dem
 "
 }
 
-\version "2.1.22"
+\version "2.1.23"
 
 #(define (kill-ambitus grob grob-context apply-context)
   (if (memq 'ambitus-interface (ly:get-grob-property grob 'interfaces))
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index d1fc2fc94c..c12ab2456f 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -233,10 +233,10 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 	    \consists Mensural_ligature_engraver
-	    NoteHead \set #'style = #'mensural
-%	    Stem \set #'flag-style = #'mensural %%%%%%%% FIXME: this core dumps
-	    Stem \set #'thickness = #1.0
-	    Rest \set #'style = #'mensural
+	    \override NoteHead #'style = #'mensural
+%	    \override Stem #'flag-style = #'mensural %%%%%%%% FIXME: this core dumps
+	    \override Stem #'thickness = #1.0
+	    \override Rest #'style = #'mensural
 	    autoBeaming = ##f
 	}
 	\translator {
@@ -245,7 +245,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 %	    \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented
-	    NoteHead \set #'style = #'vaticana_punctum
+	    \override NoteHead #'style = #'vaticana_punctum
 	    autoBeaming = ##f
 	}
 	\translator {
@@ -254,13 +254,13 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \alias Staff
 	    \accepts MensuralVoice
 	    \consists Custos_engraver
-	    TimeSignature \set #'style = #'mensural
-	    KeySignature \set #'style = #'mensural
-	    Accidental \set #'style = #'mensural
-	    Custos \set #'style = #'mensural
-	    Custos \set #'neutral-position = #3
-	    Custos \set #'neutral-direction = #-1
-	    Custos \set #'adjust-if-on-staffline = ##t
+	    \override TimeSignature #'style = #'mensural
+	    \override KeySignature #'style = #'mensural
+	    \override Accidental #'style = #'mensural
+	    \override Custos #'style = #'mensural
+	    \override Custos #'neutral-position = #3
+	    \override Custos #'neutral-direction = #-1
+	    \override Custos #'adjust-if-on-staffline = ##t
 	    clefGlyph = #"clefs-petrucci_c2"
 	    clefPosition = #-2
 	    clefOctavation = #0 
@@ -272,14 +272,14 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
 	    \accepts GregorianVoice
 	    \consists Custos_engraver
 	    \remove Time_signature_engraver
-	    StaffSymbol \set #'thickness = #2.0
-	    StaffSymbol \set #'line-count = #4
-	    KeySignature \set #'style = #'vaticana
-	    Accidental \set #'style = #'vaticana
-	    Custos \set #'style = #'vaticana
-	    Custos \set #'neutral-position = #4
-	    Custos \set #'neutral-direction = #-1
-	    Custos \set #'adjust-if-on-staffline = ##t
+	    \override StaffSymbol #'thickness = #2.0
+	    \override StaffSymbol #'line-count = #4
+	    \override KeySignature #'style = #'vaticana
+	    \override Accidental #'style = #'vaticana
+	    \override Custos #'style = #'vaticana
+	    \override Custos #'neutral-position = #4
+	    \override Custos #'neutral-direction = #-1
+	    \override Custos #'adjust-if-on-staffline = ##t
 	    clefGlyph = #"clefs-vaticana_do"
 	    clefPosition = #1
 	    clefOctavation = #0 
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 92e48ddbe1..bf4e6defe2 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
  texidoc = "@cindex Bagpipe Music
@@ -13,9 +13,9 @@ Here's an example of bagpipe music.
   linewidth = 14.0 \cm
   indent = 0.0 \cm
   \translator { \StaffContext
-  	TimeSignature \override #'style = #'C
-%  	TimeSignature \override #'visibility-function = #begin-of-line-visible
-  	TimeSignature \override #'break-visibility = #begin-of-line-visible
+  	\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 6435ae50d0..8a8ff6f88f 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header { texidoc = "@cindex Bar line lyric only
 You can move around @code{Bar_engraver} and
 @code{Span_bar_engraver} if you want bar lines on lyrics. "
@@ -22,7 +22,7 @@ You can move around @code{Bar_engraver} and
   \LyricsContext
   \consists Bar_engraver
   % need procedure, since lyrics doesn't have a staff_sym engraver.
-  BarLine \override #'bar-size-procedure = #(lambda (x) 3.0)
+  \override BarLine #'bar-size-procedure = #(lambda (x) 3.0)
 }
 \translator {
   \LyricsContext
diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index d79b02c3fe..ca7811d969 100644
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc = "@cindex Auto Beaming Override
@@ -45,7 +45,7 @@ The beam will be ended also when now % beamAutoEnd = 0.
     \paper{
       	\translator{
 	    \VoiceContext
-	    autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2)
+	    \override autoBeamSettings #'(end * * * *) = #(ly:make-moment 1 2)
 	}
     }
 \paper{raggedright = ##t}
diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly
index b21156cdd7..d8e7b7ad36 100644
--- a/input/test/blank-paper-tab.ly
+++ b/input/test/blank-paper-tab.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
     
 texidoc = "@cindex Blank Paper Tab
diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly
index 8c892d0bfa..71178bbc9a 100644
--- a/input/test/blank-paper.ly
+++ b/input/test/blank-paper.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
   texidoc="@cindex Blank Paper
 
@@ -14,8 +14,8 @@ Blank music paper with clefs. Change the repeat count to get more staves.
   \paper {
     \translator {
       \ScoreContext
-      TimeSignature \override #'transparent = ##t
-      NoteHead \override #'transparent = ##t
+      \override TimeSignature #'transparent = ##t
+      \override NoteHead #'transparent = ##t
       defaultBarType = #""
       \remove Bar_number_engraver
     }
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index d084d3aa5c..c2909e8f07 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header  {
     texidoc = "@cindex Chord Names German
 By setting @code{chordRootNamer}, the root
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index df8715d782..dd7ba5ab7c 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 
 \header {
diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly
index 804ecd868b..fc79a41d4f 100644
--- a/input/test/chords-without-melody.ly
+++ b/input/test/chords-without-melody.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 texidoc = "Jazz chords can also be used without notes."
 }
@@ -15,7 +15,7 @@ texidoc = "Jazz chords can also be used without notes."
 		\translator{
 			\ChordNamesContext
 
-			BarLine \override #'bar-size = #4
+			\override BarLine #'bar-size = #4
 
 			
 			\consists Bar_engraver
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index dfef778b97..d3b77f4254 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -137,7 +137,7 @@ violoncello = \notes \relative c' {
       }
       \translator {
 	  \OrchestralScoreContext
-	  TimeSignature \override #'style = #'C
+	  \override TimeSignature #'style = #'C
       }
   }
 }
diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index 48e2324772..05d84b7b5b 100644
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 \header {
     
 texidoc = "The notation problem, @emph{what} symbols to create,
diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 1597d20ab4..18ceba191f 100644
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 % definitely wil be renamed to something.
 %{
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index e08b1fdb16..07d339f6e2 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 %possible rename to paper-fill-a4.ly -gp
 % candidate for reg -gp
 % Han says no, but keeping this comment temporarily so that I don't
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 75a4783b00..21c3384313 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header { texidoc = "
 
diff --git a/input/test/improv.ly b/input/test/improv.ly
index 31249ec3fb..a93c0d36c8 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header {
 
     texidoc =
diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index 25785ee10d..b26181ca00 100644
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can name the whole grandstaff in addition to individual staffs. " }
 
diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly
index e5dd863945..6a8f110b4d 100644
--- a/input/test/lyric-hyphen-retain.ly
+++ b/input/test/lyric-hyphen-retain.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
@@ -25,7 +25,7 @@ c16[ c c c]
 }
     \lyrics \new Lyrics \with {
 	% Otherwise lyrics are so far apart that hyphens don't disappear
-	SeparationItem \set #'padding = #0.0
+	\override SeparationItem #'padding = #0.0
 	}{ bla -- bla -- bla -- bla --
 	   bla -- bla -- bla -- bla --
 
diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 3b6df9f8f4..bf07a35f5f 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
@@ -52,7 +52,7 @@ voice = \notes \transpose c c' {
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 	    \consists Mensural_ligature_engraver
-	    NoteHead \set #'style = #'mensural
+	    \override NoteHead #'style = #'mensural
 	}
 	\translator {
 	    \StaffContext
@@ -60,13 +60,13 @@ voice = \notes \transpose c c' {
 	    \alias Staff
 	    \accepts MensuralVoice
 	    \consists Custos_engraver
-	    TimeSignature \set #'style = #'mensural
-	    KeySignature \set #'style = #'mensural
-	    Accidental \set #'style = #'mensural
-	    Custos \set #'style = #'mensural
-	    Custos \set #'neutral-position = #3
-	    Custos \set #'neutral-direction = #-1
-	    Custos \set #'adjust-if-on-staffline = ##t
+	    \override TimeSignature #'style = #'mensural
+	    \override KeySignature #'style = #'mensural
+	    \override Accidental #'style = #'mensural
+	    \override Custos #'style = #'mensural
+	    \override Custos #'neutral-position = #3
+	    \override Custos #'neutral-direction = #-1
+	    \override Custos #'adjust-if-on-staffline = ##t
 	    clefGlyph = #"clefs-petrucci_g"
 	    clefPosition = #-2
 	    clefOctavation = #-0
diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index d906b7daee..c0c0d68f61 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \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.22"
+\version "2.1.23"
 
 pat = \notes \transpose c c' \repeat unfold 2 {
   << { \context Staff=up {r8 e16 f g e f g } }
@@ -132,7 +132,7 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
   \paper {
     \translator {
       \PianoStaffContext
-      VerticalAlignment \override #'forced-distance = #10
+      \override VerticalAlignment #'forced-distance = #10
     }
 
     linewidth = 18.0 \cm
diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index b8354569ac..f76cde0ebb 100644
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly
index cb40070db8..84482e677c 100644
--- a/input/test/no-staff.ly
+++ b/input/test/no-staff.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly
index 21cd591083..0078f62b82 100644
--- a/input/test/polymetric.ly
+++ b/input/test/polymetric.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header{ texidoc="@cindex Time Signature Multiple
 
diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly
index 00d9fe3c23..f9a2f0dfa8 100644
--- a/input/test/rhythm-excercise.ly
+++ b/input/test/rhythm-excercise.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 \header { texidoc = "@cindex Rhythm Exercise
 This example shows a way to generate rhythm exercises with
 LilyPond (e.g. no staff but retaining the barlines). "
@@ -8,7 +8,7 @@ LilyPond (e.g. no staff but retaining the barlines). "
 
 	 \paper {
 	     \translator { \StaffContext
-			   StaffSymbol \set #'transparent = ##t
+			   \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 0169881d96..f85c21316e 100644
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header { texidoc="@cindex Slur Ugly
 You can get ugly slurs, if you want. "
@@ -22,15 +22,15 @@ baseWalk = \notes \relative c {
     raggedright = ##t
     \translator {
       \VoiceContext
-      Slur \override #'beautiful = #5.0
-      Slur \override #'direction = #1
-      Stem \override #'direction = #-1
-      autoBeamSettings \override #'(end * * * *)
+      \override Slur #'beautiful = #5.0
+      \override Slur #'direction = #1
+      \override Stem #'direction = #-1
+      \override autoBeamSettings #'(end * * * *)
      = #(ly:make-moment 1 2)
     }
     \translator {
       \PianoStaffContext
-      VerticalAlignment \override #'threshold = #'(5 . 5)
+      \override VerticalAlignment #'threshold = #'(5 . 5)
     }
   }
 }
diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 921fee517b..021e7a3a62 100644
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header{texidoc = "@cindex Staff Bracket
 Here's an example of staff brackets. "
diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 902f801f97..2ae4d23aee 100644
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly
index f0ebace726..0de38759e9 100644
--- a/input/test/staff-space.ly
+++ b/input/test/staff-space.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 \header{ texidoc ="@cindex Staff Space
 Setting staff space on a staff. "
@@ -17,7 +17,7 @@ Setting staff space on a staff. "
 >>
 \paper {  \translator  {
       \StaffContext
-      StaffSymbol \set #'staff-space = #5.5
+      \override StaffSymbol #'staff-space = #5.5
       }
 	raggedright=##t }
 }
diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 4470fcbae4..694fff6200 100644
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.23"
 
 \header {
 
diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly
index ef229a6d89..135ec7a316 100644
--- a/input/test/vaticana.ly
+++ b/input/test/vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 % possible rename to ancient-something.
 
 \header { texidoc	= "Ancient Vaticana
diff --git a/lily/parser.yy b/lily/parser.yy
index ec85f5504d..06aa057bf8 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1129,21 +1129,17 @@ property_operation:
 		$$ = scm_list_n (ly_symbol2scm ("assign"),
 			scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
 	}
-	| STRING UNSET {
+	| UNSET STRING {
 		$$ = scm_list_n (ly_symbol2scm ("unset"),
-			scm_string_to_symbol ($1), SCM_UNDEFINED);
+			scm_string_to_symbol ($2), SCM_UNDEFINED);
 	}
-	| STRING SET embedded_scm '=' embedded_scm {
-		$$ = scm_list_n (ly_symbol2scm ("poppush"),
-			scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
-	}
-	| STRING OVERRIDE embedded_scm '=' embedded_scm {
+	| OVERRIDE STRING embedded_scm '=' embedded_scm {
 		$$ = scm_list_n (ly_symbol2scm ("push"),
-			scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
+			scm_string_to_symbol ($2), $3, $5, SCM_UNDEFINED);
 	}
-	| STRING REVERT embedded_scm {
+	| REVERT STRING embedded_scm {
 		$$ = scm_list_n (ly_symbol2scm ("pop"),
-			scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
+			scm_string_to_symbol ($2), $3, SCM_UNDEFINED);
 	}
 	;
 
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 7c62687f6e..0f55ad98e5 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.22"
+\version "2.1.23"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index dd545ca052..08ac5604b3 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 
 %
@@ -9,9 +9,6 @@
 	\type "Engraver_group_engraver"
 	\name Staff
 
-	\description "Handles clefs, bar lines, keys, accidentals.  It can contain
-@code{Voice} contexts."
-
 	
 	\consists "Output_property_engraver"	
 	
@@ -54,6 +51,9 @@
 	instr = #'()
 	  
 	\accepts "Voice"
+	\description "Handles clefs, bar lines, keys, accidentals.  It can contain
+@code{Voice} contexts."
+
 }
 
 \translator {
@@ -75,7 +75,7 @@
 
     clefGlyph = #"clefs-percussion"
     clefPosition = #0
-    Script \set #'staff-padding = #0.75 
+    \override Script #'staff-padding = #0.75 
 }
 
 
@@ -99,11 +99,11 @@
 	\InnerChoirStaffContext
 	\name ChoirStaff
 	
+	\accepts "InnerChoirStaff"
+	\accepts "InnerStaffGroup"
 	\description "Identical to @code{StaffGroup} except that the
     contained staves are not connected vertically."
 	
-	\accepts "InnerChoirStaff"
-	\accepts "InnerStaffGroup"
 }
 
 
@@ -112,10 +112,6 @@
     
     \consists "Output_property_engraver"	
 
-    \description  "
-    A context like @code{Staff} but for printing rhythms.  Pitches are
-    ignored; the notes are printed on one line.  
-"
     minimumVerticalExtent = ##f
     extraVerticalExtent = ##f
     verticalExtent = ##f 
@@ -126,13 +122,13 @@
     \name RhythmicStaff
     \alias "Staff"
     
-    BarLine \override #'bar-size = #4
-    VoltaBracket \override #'minimum-space = #15
-    VoltaBracket \override #'padding = #5
-    StaffSymbol \override #'line-count = #1	
+    \override BarLine #'bar-size = #4
+    \override VoltaBracket #'minimum-space = #15
+    \override VoltaBracket #'padding = #5
+    \override StaffSymbol #'line-count = #1	
 
-    Stem \override #'neutral-direction = #1
-    Beam \override #'neutral-direction = #1 	
+    \override Stem  #'neutral-direction = #1
+    \override Beam  #'neutral-direction = #1 	
 				%	\consists "Repeat_engraver"
     \consists "Dot_column_engraver"
     \consists "Volta_engraver"
@@ -142,6 +138,10 @@
     \consists "Instrument_name_engraver"
     \consistsend "Axis_group_engraver"
     \accepts "Voice"
+    \description  "
+    A context like @code{Staff} but for printing rhythms.  Pitches are
+    ignored; the notes are printed on one line.  
+"
 }
 
 
@@ -263,8 +263,8 @@
     the staves, so cross staff beaming and slurring can be used."
     
     verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
-    VerticalAlignment \override #'forced-distance = #12
-    VerticalAlignment \override #'self-alignment-Y = #0
+    \override VerticalAlignment #'forced-distance = #12
+    \override VerticalAlignment #'self-alignment-Y = #0
 
     \consists "Vertical_align_engraver"
     \consists "Instrument_name_engraver"
@@ -329,7 +329,7 @@ printing of a single line of lyrics.  "
     \consists "Stanza_number_engraver"
     \consists "Vocal_name_engraver"
     \consists "Skip_event_swallow_translator"
-    SeparationItem \set #'padding = #0.2
+    \override SeparationItem #'padding = #0.2
 }
 
 \translator {
@@ -364,7 +364,7 @@ printing of a single line of lyrics.  "
     
     minimumVerticalExtent = #'(0 . 2.5)
     extraVerticalExtent = ##f
-    SeparatingGroupSpanner \override #'padding = #0.8
+    \override SeparatingGroupSpanner #'padding = #0.8
     verticalExtent = ##f 
 }
 
@@ -373,7 +373,7 @@ RemoveEmptyStaffContext= \translator {
     \StaffContext
     \remove "Axis_group_engraver"
     \consistsend "Hara_kiri_engraver"
-    Beam \override #'auto-knee-gap = #'()
+    \override Beam #'auto-knee-gap = #'()
 }
 
 AncientRemoveEmptyStaffContext = \translator {
@@ -565,9 +565,9 @@ OrchestralScoreContext = \translator {
 
 EasyNotation = \translator {
 	\ScoreContext
-	NoteHead \override #'print-function = #Note_head::brew_ez_stencil
-	NoteHead \override #'Y-extent-callback = #'()
-	NoteHead \override #'X-extent-callback = #'()
+	\override NoteHead #'print-function = #Note_head::brew_ez_stencil
+	\override NoteHead #'Y-extent-callback = #'()
+	\override NoteHead #'X-extent-callback = #'()
 }
 
 
@@ -604,14 +604,14 @@ EasyNotation = \translator {
       \remove "New_fingering_engraver"
 
       \description "Context for drawing notes in a Tab staff. "
-      Slur \override #'font-family    = #'roman
-      Slur \override #'print-function = #hammer-print-function
-      Slur \override #'direction = #-1
+      \override Slur #'font-family    = #'roman
+      \override Slur #'print-function = #hammer-print-function
+      \override Slur #'direction = #-1
 
       % Draws all stems/beams out of the staff (and not in the middle of the staff !)
       % This feature is now disabled because most of the tab does not use it.
-      %Beam \override #'damping = #100000
-      %Stem \override #'up-to-staff = ##t
+      %\override Beam #'damping = #100000
+      %\override Stem #'up-to-staff = ##t
 
       % No accidental in tablature !
       \remove Accidental_engraver
@@ -635,11 +635,11 @@ EasyNotation = \translator {
       \accepts "TabVoice"
       
       % 6 strings
-      StaffSymbol \override #'line-count = #6
-      StaffSymbol \override #'staff-space = #1.5
+      \override StaffSymbol #'line-count = #6
+      \override StaffSymbol #'staff-space = #1.5
 
      % Don't draw stems over the tablature figures !
-      Stem \override #'avoid-note-head = ##t
+      \override Stem #'avoid-note-head = ##t
       
       % No accidental in tablature !
       \remove "Accidental_engraver"
@@ -672,21 +672,21 @@ EasyNotation = \translator {
   \consists "Vaticana_ligature_engraver"
 
   % Set default head for notes outside of \[ \].
-  NoteHead \set #'style = #'vaticana_punctum
+  \override NoteHead #'style = #'vaticana_punctum
 
   % Put some space before and after divisiones.
   % FIXME: This does not seem to show any effect.
-  Script \set #'padding = #0.5
+  \override Script #'padding = #0.5
 
   % There are no beams in Gregorian Chant notation.
   autobeaming = ##f
 
   % Prepare TextSpanner for \episem{Initium|Finis} use.
-  TextSpanner \set #'style = #'line
-  TextSpanner \set #'edge-height = #'(0 . 0)
-  TextSpanner \set #'padding = #0.5
-  TextSpanner \set #'enclose-bounds = #1
-  TextSpanner \set #'edge-text = #'("" . "")
+  \override TextSpanner #'style = #'line
+  \override TextSpanner #'edge-height = #'(0 . 0)
+  \override TextSpanner #'padding = #0.5
+  \override TextSpanner #'enclose-bounds = #1
+  \override TextSpanner #'edge-text = #'("" . "")
 }
 
 \translator {
@@ -703,13 +703,13 @@ EasyNotation = \translator {
   % We can not remove Bar_engraver; otherwise clefs and custodes will
   % not show up any more among other line breaking issues.
   % Instead, we make the grob transparent.
-  BarLine \set #'transparent = ##t
+  \override BarLine #'transparent = ##t
 
-  StaffSymbol \set #'line-count = #4
-  StaffSymbol \set #'thickness = #0.6
+  \override StaffSymbol #'line-count = #4
+  \override StaffSymbol #'thickness = #0.6
 
   % FIXME: unit on StaffSymbol's width should be \linewidth.
-  % StaffSymbol \set #'width = #60.0
+  % \override StaffSymbol #'width = #60.0
 
   % Choose vaticana do clef on 3rd line as default.
   clefGlyph = #"clefs-vaticana_do"
@@ -718,12 +718,12 @@ EasyNotation = \translator {
   clefOctavation = #0
 
   % Select vaticana style font.
-  KeySignature \set #'style = #'vaticana
-  Accidental \set #'style = #'vaticana
-  Custos \set #'style = #'vaticana
-  Custos \set #'neutral-position = #3
-  Custos \set #'neutral-direction = #-1
-  Custos \set #'adjust-if-on-staffline = ##t
+  \override KeySignature #'style = #'vaticana
+  \override Accidental #'style = #'vaticana
+  \override Custos #'style = #'vaticana
+  \override Custos #'neutral-position = #3
+  \override Custos #'neutral-direction = #-1
+  \override Custos #'adjust-if-on-staffline = ##t
 
   % Score.timing = ##f
   % Score.barAlways = ##t
@@ -738,21 +738,21 @@ EasyNotation = \translator {
   % other ligature engraver would cause a "Junking event: `LigatureEvent'"
   % warning for every "\[" and "\]".  Therefore, we make the grob
   % transparent instead.
-  LigatureBracket \set #'transparent = ##t
+  \override LigatureBracket #'transparent = ##t
 
   % Put some space before and after divisiones.
   % FIXME: This does not seem to show any effect.
-  Script \set #'padding = #0.5
+  \override Script #'padding = #0.5
 
   % There are no beams in Gregorian Chant notation.
   autobeaming = ##f
 
   % Prepare TextSpanner for \episem{Initium|Finis} use.
-  TextSpanner \set #'style = #'line
-  TextSpanner \set #'edge-height = #'(0 . 0)
-  TextSpanner \set #'padding = #0.5
-  TextSpanner \set #'enclose-bounds = #1
-  TextSpanner \set #'edge-text = #'("" . "")
+  \override TextSpanner #'style = #'line
+  \override TextSpanner #'edge-height = #'(0 . 0)
+  \override TextSpanner #'padding = #0.5
+  \override TextSpanner #'enclose-bounds = #1
+  \override TextSpanner #'edge-text = #'("" . "")
 }
  \translator {
   \StaffContext
@@ -764,5 +764,5 @@ EasyNotation = \translator {
   % We can not remove Bar_engraver; otherwise clefs and custodes will
   % not show up any more among other line breaking issues.
   % Instead, we make the grob transparent.
-  BarLine \set #'transparent = ##t
+  \override BarLine #'transparent = ##t
 }
diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly
index c27098bfc0..bfa039a1a5 100644
--- a/ly/part-paper-init.ly
+++ b/ly/part-paper-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 % JUNKME
 %part-paper-init.ly
diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 5a024a7d23..daba5a3261 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.22"
+\version "2.1.23"
 
 				%
 				% setup for Request->Element conversion. Guru-only
diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 328997ddad..2fd7a35326 100644
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -68,7 +68,7 @@ eg. @code{\\tag #'part ...} could tag a piece of music as only being active in a
      (name ,symbol? "Name of this music object")
      (numerator ,integer? "numerator of a time signature")
      (once ,boolean? "Apply this operation only during one time step?")
-     (octavation  integer?
+     (octavation ,integer?
 		  "This pitch was octavated by how many octaves?
 For chord inversions, this is negative.")
      (origin ,ly:input-location? "where was this piece of music defined?")
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index b0a4020035..5a7f4473d5 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1873,6 +1873,21 @@ conversions.append (((2,1,22), conv, """new syntax for property settings:
 
 """))
 
+def conv (str):
+	def subst_in_trans (match):
+		s = match.group (0)
+		s = re.sub (r'([a-zA-Z]+)\s*\\override',
+			      r'\\override \1', s)
+		s = re.sub (r'([a-zA-Z]+)\s*\\set',
+			      r'\\override \1', s)
+		s = re.sub (r'([a-zA-Z]+)\s*\\revert',
+			      r'\\revert \1', s)
+		return s
+	str = re.sub (r'\\(translator|with)\s*{[^}]+}',  subst_in_trans, str)
+	return str
+	
+conversions.append (((2,1,23), conv, """Property setting syntax in \\translator{ }"""))
+
 
 ################################
 #	END OF CONVERSIONS