From 82b0e98d549605b38c5666708707f21ebee151ed Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 25 Nov 2006 15:57:27 +0000 Subject: [PATCH] missing bits of the new insets for \clearpage and \cleardoublepage git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16038 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/FORMAT | 6 ++++++ lib/lyx2lyx/LyX.py | 2 +- lib/lyx2lyx/lyx_1_5.py | 8 ++++++-- src/buffer.C | 2 +- src/insets/insetpagebreak.h | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 9bd8bf8675..ebbad8e8b4 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -1,6 +1,12 @@ LyX file-format changes -----------------------ยง +2006-11-25 Georg Baum + + * format incremented to 255: new insets for \clearpage and + \cleardoublepage. They are written inline to the file, exactly like + \newpage. + 2006-11-13 Georg Baum * format incremented to 254: new header parameter \use_esint. diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 65ea344a83..c4881531b3 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,255), generate_minor_versions("1.5" , 0))] + ("1_5", range(246,256), 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 4e506eace6..bf4b6631e6 100644 --- a/lib/lyx2lyx/lyx_1_5.py +++ b/lib/lyx2lyx/lyx_1_5.py @@ -603,6 +603,7 @@ def revert_esint(document): if (use_esint == 2): document.preamble.append('\\usepackage{esint}') + def revert_clearpage(document): " clearpage -> ERT" i = 0 @@ -622,7 +623,8 @@ def revert_clearpage(document): '', '\\end_inset'] i = i + 1 - + + def revert_cleardoublepage(document): " cleardoublepage -> ERT" i = 0 @@ -643,6 +645,7 @@ def revert_cleardoublepage(document): '\\end_inset'] i = i + 1 + ## # Conversion hub # @@ -656,7 +659,8 @@ convert = [[246, []], [251, []], [252, [convert_commandparams, convert_bibitem]], [253, []], - [254, [convert_esint]]] + [254, [convert_esint]], + [255, []]] revert = [[254, [revert_clearpage, revert_cleardoublepage]], [253, [revert_esint]], diff --git a/src/buffer.C b/src/buffer.C index 538e94ee1a..818a18341c 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -143,7 +143,7 @@ using std::string; namespace { -int const LYX_FORMAT = 254; +int const LYX_FORMAT = 255; } // namespace anon diff --git a/src/insets/insetpagebreak.h b/src/insets/insetpagebreak.h index 3f4c78e469..7d5ec6139c 100644 --- a/src/insets/insetpagebreak.h +++ b/src/insets/insetpagebreak.h @@ -90,4 +90,4 @@ private: } // namespace lyx -#endif // INSET_NEWLINE_H +#endif // INSET_PAGEBREAK_H -- 2.39.5