mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 15:01:58 +00:00
Fix reading of old minipages.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4089 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6e9d0f861c
commit
88a039737d
@ -1,3 +1,8 @@
|
||||
2002-04-29 Dekel Tsur <dekelts@tau.ac.il>
|
||||
|
||||
* buffer.C (parseSingleLyXformat2Token): Fix reading of old format
|
||||
minipages: use col% instead of p%, and also use the current font.
|
||||
|
||||
2002-04-28 Dekel Tsur <dekelts@tau.ac.il>
|
||||
|
||||
* BufferView_pimpl.C (Dispatch): Check that float type exists when
|
||||
|
14
src/buffer.C
14
src/buffer.C
@ -1277,7 +1277,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
|
||||
mini->pageWidth(LyXLength(par->params().pextraWidth()));
|
||||
if (!par->params().pextraWidthp().empty()) {
|
||||
lyxerr << "WP:" << mini->pageWidth().asString() << endl;
|
||||
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%"));
|
||||
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
|
||||
}
|
||||
Paragraph * op = mini->firstParagraph();
|
||||
mini->inset.paragraph(par);
|
||||
@ -1293,10 +1293,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
|
||||
// previous paragraph.
|
||||
if (par->params().pextraHfill()) {
|
||||
parBeforeMinipage->insertChar
|
||||
(parBeforeMinipage->size(), Paragraph::META_HFILL);
|
||||
(parBeforeMinipage->size(),
|
||||
Paragraph::META_HFILL, font);
|
||||
}
|
||||
parBeforeMinipage->insertInset
|
||||
(parBeforeMinipage->size(), mini);
|
||||
(parBeforeMinipage->size(), mini, font);
|
||||
|
||||
minipar = par;
|
||||
} else {
|
||||
@ -1358,7 +1359,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
|
||||
mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
|
||||
if (!par->params().pextraWidthp().empty()) {
|
||||
lyxerr << "WP:" << mini->pageWidth().asString() << endl;
|
||||
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%"));
|
||||
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
|
||||
}
|
||||
|
||||
Paragraph * op = mini->firstParagraph();
|
||||
@ -1376,10 +1377,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
|
||||
// previous paragraph.
|
||||
if (minipar->params().pextraHfill()) {
|
||||
parBeforeMinipage->insertChar
|
||||
(parBeforeMinipage->size(),Paragraph::META_HFILL);
|
||||
(parBeforeMinipage->size(),
|
||||
Paragraph::META_HFILL, font);
|
||||
}
|
||||
parBeforeMinipage->insertInset
|
||||
(parBeforeMinipage->size(), mini);
|
||||
(parBeforeMinipage->size(), mini, font);
|
||||
}
|
||||
}
|
||||
// End of pextra_minipage compability
|
||||
|
Loading…
Reference in New Issue
Block a user