}
-docstring InsetFloat::name() const
+docstring InsetFloat::layoutName() const
{
return "Float:" + from_utf8(params_.type);
}
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) {
// 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)
}
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;
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";
}
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();
}