anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better fix for minipage conversion problem

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2351 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-07-25 22:25:48 +00:00
parent ba4be915d3
commit a853f5850b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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

17
src/buffer.C
View File

@ -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