The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 24dea042c285a4295ea35324be1e03f25f37c31f 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. (cherry picked from commit 945c0e4127e0393ee50907e9aa7f04a2c972a5fc) diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py index a59dfcf..a83e457 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 9f30cca..c8a7280 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 ----------------------------------------------------------------------- Summary of changes: lib/scripts/layout2layout.py | 4 ++-- status.20x | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
