Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 5e5c79c3d9486eaa719c777f3fa030276f0c9031..99d6c43402dd73f7d23380eeb678f604dfa5b8da 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -119,7 +119,7 @@ InsetFloat::InsetFloat(Buffer * buf, string params_str)
 }
 
 
-docstring InsetFloat::name() const 
+docstring InsetFloat::layoutName() const
 { 
        return "Float:" + from_utf8(params_.type);
 }
@@ -127,8 +127,8 @@ docstring InsetFloat::name() const
 
 docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 {
-       if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen(bv))
-               return docstring();
+       if (isOpen(bv))
+               return InsetCollapsable::toolTip(bv, x, y);
 
        OutputParams rp(&buffer().params().encoding());
        return getCaptionText(rp);
@@ -142,6 +142,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_MODIFY: {
                InsetFloatParams params;
                string2params(to_utf8(cmd.argument()), params);
+               cur.recordUndoInset(ATOMIC_UNDO, this);
 
                // placement, wide and sideways are not used for subfloats
                if (!params_.subfloat) {
@@ -152,8 +153,11 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
                setNewLabel();
                if (params_.type != params.type) {
                        params_.type = params.type;
-                       buffer().updateBuffer();
+                       cur.forceBufferUpdate();
                }
+               // what we really want here is a TOC update, but that means
+               // a full buffer update
+               cur.forceBufferUpdate();
                break;
        }
 
@@ -316,12 +320,12 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
                // we can write to the stream.
                // Note that things will already have been escaped, so we do not 
                // want to escape them again.
-               xs << XHTMLStream::NextRaw() << ods.str();
+               xs << XHTMLStream::ESCAPE_NONE << ods.str();
        return deferred;
 }
 
 
-int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        if (runparams_in.inFloat != OutputParams::NONFLOAT) {
                if (runparams_in.moving_arg)
@@ -335,10 +339,10 @@ int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
                }
                os << '{';
                rp.inFloat = OutputParams::SUBFLOAT;
-               int const i = InsetText::latex(os, rp);
+               InsetText::latex(os, rp);
                os << "}";
        
-               return i + 1;
+               return;
        }
        OutputParams runparams(runparams_in);
        runparams.inFloat = OutputParams::MAINFLOAT;
@@ -368,24 +372,20 @@ int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
                placement = buf_placement;
        }
 
-       // The \n is used to force \begin{<floatname>} to appear in a new line.
-       // The % is needed to prevent two consecutive \n chars in the case
-       // when the current output line is empty.
-       os << "%\n\\begin{" << from_ascii(tmptype) << '}';
+       // Force \begin{<floatname>} to appear in a new line.
+       os << breakln << "\\begin{" << from_ascii(tmptype) << '}';
+       if (runparams.lastid != -1)
+               os.texrow().start(runparams.lastid, runparams.lastpos);
        // We only output placement if different from the def_placement.
        // sidewaysfloats always use their own page
-       if (!placement.empty() && !params_.sideways) {
+       if (!placement.empty() && !params_.sideways)
                os << '[' << from_ascii(placement) << ']';
-       }
        os << '\n';
 
-       int const i = InsetText::latex(os, runparams);
-
-       // The \n is used to force \end{<floatname>} to appear in a new line.
-       // In this case, we do not case if the current output line is empty.
-       os << "\n\\end{" << from_ascii(tmptype) << "}\n";
+       InsetText::latex(os, runparams);
 
-       return i + 4;
+       // Force \end{<floatname>} to appear in a new line.
+       os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
 }
 
 
@@ -479,10 +479,19 @@ docstring InsetFloat::getCaption(OutputParams const & runparams) const
        if (ins == 0)
                return docstring();
 
+       TexRow texrow;
        odocstringstream ods;
-       ins->getOptArg(ods, runparams);
+       otexstream os(ods, texrow);
+       ins->getOptArg(os, runparams);
        ods << '[';
-       ins->getArgument(ods, runparams);
+       odocstringstream odss;
+       otexstream oss(odss, texrow);
+       ins->getArgument(oss, runparams);
+       docstring arg = odss.str();
+       // Protect ']'
+       if (arg.find(']') != docstring::npos)
+               arg = '{' + arg + '}';
+       ods << arg;
        ods << ']';
        return ods.str();
 }