From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Wed, 25 Jul 2001 22:25:48 +0000 (+0000)
Subject: better fix for minipage conversion problem
X-Git-Tag: 1.6.10~20994
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a853f5850b5cde8bae6085d34d43e8f0b9191ecc;p=features.git

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 05462081a6..20633b9e28 100644
--- 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 5be67668d6..a5501c091a 100644
--- 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