From: Richard Heck 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.0.6~198 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=24dea042c285a4295ea35324be1e03f25f37c31f;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. (cherry picked from commit 945c0e4127e0393ee50907e9aa7f04a2c972a5fc) --- diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index a59dfcfae2..a83e45711b 100644 --- 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 9f30cca582..c8a7280d3d 100644 --- 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