From b76510c433834f0bc5a9566a6bb1e55fe675f247 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Fri, 14 Mar 2003 13:37:34 +0000 Subject: [PATCH] Fix loading of files created by the development version git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6503 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 4 ++++ lib/lyx2lyx/lyx2lyx | 19 +++++++++++++------ src/ChangeLog | 3 +++ src/buffer.C | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 20383755eb..9feb2274f0 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-03-14 Dekel Tsur + + * lyx2lyx/lyx2lyx (main): Handle development version files + 2003-03-12 Angus Leeming * images/font-free.xpm: renamed as font-free-apply.xpm. diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx index c69d1ca57d..2dc120037f 100755 --- a/lib/lyx2lyx/lyx2lyx +++ b/lib/lyx2lyx/lyx2lyx @@ -37,7 +37,7 @@ opt.quiet = 0 format = re.compile(r"(\d)[\.,]?(\d\d)") fileformat = re.compile(r"\\lyxformat\s*(\S*)") -lst_ft = ["210", "215", "216", "217", "218", "220", "221", "222"] +lst_ft = ["210", "215", "216", "217", "218", "220", "221", "223"] def usage(): print """Usage: lyx2lyx [options] file1 @@ -105,10 +105,17 @@ def lyxformat(fmt): else: sys.stderr.write(fmt + ": " + error.invalid_format) sys.exit(2) - if fmt not in lst_ft: - sys.stderr.write(fmt + ": " + error.format_not_supported) - sys.exit(1) - return fmt + + if fmt in lst_ft: + return fmt + + x = int(fmt) + if x < int(lst_ft[-1]) and x > int(lst_ft[-2]): + sys.stderr.write("lyx2lyx: A development version file.\n") + return lst_ft[-2] + + sys.stderr.write(fmt + ": " + error.format_not_supported) + sys.exit(1) def read_file(file, header, body): """Reads a file into the header and body parts""" @@ -164,7 +171,7 @@ def main(argv): if opt.start: if opt.start != fmt: - print warning.dont_match + ":", opt.start, fmt + sys.stderr.write("%s: %s %s\n" % (warning.dont_match, opt.start, fmt)) else: opt.start = fmt diff --git a/src/ChangeLog b/src/ChangeLog index e94795b0da..c54fd8db95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,6 @@ +2003-03-14 Dekel Tsur + + * buffer.C: increment LYX_FORMAT to 223 2003-03-14 André Pönitz diff --git a/src/buffer.C b/src/buffer.C index c17dc2e2cd..52595e0130 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -115,7 +115,7 @@ extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 222; +const int LYX_FORMAT = 223; } // namespace anon -- 2.39.2