* lily/main.cc (setup_paths): Update.

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

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2063ba26db269b4aeaa24d75308403b49a59dafb..023f4573f2547288919db6fae25259d0a2d5a4e0 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2354,12 +2354,17 @@ conversions.append (((2, 5, 1),
                     'ly:import-module -> ly:module-copy'))
 
 def conv (str):
-       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>',
+       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
                      r'\\\1 {\2}', str)
-       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>',
+       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
                      r'\\\1 {\2}', str)
-       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>',
+       str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>',
                      r'\\\1 {\2}', str)
+       def get_markup (m):
+               s = m.group (0)
+               s = re.sub (r'''((\\"|})\s*){''', '\2 \\line {', s)
+               return s
+       str = re.sub (r'\\markup\s*{([^}]|{[^}]*})*}', get_markup, str)
        return str
 
 conversions.append (((2, 5, 2),