Wrap rotated cells with linebreaks in varwidth

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

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index 9ec662fef14729cb149669dee07db263a902ce46..dbce804356bf29480b0a8abe5068e5d41612ae80 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -16,7 +16,6 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "Counters.h"
 #include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
@@ -28,6 +27,7 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "texstream.h"
 #include "TextClass.h"
 
 #include "support/docstream.h"
@@ -71,18 +71,20 @@ 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;
 }
 
-} // anon
+} // namespace
 
 
 InsetPhantomParams::InsetPhantomParams()
@@ -113,7 +115,7 @@ void InsetPhantomParams::read(Lexer & lex)
 /////////////////////////////////////////////////////////////////////
 
 InsetPhantom::InsetPhantom(Buffer * buf, string const & label)
-       : InsetCollapsable(buf)
+       : InsetCollapsible(buf)
 {
        setDrawFrame(false);
        params_.type = phantomtranslator().find(label);
@@ -126,29 +128,20 @@ InsetPhantom::~InsetPhantom()
 }
 
 
-docstring InsetPhantom::name() const 
+docstring InsetPhantom::layoutName() const
 {
        return from_ascii("Phantom:" + phantomtranslator().find(params_.type));
 }
 
 
-void InsetPhantom::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-       InsetCollapsable::metrics(mi, dim);
-
-       // cache the inset dimension
-       setDimCache(mi, dim);
-}
-
-
 void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
 {
        // draw the text
-       InsetCollapsable::draw(pi, x, y);
+       InsetCollapsible::draw(pi, x, y);
 
        // 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();
@@ -228,14 +221,14 @@ void InsetPhantom::draw(PainterInfo & pi, int x, int y) const
 void InsetPhantom::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(os);
+       InsetCollapsible::write(os);
 }
 
 
 void InsetPhantom::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(lex);
+       InsetCollapsible::read(lex);
 }
 
 
@@ -259,8 +252,10 @@ 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();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -268,7 +263,7 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCollapsible::doDispatch(cur, cmd);
                break;
        }
 }
@@ -293,7 +288,7 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 }
 
@@ -305,31 +300,48 @@ docstring InsetPhantom::toolTip(BufferView const &, int, int) const
 }
 
 
-int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) 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{";
-       int const i = InsetCollapsable::latex(os, runparams);
+               break;
+       default:
+               os << "\\phantom{";
+               break;
+       }
+       InsetCollapsible::latex(os, runparams);
        os << "}";
-
-       return i;
 }
 
 
-int InsetPhantom::plaintext(odocstream & 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") << ":";
-       InsetCollapsable::plaintext(os, runparams);
+               break;
+       default:
+               os << '[' << buffer().B_("phantom") << ":";
+               break;
+       }
+       InsetCollapsible::plaintext(os, runparams, max_length);
        os << "]";
 
        return PLAINTEXT_NEWLINE;
@@ -338,15 +350,17 @@ int InsetPhantom::plaintext(odocstream & 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);
+       int const i = InsetCollapsible::docbook(os, runparams);
        os << "</" + cmdname + ">";
 
        return i;
@@ -358,9 +372,9 @@ docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const
        return docstring();
 }
 
-docstring InsetPhantom::contextMenuName() const
+string InsetPhantom::contextMenuName() const
 {
-       return from_ascii("context-phantom");
+       return "context-phantom";
 }