better fix for minipage conversion problem

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 05462081a6fa687149509e1124f5afc3d8dd56ea..20633b9e2851e5aad2b75bbbff74f22a70cfa698 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-26  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * buffer.C (parseSingleLyXformat2Token): a more general fix for
+       the minipage conversion problem.
+
 2001-07-26  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * buffer.C (parseSingleLyXformat2Token): check minipage if we

diff --git a/src/buffer.C b/src/buffer.C
index 5be67668d69eae1ef629c3c34f9bdc718e28d6ba..a5501c091a59816c552bd2b412ddcbde4a71730c 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -431,7 +431,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                        par->insertChar(pos, (*cit), font);
                        ++pos;
                }
-               checkminipage = true;
 #ifdef NO_LATEX
                }
 #endif
@@ -1041,9 +1040,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                // But insets should read it, it is a part of
                // the inset isn't it? Lgb.
        } else if (token == "\\begin_inset") {
-               // Does this fix it? YES!
-               checkminipage = true;
-               
 #ifdef NO_LATEX
                insertErtContents(par, pos, font, false);
                ert_stack.push(ert_comp);
@@ -1108,9 +1104,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                inset->read(this, lex);
                par->insertInset(pos, inset, font);
                ++pos;
-               // because of OLD_TABULAR_READ where tabulars have been
-               // one paragraph.
-               checkminipage = true;
        } else if (token == "\\hfill") {
                par->insertChar(pos, Paragraph::META_HFILL, font);
                ++pos;
@@ -1173,7 +1166,17 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                }
 #endif
        }
+
 #ifndef NO_PEXTRA_REALLY
+       // I wonder if we could use this blanket fix for all the
+       // checkminipage cases...
+       if (par && par->size()) {
+               // It is possible that this will check to often,
+               // but that should not be an correctness issue.
+               // Only a speed issue.
+               checkminipage = true;
+       }
+       
        // now check if we have a minipage paragraph as at this
        // point we already read all the necessary data!
        // this cannot be done in layout because there we did