Fix pdf format conversion

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index c24824c4eb143e942f0a1d5ff224ab772b87ca8c..5121d7263f66c42d5e8634d74a22fda8a694563e 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);
 }
@@ -325,7 +325,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 }
 
 
-int InsetFloat::latex(otexstream & 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)
@@ -339,10 +339,10 @@ int InsetFloat::latex(otexstream & 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;
@@ -372,35 +372,28 @@ int InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
                placement = buf_placement;
        }
 
-       // clear counter
-       os.countLines();
        // 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 lines = os.countLines();
 
-       lines += InsetText::latex(os, runparams);
+       InsetText::latex(os, runparams);
 
-       // clear counter
-       os.countLines();
        // Force \end{<floatname>} to appear in a new line.
        os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
-       lines += os.countLines();
-
-       return lines;
 }
 
 
-int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetFloat::plaintext(odocstringstream & os, OutputParams const & runparams, size_t max_length) const
 {
        os << '[' << buffer().B_("float") << ' '
                << floatName(params_.type) << ":\n";
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -477,6 +470,12 @@ void InsetFloat::setNewLabel()
 }
 
 
+bool InsetFloat::allowsCaptionVariation(std::string const & newtype) const
+{
+       return !params_.subfloat && newtype != "LongTableNoNumber";
+}
+
+
 docstring InsetFloat::getCaption(OutputParams const & runparams) const
 {
        if (paragraphs().empty())
@@ -486,11 +485,19 @@ docstring InsetFloat::getCaption(OutputParams const & runparams) const
        if (ins == 0)
                return docstring();
 
+       TexRow texrow;
        odocstringstream ods;
-       otexstream os(ods);
-       ins->getOptArg(os, runparams);
+       otexstream os(ods, texrow);
+       ins->getArgs(os, runparams);
        ods << '[';
-       ins->getArgument(os, 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();
 }