InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 8ef61169083bbca3cfcef248dd4d7229e9ca153a..9cccee55c538ba30298928a203eaeae32d4539ee 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -12,7 +12,7 @@
 
 #include "InsetText.h"
 
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
 #include "buffer_funcs.h"
 #include "Buffer.h"
@@ -397,7 +397,7 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const
        }
        OutputParams rp = runparams;
        if (il.isPassThru())
-               rp.verbatim = true;
+               rp.pass_thru = true;
        if (il.isNeedProtect())
                rp.moving_arg = true;
 
@@ -405,6 +405,7 @@ int InsetText::latex(odocstream & os, OutputParams const & runparams) const
        TexRow texrow;
        latexParagraphs(buffer(), text_, os, texrow, rp);
        rows += texrow.rows();
+       runparams.encoding = rp.encoding;
 
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
@@ -699,12 +700,12 @@ void InsetText::addToToc(DocIterator const & cdit)
                        //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl;
                        inset.addToToc(dit);
                        switch (inset.lyxCode()) {
-                       case OPTARG_CODE: {
+                       case ARG_CODE: {
                                if (!tocstring.empty())
                                        break;
                                dit.pos() = 0;
                                Paragraph const & insetpar =
-                                       *static_cast<InsetOptArg&>(inset).paragraphs().begin();
+                                       *static_cast<InsetArgument&>(inset).paragraphs().begin();
                                if (!par.labelString().empty())
                                        tocstring = par.labelString() + ' ';
                                tocstring += insetpar.asString(AS_STR_INSETS);