Compile fix.

4 files changed, 15 insertions, 21 deletions

diff --git a/input/regression/mozart-hrn3-allegro.ily b/input/regression/mozart-hrn3-allegro.ily
index d788aeecbc..5f4f1d7269 100644
--- a/input/regression/mozart-hrn3-allegro.ily
+++ b/input/regression/mozart-hrn3-allegro.ily
@@ -55,15 +55,15 @@ allegro =
 	 a[(  g) d'(  b)]  a[(  g) e'(  c) ]
 	 b8[(  a)] a4 r4  a8[ a]
 	 a[( \< b c cis\!\> ]  d4  c\!)
-	 ais8[( b)] r8 \cresc b  b[( c)] r c
+	 ais8[( b)] r8 b\cresc  b[( c)] r c
 	 cis[ ( d)] r4 r2
-	\endcresc g,1\f ~ g2 ~  g8[ a16 b]  c[( d) e c]
+	g,1\!\f ~ g2 ~  g8[ a16 b]  c[( d) e c]
 	%% 64
 	f4-. d-. b-. g-.
 	R1
 
-	c,2\p e4 g c \cresc e g4. e8 |
-	\endcresc d4.\f  e16[ fis]  g[ ( fis) e d]  c[( b) a g]
+	c,2\p e4 g c e\cresc g4. e8 |
+	d4.\!\f  e16[ fis]  g[ ( fis) e d]  c[( b) a g]
 
 	<< a1(\trill
 	  { s2 \grace {
@@ -146,9 +146,9 @@ allegro =
 	R1
 	c1 ~
 	c |
-	 c8[-. c-.] r c-.  cis[( d)] r\cresc d-. |
+	 c8[-. c-.] r c-.  cis[( d)] r d-.\cresc |
 	 dis[( e)] r e-.  e[( f)] r f-. |
-	g4-.\f\endcresc  e-. c-. bes-. |
+	g4-.\!\f  e-. c-. bes-. |
 	g-.\ff e-. c-. r |
 	a'2 ~  a8[_""_\markup { \bold \italic "sempre " \dynamic "f" }  b16 c]  d[( e d  e)]
 
diff --git a/input/regression/mozart-hrn3-defs.ily b/input/regression/mozart-hrn3-defs.ily
index c234ffd3d5..fe9966d71f 100644
--- a/input/regression/mozart-hrn3-defs.ily
+++ b/input/regression/mozart-hrn3-defs.ily
@@ -6,12 +6,6 @@ ritenuto = \markup { \italic  "rit." }
 
 \version "2.11.61"
   
-cresc =  {
-    #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
-    \set crescendoText =  \markup { \italic \bold "cresc." }
-    \set crescendoSpanner =  #'text
-}
-
 \layout {
     \context {
         \Score
diff --git a/input/regression/mozart-hrn3-rondo.ily b/input/regression/mozart-hrn3-rondo.ily
index 02c0493b0f..81e7834417 100644
--- a/input/regression/mozart-hrn3-rondo.ily
+++ b/input/regression/mozart-hrn3-rondo.ily
@@ -133,11 +133,10 @@ rondo =  	\relative c'
 	R2. |
 	r8  g[ g]  g[ g g]
 	es'4. ~  es8[ d c]
-	\cresc b4.  c4. d4. e4.
+	b4.\cresc  c4. d4. e4.
 	\mark "F"
-	\endcresc
 	
-	f2.\f ~ |
+	f2.\!\f ~ |
 	f4 r8 r4 r8
 	r8  g,[\> g]  g[ g g]
 	
@@ -161,10 +160,10 @@ rondo =  	\relative c'
 	 c[ ( e) g,-.] 	 c[ ( e) g,-.]
 	 c[ ( e) g,-.] 	 c[ ( e) g,-.]
 	\mark "H"
-	\cresc g'2.  bes,2.
+	g'2.\cresc  bes,2.
 	a4.  b16[ c d e f g]
 	a4. f4 d8
-	\endcresc c8[\f g' e]  c[ g e]
+	c8[\!\f g' e]  c[ g e]
 	 c[ e' c]   g[ e c]
 	g4 r8  g''8[ e c]
 
@@ -181,9 +180,9 @@ rondo =  	\relative c'
 	R2.*5
 	r8 r8^\fermata d8\p  d[ e f]
 	 g[ ( e) c]  d[( e) d]
-	\cresc  c[  c c]  d[ e f]
+	c[\cresc  c c]  d[ e f]
 	 g[( e) c]  d[( e) d]
-	\endcresc c4\f  r8 r4 r8
+	c4\!\f  r8 r4 r8
 	R2.*5
 	 c8[\f c, c]  c[ c c]
 	c4 r8 c4 r8
diff --git a/python/convertrules.py b/python/convertrules.py
index 21c934fd37..e3d4f6d136 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2997,9 +2997,10 @@ def conv(str):
     str = re.sub (r"\\AncientRemoveEmptyStaffContext",
                   r"\\VaticanaStaff \\RemoveEmptyStaves",
                   str);
+    return str
 
-@rule ((2,13,20),
-      _ ("\\cresc etc. are now postfix operators"))
+@rule ((2, 13, 20),
+       _ ("\\cresc etc. are now postfix operators"))
 def conv (str):
     str = re.sub (r'\\(cresc|dim|endcresc|enddim\w+)', r'\\deprecated\1', str)
     return str