From: Richard Heck <rgheck@lyx.org>
Date: Mon, 10 Dec 2012 16:09:50 +0000 (-0500)
Subject: Fix lyx2lyx bug: We need to check for quoted names before we check
X-Git-Tag: 2.1.0beta1~1128
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=945c0e4127e0393ee50907e9aa7f04a2c972a5fc;p=features.git

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 6f001b37d0..1c6f1ada09 100644
--- 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: