From a980f1bd61741c7d2ab61ab046fa69460d041bb2 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Wed, 31 Jan 2007 20:39:46 +0000 Subject: [PATCH] Missing bits of Uwe's file format change from yesterday. Uwe, please add an exact decsription of the lyxline changes to development/FORMAT: How did the old version work, and what are the changes of the new one. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16991 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/FORMAT | 4 ++++ lib/lyx2lyx/LyX.py | 2 +- lib/lyx2lyx/lyx_1_5.py | 6 ++++-- src/buffer.C | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 8a54eea112..abe2184d2b 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -1,6 +1,10 @@ LyX file-format changes -----------------------§ +2007-01-30 Uwe Stöhr + + * format incremented to 257: lyxline changes + 2006-12-22 Georg Baum * format incremented to 256: allow some new inputenc settings. diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index b8119276e6..cb129dfb40 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -73,7 +73,7 @@ format_relation = [("0_06", [200], generate_minor_versions("0.6" , 4)), ("1_2", [220], generate_minor_versions("1.2" , 4)), ("1_3", [221], generate_minor_versions("1.3" , 7)), ("1_4", range(222,246), generate_minor_versions("1.4" , 3)), - ("1_5", range(246,258), generate_minor_versions("1.5" , 0))] + ("1_5", range(246,259), generate_minor_versions("1.5" , 0))] def formats_list(): diff --git a/lib/lyx2lyx/lyx_1_5.py b/lib/lyx2lyx/lyx_1_5.py index 0669620367..68f71cc18b 100644 --- a/lib/lyx2lyx/lyx_1_5.py +++ b/lib/lyx2lyx/lyx_1_5.py @@ -855,9 +855,11 @@ convert = [[246, []], [254, [convert_esint]], [255, []], [256, []], - [257, [convert_caption, convert_lyxline]]] + [257, [convert_caption]], + [258, [convert_lyxline]]] -revert = [[256, [revert_caption]], +revert = [[257, []], + [256, [revert_caption]], [255, [revert_encodings]], [254, [revert_clearpage, revert_cleardoublepage]], [253, [revert_esint]], diff --git a/src/buffer.C b/src/buffer.C index 9d1281ed77..8aa8d259ad 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -141,7 +141,7 @@ using std::string; namespace { -int const LYX_FORMAT = 257; +int const LYX_FORMAT = 258; } // namespace anon