The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 945c0e4127e0393ee50907e9aa7f04a2c972a5fc
Author: Richard Heck <[email protected]>
Date:   Mon Dec 10 11:09:50 2012 -0500

    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 6f001b3..1c6f1ad 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:

-----------------------------------------------------------------------

Summary of changes:
 lib/scripts/layout2layout.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to