Fix bad cursor positioning when entering an inset

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

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index f7a9b45d9a732fa859c7be6cde82365c2ce23efb..c6efe9a9c93416ddce6259b38d22ac5d73357819 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -71,14 +71,16 @@ PhantomTranslatorLoc const init_phantomtranslator_loc()
 
 PhantomTranslator const & phantomtranslator()
 {
-       static PhantomTranslator translator = init_phantomtranslator();
+       static PhantomTranslator const translator =
+           init_phantomtranslator();
        return translator;
 }
 
 
 PhantomTranslatorLoc const & phantomtranslator_loc()
 {
-       static PhantomTranslatorLoc translator = init_phantomtranslator_loc();
+       static PhantomTranslatorLoc const translator =
+           init_phantomtranslator_loc();
        return translator;
 }
 
@@ -148,7 +150,7 @@ void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
 
        // draw the inset marker
        drawMarkers(pi, x, y);
-       
+
        // draw the arrow(s)
        static int const arrow_size = 4;
        ColorCode const origcol = pi.base.font.color();
@@ -259,7 +261,7 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
-               cur.recordUndoInset(ATOMIC_UNDO, this);
+               cur.recordUndoInset(this);
                string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                cur.forceBufferUpdate();
@@ -309,12 +311,23 @@ docstring InsetPhantom::toolTip(BufferView const &, int, int) const
 
 void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const
 {
-       if (params_.type == InsetPhantomParams::Phantom)
+       if (runparams.moving_arg)
+               os << "\\protect";
+
+       switch (params_.type) {
+       case InsetPhantomParams::Phantom:
                os << "\\phantom{";
-       else if (params_.type == InsetPhantomParams::HPhantom)
+               break;
+       case InsetPhantomParams::HPhantom:
                os << "\\hphantom{";
-       else if (params_.type == InsetPhantomParams::VPhantom)
+               break;
+       case InsetPhantomParams::VPhantom:
                os << "\\vphantom{";
+               break;
+       default:
+               os << "\\phantom{";
+               break;
+       }
        InsetCollapsable::latex(os, runparams);
        os << "}";
 }
@@ -323,12 +336,20 @@ void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const
 int InsetPhantom::plaintext(odocstringstream & os,
                            OutputParams const & runparams, size_t max_length) const
 {
-       if (params_.type == InsetPhantomParams::Phantom)
+       switch (params_.type) {
+       case InsetPhantomParams::Phantom:
                os << '[' << buffer().B_("phantom") << ":";
-       else if (params_.type == InsetPhantomParams::HPhantom)
+               break;
+       case InsetPhantomParams::HPhantom:
                os << '[' << buffer().B_("hphantom") << ":";
-       else if (params_.type == InsetPhantomParams::VPhantom)
+               break;
+       case InsetPhantomParams::VPhantom:
                os << '[' << buffer().B_("vphantom") << ":";
+               break;
+       default:
+               os << '[' << buffer().B_("phantom") << ":";
+               break;
+       }
        InsetCollapsable::plaintext(os, runparams, max_length);
        os << "]";
 
@@ -338,13 +359,15 @@ int InsetPhantom::plaintext(odocstringstream & os,
 
 int InsetPhantom::docbook(odocstream & os, OutputParams const & runparams) const
 {
-       string cmdname;
-       if (params_.type == InsetPhantomParams::Phantom)
-               cmdname = "phantom";
-       else if (params_.type == InsetPhantomParams::HPhantom)
-               cmdname = "phantom";
-       else if (params_.type == InsetPhantomParams::VPhantom)
-               cmdname = "phantom";
+       docstring cmdname;
+       switch (params_.type) {
+       case InsetPhantomParams::Phantom:
+       case InsetPhantomParams::HPhantom:
+       case InsetPhantomParams::VPhantom:
+       default:
+               cmdname = from_ascii("phantom");
+               break;
+       }
        os << "<" + cmdname + ">";
        int const i = InsetCollapsable::docbook(os, runparams);
        os << "</" + cmdname + ">";