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

diff --git a/development/FORMAT b/development/FORMAT
index 9bd8bf867526cd43da5c15e9d5bd8ee5e94d3c60..ebbad8e8b4038f685a48294c8da87895c5a48190 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,12 @@
 LyX file-format changes
 -----------------------§
 
+2006-11-25  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * 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  <Georg.Baum@post.rwth-aachen.de>
 
        * format incremented to 254: new header parameter \use_esint.

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 65ea344a83db3b39ffca99dc145302a3afbe1d7f..c4881531b3e4c6f14f8bf462c2b960d8cb1111d1 100644 (file)
--- 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 4e506eace68b925d655f5cfae7ee3e67234c7878..bf4b6631e6773eaa622cb36bbbf1b6e83fe6887f 100644 (file)
--- 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 538e94ee1ad167e7e40d1a3700a4a65576ca7590..818a18341cba8ed0b5ff08af67a7aafb37282008 100644 (file)
--- 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 3f4c78e469eef6e240c2035a0a8c459a4653e04b..7d5ec6139c920948a5b0715469364740b472b8f3 100644 (file)
--- 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