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

Fileformat++ as a safety measure.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33430 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-02-12 01:57:49 +00:00
parent f667a66055
commit 5942071ccb
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/FORMAT
View File

@ -1,6 +1,12 @@
LyX file-format changes LyX file-format changes
----------------------- -----------------------
2010-02-12 Pavel Sanda <sanda@lyx.org>
* Format incremented to 378: support for revision InsetInfo.
Various "vcs-*" strings could be argument of arg parameter
in InsetInfo. This entry is a safety measure, no lyx2lyx
conversion is needed in fact.
2010-02-11 Uwe Stöhr <uwestoehr@web.de> and Edwin Leuven <e.leuven@uva.nl> 2010-02-11 Uwe Stöhr <uwestoehr@web.de> and Edwin Leuven <e.leuven@uva.nl>
* Format incremented to 377: support for multirow cells in * Format incremented to 377: support for multirow cells in
tables tables

6
lib/lyx2lyx/lyx_2_0.py
View File

@ -1241,10 +1241,12 @@ convert = [[346, []],
[374, []], [374, []],
[375, []], [375, []],
[376, []], [376, []],
[377, []] [377, []],
[378, []]
] ]
revert = [[376, [revert_multirow]], revert = [[377, []],
[376, [revert_multirow]],
[375, [revert_includeall]], [375, [revert_includeall]],
[374, [revert_includeonly]], [374, [revert_includeonly]],
[373, [revert_html_options]], [373, [revert_html_options]],

2
src/Buffer.cpp
View File

@ -126,7 +126,7 @@ namespace {
// Do not remove the comment below, so we get merge conflict in // Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own. // independent branches. Instead add your own.
int const LYX_FORMAT = 377; // uwestoehr: support for multirows int const LYX_FORMAT = 378; // ps: rev insetinfo
typedef map<string, bool> DepClean; typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache; typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;