From b3d5000a648c618e71d1150b91cfcc1541b46889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matox?= Date: Fri, 31 Aug 2007 09:46:14 +0000 Subject: [PATCH] Increment file format due to the embedded feature git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19938 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/FORMAT | 9 +++++++++ lib/lyx2lyx/LyX.py | 2 +- lib/lyx2lyx/lyx_1_6.py | 4 +++- po/POTFILES.in | 2 -- src/Buffer.cpp | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index ff7c2b5e33..2b7c0a0bd3 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -1,6 +1,15 @@ LyX file-format changes ----------------------- +2007-08-31 Bo Peng + + * format incremented to 282: lyx files can be zipfiles with + embedded documents. + +2007-08-29 Richard Heck + + * format incremented to 281: allow modules for layout files. + 2007-08-17 Martin Vermeer * format incremented to 280: the show_label parameter diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index f44ef07016..bf5a479797 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -78,7 +78,7 @@ format_relation = [("0_06", [200], generate_minor_versions("0.6" , 4)), ("1_3", [221], generate_minor_versions("1.3" , 7)), ("1_4", range(222,246), generate_minor_versions("1.4" , 5)), ("1_5", range(246,277), generate_minor_versions("1.5" , 1)), - ("1_6", range(277,282), generate_minor_versions("1.6" , 0))] + ("1_6", range(277,283), generate_minor_versions("1.6" , 0))] def formats_list(): diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py index 693cbf913e..997c656084 100644 --- a/lib/lyx2lyx/lyx_1_6.py +++ b/lib/lyx2lyx/lyx_1_6.py @@ -166,10 +166,12 @@ convert = [ [278, [close_begin_deeper]], [279, [long_charstyle_names]], [280, [axe_show_label]], - [281, []] + [281, []], + [282, []] ] revert = [ + [281, []], [280, [revert_begin_modules]], [279, [revert_show_label]], [278, [revert_long_charstyle_names]], diff --git a/po/POTFILES.in b/po/POTFILES.in index f8839fc2f4..91921db776 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,7 +33,6 @@ src/callback.cpp src/client/debug.cpp src/debug.cpp src/frontends/LyXView.cpp -src/frontends/WorkArea.cpp src/frontends/controllers/ControlAboutlyx.cpp src/frontends/controllers/ControlBibtex.cpp src/frontends/controllers/ControlBox.cpp @@ -145,7 +144,6 @@ src/output.cpp src/output_plaintext.cpp src/rowpainter.cpp src/support/FileFilterList.cpp -src/support/Package.cpp src/support/filetools.cpp src/support/os_win32.cpp src/support/userinfo.cpp diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 6e0cb12714..75fd9e024a 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -142,7 +142,7 @@ namespace fs = boost::filesystem; namespace { -int const LYX_FORMAT = 281; +int const LYX_FORMAT = 282; } // namespace anon