Clean up InsetGraphics::Cache and rename as GraphicsInset.

[lyx.git] / src / insets / insetminipage.C

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 3cbe2514bcdd08dced3f79adb74428b469c2b400..f7cd3b4e7b3c30a45212dcd35158244ebfae049d 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -88,14 +88,14 @@ InsetMinipage::InsetMinipage(BufferParams const & bp)
 }
 
 
-InsetMinipage::InsetMinipage(InsetMinipage const & in, bool same_id)
-       : InsetCollapsable(in, same_id), params_(in.params_)
+InsetMinipage::InsetMinipage(InsetMinipage const & in)
+       : InsetCollapsable(in), params_(in.params_)
 {}
 
 
-Inset * InsetMinipage::clone(Buffer const &, bool same_id) const
+Inset * InsetMinipage::clone() const
 {
-       return new InsetMinipage(*const_cast<InsetMinipage *>(this), same_id);
+       return new InsetMinipage(*this);
 }
 
 
@@ -127,7 +127,7 @@ dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd)
                return DISPATCHED;
        }
 
-       case LFUN_INSET_DIALOG_UPDATE: 
+       case LFUN_INSET_DIALOG_UPDATE:
                InsetMinipageMailer(*this).updateDialog(cmd.view());
                return DISPATCHED;
 
@@ -218,28 +218,28 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-void InsetMinipage::dimension(BufferView * bv, LyXFont const & font,
-       Dimension & dim) const
+void InsetMinipage::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (collapsed_)
                dimension_collapsed(dim);
        else {
                Dimension d;
-               InsetCollapsable::dimension(bv, font, dim);
+               InsetCollapsable::metrics(mi, d);
                switch (params_.pos) {
                case top:
-                       dim.a = d.a;
-                       dim.d = d.d;
+                       dim.asc = d.asc;
+                       dim.des = d.des;
                        break;
                case center:
-                       dim.a = d.height() / 2;
-                       dim.d = dim.a;
+                       dim.asc = d.ascent() + d.descent() / 2;
+                       dim.des = dim.asc;
                        break;
                case bottom:
-                       dim.a = d.d;
-                       dim.d = d.a;
+                       dim.asc = d.des;
+                       dim.des = d.asc;
                        break;
                }
+               dim.wid = d.wid;
        }
 }
 
@@ -250,8 +250,8 @@ string const InsetMinipage::editMessage() const
 }
 
 
-int InsetMinipage::latex(Buffer const * buf, ostream & os, LatexRunParams const & runparams,
-                        bool fragile, bool fp) const
+int InsetMinipage::latex(Buffer const * buf, ostream & os,
+                        LatexRunParams const & runparams) const
 {
        string s_pos;
        switch (params_.pos) {
@@ -268,7 +268,7 @@ int InsetMinipage::latex(Buffer const * buf, ostream & os, LatexRunParams const
        os << "\\begin{minipage}[" << s_pos << "]{"
           << params_.width.asLatexString() << "}%\n";
 
-       int i = inset.latex(buf, os, runparams, fragile, fp);
+       int i = inset.latex(buf, os, runparams);
 
        os << "\\end{minipage}%\n";
        return i + 2;
@@ -277,7 +277,7 @@ int InsetMinipage::latex(Buffer const * buf, ostream & os, LatexRunParams const
 
 bool InsetMinipage::insetAllowed(Inset::Code code) const
 {
-       if ((code == Inset::FLOAT_CODE) || (code == Inset::MARGIN_CODE))
+       if (code == Inset::FLOAT_CODE || code == Inset::MARGIN_CODE)
                return false;
 
        return InsetCollapsable::insetAllowed(code);
@@ -349,7 +349,7 @@ void InsetMinipageMailer::string2params(string const & in,
 
        if (in.empty())
                return;
-       
+
        istringstream data(STRCONV(in));
        LyXLex lex(0,0);
        lex.setStream(data);