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.
(cherry picked from commit 945c0e4127)

lib/scripts/layout2layout.py

@@ -315,9 +315,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:

status.20x

@@ -76,6 +76,9 @@ What's new
 - Fix problem using lyxpak.py when outside the LyX tree: Variable was
   undefined.
 
+- Fix layout conversion bug involving quoted Flex inset names that do not
+  contain spaces.
+
 
 * USER INTERFACE