Added Minipage-Dialog, small fix in LyXTabular::l_getline (removing \r).

[features.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 362c97391b3dea7fba1caac61e4d289255abbb0d..28f6059e033d2e3140dfdf6fe59f9bb4cad11e8b 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -512,6 +512,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                                        // parameters to set options in the
                                        // minipage inset.
                                        InsetMinipage::Position imp = static_cast<InsetMinipage::Position>(minipar->params.pextraAlignment());
+                                       string pextraWidth = minipar->params.pextraWidth();
+                                       string pextraWidthp = minipar->params.pextraWidthp();
+                                       bool pextraHfill = minipar->params.pextraHfill();
                                        LyXParagraph * tmp = minipar;
                                        while (tmp) {
                                                tmp->params.pextraType(0);
@@ -525,10 +528,13 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                                        
                                        InsetMinipage * mini = new InsetMinipage;
                                        mini->pos(imp);
+                                       mini->width(pextraWidth);
+                                       mini->widthp(pextraWidthp);
                                        mini->inset->par = minipar;
                                        // Insert the minipage last in the
                                        // previous paragraph.
                                        par->previous()->InsertInset(par->previous()->size(), mini);
+#warning insert a hfill-character here if pextraHfill == true
                                        minipar = par;
                                } else {
                                        lyxerr << "new minipage par" << endl;
@@ -568,6 +574,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                                // 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());
+                               string pextraWidth = minipar->params.pextraWidth();
+                               string pextraWidthp = minipar->params.pextraWidthp();
+                               bool pextraHfill = minipar->params.pextraHfill();
                                LyXParagraph * tmp = minipar;
                                while (tmp) {
                                        tmp->params.pextraType(0);
@@ -581,8 +590,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                                
                                InsetMinipage * mini = new InsetMinipage;
                                mini->pos(imp);
+                               mini->width(pextraWidth);
+                               mini->widthp(pextraWidthp);
                                mini->inset->par = minipar;
                                par->previous()->InsertInset(par->previous()->size(), mini);
+#warning insert a hfill-character here if pextraHfill == true
                                minipar = 0;
                        } else if (par->params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE) {