mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
better the minipage compability a bit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1779 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
483458d6d4
commit
b69166bcc6
@ -1,5 +1,8 @@
|
||||
2001-03-15 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
|
||||
|
||||
* buffer.C: add compability for minipage alignment.
|
||||
(latexParagraphs): remove unwanted pextra check.
|
||||
|
||||
* several files: remove CXX_WORKING_NAMESPACES
|
||||
|
||||
* buffer.C (pop_tag): tie is in namespace boost
|
||||
|
@ -510,6 +510,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
|
||||
// we do want to use some of these
|
||||
// parameters to set options in the
|
||||
// minipage inset.
|
||||
InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
|
||||
LyXParagraph * tmp = minipar;
|
||||
while (tmp) {
|
||||
tmp->params.pextraType(0);
|
||||
@ -522,6 +523,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
|
||||
}
|
||||
|
||||
InsetMinipage * mini = new InsetMinipage;
|
||||
mini->pos(imp);
|
||||
mini->inset->par = minipar;
|
||||
// Insert the minipage last in the
|
||||
// previous paragraph.
|
||||
@ -564,6 +566,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
|
||||
// This is not quite correct yet since we
|
||||
// do want to use some of these parameters
|
||||
// to set options in the minipage inset.
|
||||
InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
|
||||
LyXParagraph * tmp = minipar;
|
||||
while (tmp) {
|
||||
tmp->params.pextraType(0);
|
||||
@ -576,6 +579,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
|
||||
}
|
||||
|
||||
InsetMinipage * mini = new InsetMinipage;
|
||||
mini->pos(imp);
|
||||
mini->inset->par = minipar;
|
||||
par->previous()->InsertInset(par->previous()->size(), mini);
|
||||
minipar = 0;
|
||||
@ -2309,7 +2313,10 @@ void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
|
||||
// flag this with ftcount
|
||||
ftcount = -1;
|
||||
if (layout.isEnvironment()
|
||||
|| par->params.pextraType() != LyXParagraph::PEXTRA_NONE) {
|
||||
#ifndef NEW_INSETS
|
||||
|| par->params.pextraType() != LyXParagraph::PEXTRA_NONE
|
||||
#endif
|
||||
) {
|
||||
par = par->TeXEnvironment(this, params, ofs, texrow
|
||||
#ifndef NEW_INSETS
|
||||
,ftnote, ft_texrow, ftcount
|
||||
|
@ -1,5 +1,8 @@
|
||||
2001-03-15 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
|
||||
|
||||
* insetminipage.h: change the order or Position to match
|
||||
LyXParagraph::MINIPAGE_ALIGNMENT
|
||||
|
||||
* several files: remvoe CXX_WORKING_NAMESPACES
|
||||
|
||||
* ExternalTemplate.h: noncopyable is in namespace boost
|
||||
|
@ -26,8 +26,8 @@ class InsetMinipage : public InsetCollapsable {
|
||||
public:
|
||||
///
|
||||
enum Position {
|
||||
center,
|
||||
top,
|
||||
center,
|
||||
bottom
|
||||
};
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user