Fix lyx2lyx bug: We need to check for quoted names before we check

for unquoted ones. Otherwise, a quoted name with no spaces gets
treated as if it were an unquoted name.

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 6f001b37d0e4adf332e6456be7ff739bc33e1295..1c6f1ada09ef7e6d728b06794f4088e98d88c67b 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -444,9 +444,9 @@ def convert(lines):
           continue
 
         if format == 34:
-          match = re_InsetLayout2.match(lines[i])
+          match = re_QInsetLayout2.match(lines[i])
           if not match:
-            match = re_QInsetLayout2.match(lines[i])
+            match = re_InsetLayout2.match(lines[i])
           if not match:
             match = re_CopyStyle2.match(lines[i])
             if not match: