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

diff --git a/development/FORMAT b/development/FORMAT
index ff7c2b5e334be3c6c4285a163402416d658a4c00..2b7c0a0bd321e20e63f256ce56dc477fe4d6d3e3 100644 (file)
--- 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 f44ef070168de0febabb989e90de3f5890d7aa2d..bf5a479797b79861fc6484024b68256f5c95688a 100644 (file)
--- 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 693cbf913ecb718123f87e465ddf3f32d4ae502c..997c6560844b0acb6e5789fc3e184da2005f90b0 100644 (file)
--- 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 f8839fc2f4c3365a766f09ec05e3d5e1ee2c1c53..91921db77694c0e988906824cd6247f27d798540 100644 (file)
--- 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 6e0cb127141c7cd3f4f4fb1c764aea5f437c425d..75fd9e024ae33a42367724ab2d7e96c304f7d4a4 100644 (file)
--- 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