anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better the minipage compability a bit

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1779 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-03-15 19:03:46 +00:00
parent 483458d6d4
commit b69166bcc6
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2001-03-15 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com> 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 * several files: remove CXX_WORKING_NAMESPACES
* buffer.C (pop_tag): tie is in namespace boost * buffer.C (pop_tag): tie is in namespace boost

9
src/buffer.C
View File

@ -510,6 +510,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
// we do want to use some of these // we do want to use some of these
// parameters to set options in the // parameters to set options in the
// minipage inset. // minipage inset.
InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
LyXParagraph * tmp = minipar; LyXParagraph * tmp = minipar;
while (tmp) { while (tmp) {
tmp->params.pextraType(0); tmp->params.pextraType(0);
@ -522,6 +523,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
} }
InsetMinipage * mini = new InsetMinipage; InsetMinipage * mini = new InsetMinipage;
mini->pos(imp);
mini->inset->par = minipar; mini->inset->par = minipar;
// Insert the minipage last in the // Insert the minipage last in the
// previous paragraph. // previous paragraph.
@ -564,6 +566,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
// This is not quite correct yet since we // This is not quite correct yet since we
// do want to use some of these parameters // do want to use some of these parameters
// to set options in the minipage inset. // to set options in the minipage inset.
InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
LyXParagraph * tmp = minipar; LyXParagraph * tmp = minipar;
while (tmp) { while (tmp) {
tmp->params.pextraType(0); tmp->params.pextraType(0);
@ -576,6 +579,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
} }
InsetMinipage * mini = new InsetMinipage; InsetMinipage * mini = new InsetMinipage;
mini->pos(imp);
mini->inset->par = minipar; mini->inset->par = minipar;
par->previous()->InsertInset(par->previous()->size(), mini); par->previous()->InsertInset(par->previous()->size(), mini);
minipar = 0; minipar = 0;
@ -2309,7 +2313,10 @@ void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
// flag this with ftcount // flag this with ftcount
ftcount = -1; ftcount = -1;
if (layout.isEnvironment() 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 par = par->TeXEnvironment(this, params, ofs, texrow
#ifndef NEW_INSETS #ifndef NEW_INSETS
,ftnote, ft_texrow, ftcount ,ftnote, ft_texrow, ftcount

3
src/insets/ChangeLog
View File

@ -1,5 +1,8 @@
2001-03-15 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com> 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 * several files: remvoe CXX_WORKING_NAMESPACES
* ExternalTemplate.h: noncopyable is in namespace boost * ExternalTemplate.h: noncopyable is in namespace boost

2
src/insets/insetminipage.h
View File

@ -26,8 +26,8 @@ class InsetMinipage : public InsetCollapsable {
public: public:
/// ///
enum Position { enum Position {
center,
top, top,
center,
bottom bottom
}; };
/// ///