update file format to reflect the paperpackage bugfix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8829 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/ChangeLog b/development/ChangeLog
index 656a716481dc85978b7e0d64c2e308382a77bab8..c8161237edf1fd35e49e2ea9f9753bb3c346c8ed 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * FORMAT: document change to format 235.
+
 2004-05-12  Angus Leeming  <leeming@lyx.org>
 
        * FORMAT: document change to format 234.

diff --git a/development/FORMAT b/development/FORMAT
index 42505511fbc428433c8cc608e20ff41485a13d8f..d0b716e72b708f8b3570e1f6c3929d3348ad9c81 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,16 @@
 LyX file-format changes
 -----------------------
 
+2004-07-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * format incremented to 235.
+       * \paperpackage had an off-by-one error. Translation table:
+
+         234: a4    a4wide  widemarginsa4 
+         235: none  a4      a4wide         widemarginsa4
+
+         The "widemarginsa4" setting of 235 has no equivalent in 234.
+
 2004-05-12  Angus Leeming  <leeming@lyx.org>
 
        * format incremented to 234.

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index ff7217b40553d122089ed6233c6d4d36b052fd39..cd313dd09d49132f7fe5bbf13992129f20585997 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * lyx_1_4.py (convert_paperpackage): new, convert paperpackage setting
+       * lyx_1_4.py (revert_paperpackage): new, revert paperpackage setting
+       * lyx_1_4.py (revert, convert): handle format 235
+       * parser_tools.py: up the format to 235.
+
 2004-05-12  Angus Leeming  <leeming@lyx.org>
 
        * lyx_1_4.py (convert_cite_engine, revert_cite_engine): new functions

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 4ccb750d5ee7ca4ed9600002bc1ccc1e7402594d..df35fe8b5dc56189edccc732298ef5460e3a5ced 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1322,6 +1322,29 @@ def revert_cite_engine(header, opt):
     header.insert(i, "\\use_natbib " + use_natbib)
 
 
+def convert_paperpackage(header, opt):
+    i = find_token(header, "\\paperpackage", 0)
+    if i == -1:
+        opt.warning("Malformed lyx file: Missing '\\paperpackage'")
+        return
+
+    packages = {'a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
+    paperpackage = split(header[i])[1]
+    header[i] = replace(header[i], paperpackage, packages[paperpackage])
+
+
+def revert_paperpackage(header, opt):
+    i = find_token(header, "\\paperpackage", 0)
+    if i == -1:
+        opt.warning("Malformed lyx file: Missing '\\paperpackage'")
+        return
+
+    packages = {'none':'a4', 'a4':'a4wide', 'a4wide':'widemarginsa4',
+                'widemarginsa4':''}
+    paperpackage = split(header[i])[1]
+    header[i] = replace(header[i], paperpackage, packages[paperpackage])
+
+
 ##
 # Convertion hub
 #
@@ -1396,8 +1419,18 @@ def convert(header, body, opt):
     if opt.format < 234:
         convert_cite_engine(header, opt)
        opt.format = 234
+    if opt.end == opt.format: return
+
+    if opt.format < 235:
+        convert_paperpackage(header, opt)
+       opt.format = 235
 
 def revert(header, body, opt):
+    if opt.format > 234:
+        revert_paperpackage(header, opt)
+       opt.format = 234
+    if opt.end == opt.format: return
+
     if opt.format > 233:
         revert_cite_engine(header, opt)
        opt.format = 233

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 4c698903b5cd2388b6c35d1267cad6de115d9a51..0d346205bfa4ea5bbdb828aac307829613f12c40 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -265,7 +265,7 @@ def set_version(lines, version):
 format_re = re.compile(r"(\d)[\.,]?(\d\d)")
 fileformat = re.compile(r"\\lyxformat\s*(\S*)")
 lst_ft = [210, 215, 216, 217, 218, 220, 221, 223, 224, 225, 226, 227, 228, 229, 
-          230, 231, 232, 233, 234]
+          230, 231, 232, 233, 234, 235]
 
 format_relation = [("0_10",  [210], ["0.10.7","0.10"]),
                    ("0_12",  [215], ["0.12","0.12.1","0.12"]),
@@ -277,7 +277,7 @@ format_relation = [("0_10",  [210], ["0.10.7","0.10"]),
                    ("1_1_6fix3", [218], ["1.1.6fix3","1.1.6fix4","1.1"]),
                    ("1_2", [220], ["1.2.0","1.2.1","1.2.3","1.2.4","1.2"]),
                    ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3"]),
-                   ("1_4", [223,224,225,226,227,228,229,230,231,232,233,234], ["1.4.0cvs","1.4"])]
+                   ("1_4", [223,224,225,226,227,228,229,230,231,232,233,234,235], ["1.4.0cvs","1.4"])]
 
 
 def lyxformat(format, opt):

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fd6dc1ba8f64a6ee72c77c59b4efe4830458409..24d2f33559de0ac3c86cf883346fd25f1558bea3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * buffer.C: up LYX_FORMAT to 235 (needed for the paperpackage fix)
+
 2004-06-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * paragraph.C (isWord): return true on insets that report

diff --git a/src/buffer.C b/src/buffer.C
index 94bdf87d919f8c5e164f162bb62dd43bfa8af812..d2f07cf19e3a936b7a9dc258ce94327ae9a2dd75 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -136,7 +136,7 @@ extern BufferList bufferlist;
 
 namespace {
 
-const int LYX_FORMAT = 234;
+const int LYX_FORMAT = 235;
 
 } // namespace anon