+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.
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.
+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
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
#
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
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"]),
("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):
+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
namespace {
-const int LYX_FORMAT = 234;
+const int LYX_FORMAT = 235;
} // namespace anon