From ced24dea55bd2c44a04d4fbfd7355e3318d7ed08 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 12 May 2014 22:06:24 +0200 Subject: [PATCH] Fix lyx2lyx warning for tex2lyx files I would not have thought that reLyX was considered, but not tex2lyx! --- lib/lyx2lyx/LyX.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 6b14c6c33e..e7b2186706 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -64,6 +64,7 @@ def minor_versions(major, last_minor_version): format_re = re.compile(r"(\d)[\.,]?(\d\d)") fileformat = re.compile(r"\\lyxformat\s*(\S*)") original_version = re.compile(r".*?LyX ([\d.]*)") +original_tex2lyx_version = re.compile(r".*?tex2lyx ([\d.]*)") ## # file format information: @@ -413,12 +414,16 @@ class LyX_base: return None line = line.replace("fix",".") - result = original_version.match(line) + # need to test original_tex2lyx_version first because tex2lyx + # writes "#LyX file created by tex2lyx 2.2" + result = original_tex2lyx_version.match(line) + if not result: + result = original_version.match(line) + if result: + # Special know cases: reLyX and KLyX + if line.find("reLyX") != -1 or line.find("KLyX") != -1: + return "0.12" if result: - # Special know cases: reLyX and KLyX - if line.find("reLyX") != -1 or line.find("KLyX") != -1: - return "0.12" - res = result.group(1) if not res: self.warning(line) -- 2.39.2