Better TOC output for XHTML, per Rob and Pavel.

[lyx.git] / src / insets / InsetPhantom.cpp

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index a3c57359985e5fa8d8404ff995097a3ff2246edc..9e3808f0e7ca38d1d9bc4f333fc5411ac3360145 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -126,7 +126,7 @@ InsetPhantom::~InsetPhantom()
 }
 
 
-docstring InsetPhantom::name() const 
+docstring InsetPhantom::layoutName() const
 {
        return from_ascii("Phantom:" + phantomtranslator().find(params_.type));
 }
@@ -154,7 +154,7 @@ void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
        ColorCode const origcol = pi.base.font.color();
        pi.base.font.setColor(Color_special);
        pi.base.font.setColor(origcol);
-       Dimension const dim = dimension(*pi.base.bv);
+       Dimension const dim = Inset::dimension(*pi.base.bv);
 
        if (params_.type == InsetPhantomParams::Phantom ||
                params_.type == InsetPhantomParams::VPhantom) {
@@ -259,7 +259,10 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                string2params(to_utf8(cmd.argument()), params_);
+               setButtonLabel();
+               cur.forceBufferUpdate();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -299,15 +302,12 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 docstring InsetPhantom::toolTip(BufferView const &, int, int) const
 {
-       docstring const tip = InsetText::toolTipText();
-       docstring res = phantomtranslator_loc().find(params_.type);
-       if (!tip.empty())
-               res += from_ascii(": ") + "\n" + tip;
-       return res;
+       docstring const res = phantomtranslator_loc().find(params_.type);
+       return toolTipText(res + from_ascii(": "));
 }
 
 
-int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) const
+void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const
 {
        if (params_.type == InsetPhantomParams::Phantom)
                os << "\\phantom{";
@@ -315,10 +315,8 @@ int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) const
                os << "\\hphantom{";
        else if (params_.type == InsetPhantomParams::VPhantom)
                os << "\\vphantom{";
-       int const i = InsetCollapsable::latex(os, runparams);
+       InsetCollapsable::latex(os, runparams);
        os << "}";
-
-       return i;
 }
 
 
@@ -360,7 +358,7 @@ docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const
        return docstring();
 }
 
-docstring InsetPhantom::contextMenu(BufferView const &, int, int) const
+docstring InsetPhantom::contextMenuName() const
 {
        return from_ascii("context-phantom");
 }