Rename LatexRunParams::fragile as moving_arg.

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 62fedfe989946ffaf01b5deb91bdb5374dfa704f..aae3d97142c108431c3ada9752ba2b5c2ee4169e 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -266,22 +266,6 @@ void InsetERT::updateStatus(BufferView * bv, bool swap) const
        }
 }
 
-void InsetERT::edit(BufferView * bv, int x, int y, mouse_button::state button)
-{
-       if (button == mouse_button::button3)
-               return;
-
-       if (status_ == Inlined) {
-               if (!bv->lockInset(this))
-                       return;
-               inset.edit(bv, x, y, button);
-       } else {
-               InsetCollapsable::edit(bv, x, y, button);
-       }
-       set_latex_font(bv);
-       updateStatus(bv);
-}
-
 
 Inset::EDITABLE InsetERT::editable() const
 {
@@ -291,14 +275,6 @@ Inset::EDITABLE InsetERT::editable() const
 }
 
 
-void InsetERT::edit(BufferView * bv, bool front)
-{
-       InsetCollapsable::edit(bv, front);
-       updateStatus(0);
-       set_latex_font(bv);
-}
-
-
 void InsetERT::lfunMousePress(FuncRequest const & cmd)
 {
        if (status_ == Inlined)
@@ -330,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);
                }
        }
@@ -347,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();
@@ -449,6 +425,21 @@ Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
        }
 
        switch (cmd.action) {
+
+       case LFUN_INSET_EDIT:
+               if (cmd.button() == mouse_button::button3)
+                       break;
+               if (status_ == Inlined) {
+                       if (!bv->lockInset(this))
+                               break;
+                       result = inset.localDispatch(cmd);
+               } else {
+                       result = InsetCollapsable::localDispatch(cmd);
+               }
+               set_latex_font(bv);
+               updateStatus(bv);
+               break;
+
        case LFUN_INSET_MODIFY: {
                InsetERT::ERTStatus status_;
                InsetERTMailer::string2params(cmd.argument, status_);
@@ -561,30 +552,13 @@ bool InsetERT::checkInsertChar(LyXFont & /* font */)
 }
 
 
-int InsetERT::ascent(BufferView * bv, LyXFont const & font) const
-{
-       if (!inlined())
-               return InsetCollapsable::ascent(bv, font);
-
-       return inset.ascent(bv, font);
-}
-
-
-int InsetERT::descent(BufferView * bv, LyXFont const & font) const
+void InsetERT::dimension(BufferView * bv, LyXFont const & font,
+       Dimension & dim) 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.dimension(bv, font, dim);
+       else
+               InsetCollapsable::dimension(bv, font, dim);
 }