begin cleanup slowly

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4185 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 3eef6f2b84c0beb0ce4367c57c4ee44aa694b3bb..cbdbb7e7defdb9fd5132f50ca17b7716e81c2c8d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+       * buffer.C: comment out some some code that depend upon lyx_format
+       < 220
+
+       * paragraph.h (NO_PEXTRA_REALLY): turn off all pextra
+       * ParagraphParameters.h (NO_PEXTRA_REALLY): ditto
+
+       * buffer.h (NO_COMPABILITY): turn off compability
+
        * ColorHandler.C: include scoped_array.hpp
 
        * font.C: Use more specific smart_ptr header.

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index 320235e86be3440e1ebc005d49cb5786e40b4358..de6b2c08948d72a1c0e91a624f6ff2701adc27d0 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -12,7 +12,7 @@
 #include "layout.h"
 
 // Not yet... lyx 1.3.x or so
-//#define NO_PEXTRA_REALLY 1
+#define NO_PEXTRA_REALLY 1
 
 #include "ParameterStruct.h"
 

diff --git a/src/buffer.C b/src/buffer.C
index 0f8d2601f0a0236a1678b4aba79c2cef22d090f4..5aee0fe97ee1eac3fd4c2d1b373b39e802a1aac9 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -330,8 +330,11 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
 
        Paragraph * first_par = 0;
        LyXFont font(LyXFont::ALL_INHERIT, params.language);
+
+#if 0
        if (file_format < 216 && params.language->lang() == "hebrew")
                font.setLanguage(default_language);
+#endif
 
        if (!par) {
                par = new Paragraph;
@@ -521,8 +524,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                // not ALL_INHERIT,document_language then it will be set to the
                // right values after this tag (Jug 20020420)
                font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+
+#if 0
                if (file_format < 216 && params.language->lang() == "hebrew")
                        font.setLanguage(default_language);
+#endif
 
                lex.eatLine();
                string layoutname = lex.getString();
@@ -1082,7 +1088,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                if (ert_comp.active && ert_comp.contents.empty()) {
                        ert_comp.font.setLanguage(font.language());
                }
-#endif                 
+#endif
        } else if (token == "\\numeric") {
                lex.next();
                font.setNumber(font.setLyXMisc(lex.getString()));
@@ -1697,13 +1703,21 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par)
                                                   _("Old LyX file format found. "
                                                     "Use LyX 0.10.x to read this!"));
                                        return false;
+                               } else if (file_format < 220) {
+                                       Alert::alert(_("ERROR!"),
+                                                    _("Old LyX file format found. "
+                                                      "User LyX 1.2.x to read this!"));
+                                       return false;
                                }
                        }
                        bool the_end = readLyXformat2(lex, par);
                        params.setPaperStuff();
+
+#if 0
                        // the_end was added in 213
                        if (file_format < 213)
                                the_end = true;
+#endif
 
                        if (!the_end) {
                                Alert::alert(_("Warning!"),

diff --git a/src/buffer.h b/src/buffer.h
index f18e03e6f884b8e508354e12fa56a209de5c3ad2..8c4e925e81cdf80d080ea6e3e7fb9b210f7a991f 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -35,7 +35,7 @@ class ParIterator;
 // When lyx 1.3.x starts we should enable this
 // btw. we should also test this with 1.2 so that we
 // do not get any surprises. (Lgb)
-//#define NO_COMPABILITY 1
+#define NO_COMPABILITY 1
 
 ///
 struct DEPCLEAN {

diff --git a/src/paragraph.h b/src/paragraph.h
index f6e437064ae313d7a18ea5d422e93b66c1e5933a..ecc95e4fab3d84bc98eca15f97091fb9a24c301f 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -33,7 +33,7 @@ class Language;
 // After 1.2.0 is released, during 1.3.0cvs, we enable this. And after
 // a while we verify that reading of 1.2.x files work perfectly we remove
 // this code completely. (Lgb)
-//#define NO_PEXTRA_REALLY 1
+#define NO_PEXTRA_REALLY 1
 
 // Define this if you want to try out the new storage container for
 // paragraphs. std::container instead of obfuscated homegrown