anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update file format to reflect the paperpackage bugfix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8829 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2004-07-01 14:40:59 +00:00
parent dc5326c28f
commit 25bf63f1a1
7 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/ChangeLog
View File

@ -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.

10
development/FORMAT
View File

@ -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.

7
lib/lyx2lyx/ChangeLog
View File

@ -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

33
lib/lyx2lyx/lyx_1_4.py
View File

@ -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

4
lib/lyx2lyx/parser_tools.py
View File

@ -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):

4
src/ChangeLog
View File

@ -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

2
src/buffer.C
View File

@ -136,7 +136,7 @@ extern BufferList bufferlist;
namespace {
const int LYX_FORMAT = 234;
const int LYX_FORMAT = 235;
} // namespace anon