Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 2c5db8d3ae1b4ea401da11446091f8c40cf43ac4..f7c10d35b371d5ce1e6512f4868bafd1770bc684 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -63,16 +63,16 @@ InsetERT::InsetERT(BufferParams const & bp, bool collapsed)
 }
 
 
-InsetERT::InsetERT(InsetERT const & in, bool same_id)
-       : InsetCollapsable(in, same_id), status_(in.status_)
+InsetERT::InsetERT(InsetERT const & in)
+       : InsetCollapsable(in), status_(in.status_)
 {
        init();
 }
 
 
-Inset * InsetERT::clone(Buffer const &, bool same_id) const
+Inset * InsetERT::clone() const
 {
-       return new InsetERT(*const_cast<InsetERT *>(this), same_id);
+       return new InsetERT(*this);
 }
 
 
@@ -306,7 +306,7 @@ bool InsetERT::lfunMouseRelease(FuncRequest const & cmd)
                if (status_ == Inlined)
                        inset.localDispatch(cmd1);
                else if (!collapsed_ && (cmd.y > button_bottom_y)) {
-                       cmd1.y -= ascent_collapsed() + descent_collapsed();
+                       cmd1.y -= height_collapsed();
                        inset.localDispatch(cmd1);
                }
        }
@@ -323,8 +323,8 @@ void InsetERT::lfunMouseMotion(FuncRequest const & cmd)
 }
 
 
-int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
-                   bool /*free_spc*/) const
+int InsetERT::latex(Buffer const *, ostream & os,
+                   LatexRunParams const &) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();
@@ -552,37 +552,18 @@ bool InsetERT::checkInsertChar(LyXFont & /* font */)
 }
 
 
-int InsetERT::ascent(BufferView * bv, LyXFont const & font) const
+void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (!inlined())
-               return InsetCollapsable::ascent(bv, font);
-
-       return inset.ascent(bv, font);
-}
-
-
-int InsetERT::descent(BufferView * bv, LyXFont const & font) const
-{
-       if (!inlined())
-               return InsetCollapsable::descent(bv, font);
-
-       return inset.descent(bv, font);
-}
-
-
-int InsetERT::width(BufferView * bv, LyXFont const & font) const
-{
-       if (!inlined())
-               return InsetCollapsable::width(bv, font);
-
-       return inset.width(bv, font);
+       if (inlined())
+               inset.metrics(mi, dim);
+       else
+               InsetCollapsable::metrics(mi, dim);
 }
 
 
-void InsetERT::draw(BufferView * bv, LyXFont const & f,
-                   int baseline, float & x) const
+void InsetERT::draw(PainterInfo & pi, int x, int y) const
 {
-       InsetCollapsable::draw(bv, f, baseline, x, inlined());
+       InsetCollapsable::draw(pi, x, y, inlined());
 }