patch::: 1.3.149.jcn1

[lilypond.git] / scripts / convert-ly.py

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index a92b9410cc2de064d9e047a4de8c0681f577c0a0..b0f0dd6a9d3ab203dca83310f13e141b33cb5773 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -706,7 +706,7 @@ if 1:
                def regularize_assignment (match):
                        return '\n' + regularize_id (match.group (1)) + ' = '
                str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str)
-               str = re.sub ('\n([^ \t\n]+) = ', regularize_assignment, str)
+               str = re.sub ('\n([^ \t\n]+)[ \t]*= *', regularize_assignment, str)
                return str
        
        conversions.append (((1,3,117), conv, 'identifier names: $!foo_bar_123 -> xfooBarABC'))
@@ -812,6 +812,20 @@ if 1:
                return str
        conversions.append (((1,3,146), conv, 'semicolons removed'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('default-neutral-direction', 'neutral-direction',str)
+               return str
+       conversions.append (((1,3,147), conv, 'default-neutral-direction -> neutral-direction'))
+
+if 1:
+       def conv (str):
+               str = re.sub ('\(align', '(axis', str)
+               str = re.sub ('\(row', '(columns', str)
+               return str
+       conversions.append (((1,3,148), conv, '(align -> (axis, (row -> columns'))
+
+
 ################################
 #      END OF CONVERSIONS      
 ################################