From 6551f0afa8759b6531a4591a389128947c4a7211 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Wed, 13 Jun 2007 14:38:34 +0000 Subject: [PATCH] lyx2lyx support for unrecognizable listings parameter git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18763 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/FORMAT | 5 +++++ lib/lyx2lyx/LyX.py | 2 +- lib/lyx2lyx/lyx_1_5.py | 2 ++ src/Buffer.cpp | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 67aa63101b..d992e04a6e 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -1,5 +1,10 @@ LyX file-format changes ----------------------- +2007-06-13 Bo Peng + * format incremented to 272: convert listings to ERT because + earlier versions of lyx can not handle unrecognizable + listings parameters. + 2007-05-15 José Matos * format incremented to 271: extended textclasses accept the normal font sizes: 10, 11 and 12pt. diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 3974967cc5..0fbfe1fe95 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -77,7 +77,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" , 4)), - ("1_5", range(246,272), generate_minor_versions("1.5" , 0))] + ("1_5", range(246,273), 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 898b0b90e6..862f8fdff0 100644 --- a/lib/lyx2lyx/lyx_1_5.py +++ b/lib/lyx2lyx/lyx_1_5.py @@ -1688,9 +1688,11 @@ convert = [[246, []], [269, []], [270, []], [271, [convert_ext_font_sizes]] + [272, []], ] revert = [ + [271, [revert_preamble_listings_params, revert_listings_inset, revert_include_listings]], [270, [revert_ext_font_sizes]], [269, [revert_beamer_alert, revert_beamer_structure]], [268, [revert_preamble_listings_params, revert_listings_inset, revert_include_listings]], diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 15246e680d..d867193cde 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -142,7 +142,7 @@ using std::string; namespace { -int const LYX_FORMAT = 271; +int const LYX_FORMAT = 272; } // namespace anon -- 2.39.2