anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix reading of old minipages.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4089 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2002-04-29 17:10:22 +00:00
parent 6e9d0f861c
commit 88a039737d
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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> 2002-04-28 Dekel Tsur <dekelts@tau.ac.il>
* BufferView_pimpl.C (Dispatch): Check that float type exists when * BufferView_pimpl.C (Dispatch): Check that float type exists when

14
src/buffer.C
View File

@ -1277,7 +1277,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
mini->pageWidth(LyXLength(par->params().pextraWidth())); mini->pageWidth(LyXLength(par->params().pextraWidth()));
if (!par->params().pextraWidthp().empty()) { if (!par->params().pextraWidthp().empty()) {
lyxerr << "WP:" << mini->pageWidth().asString() << endl; lyxerr << "WP:" << mini->pageWidth().asString() << endl;
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
} }
Paragraph * op = mini->firstParagraph(); Paragraph * op = mini->firstParagraph();
mini->inset.paragraph(par); mini->inset.paragraph(par);
@ -1293,10 +1293,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
// previous paragraph. // previous paragraph.
if (par->params().pextraHfill()) { if (par->params().pextraHfill()) {
parBeforeMinipage->insertChar parBeforeMinipage->insertChar
(parBeforeMinipage->size(), Paragraph::META_HFILL); (parBeforeMinipage->size(),
Paragraph::META_HFILL, font);
} }
parBeforeMinipage->insertInset parBeforeMinipage->insertInset
(parBeforeMinipage->size(), mini); (parBeforeMinipage->size(), mini, font);
minipar = par; minipar = par;
} else { } else {
@ -1358,7 +1359,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
mini->pageWidth(LyXLength(minipar->params().pextraWidth())); mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
if (!par->params().pextraWidthp().empty()) { if (!par->params().pextraWidthp().empty()) {
lyxerr << "WP:" << mini->pageWidth().asString() << endl; lyxerr << "WP:" << mini->pageWidth().asString() << endl;
mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
} }
Paragraph * op = mini->firstParagraph(); Paragraph * op = mini->firstParagraph();
@ -1376,10 +1377,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
// previous paragraph. // previous paragraph.
if (minipar->params().pextraHfill()) { if (minipar->params().pextraHfill()) {
parBeforeMinipage->insertChar parBeforeMinipage->insertChar
(parBeforeMinipage->size(),Paragraph::META_HFILL); (parBeforeMinipage->size(),
Paragraph::META_HFILL, font);
} }
parBeforeMinipage->insertInset parBeforeMinipage->insertInset
(parBeforeMinipage->size(), mini); (parBeforeMinipage->size(), mini, font);
} }
} }
// End of pextra_minipage compability // End of pextra_minipage compability