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 945c0e4127e0393ee50907e9aa7f04a2c972a5fc)

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index a59dfcfae2afbd3425278d44a4f8ee17edf69e90..a83e45711bb50fb105a54a95a03ff3e110a6c20f 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/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:

diff --git a/status.20x b/status.20x
index 9f30cca5823419e6c089c7bc956e80fdcce46903..c8a7280d3d135050909b97f7ee8d86554a15556a 100644 (file)
--- a/status.20x
+++ b/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