#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "Counters.h"
#include "Cursor.h"
#include "Dimension.h"
#include "Floating.h"
InsetCaption::InsetCaption(Buffer * buf, string const & type)
- : InsetText(buf, InsetText::PlainLayout),
+ : InsetText(buf, InsetText::PlainLayout),
labelwidth_(0), is_subfloat_(false), type_(type)
{
setDrawFrame(true);
- setFrameColor(Color_collapsableframe);
+ setFrameColor(Color_collapsibleframe);
}
void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
- UpdateType utype) const
+ UpdateType utype, TocBackend & backend) const
{
string const & type = floattype_.empty() ? "senseless" : floattype_;
DocIterator pit = cpit;
str = full_label_;
text().forOutliner(str, length);
}
- buffer().tocBackend().builder(type).captionItem(pit, str, output_active);
+ backend.builder(type).captionItem(pit, str, output_active);
// Proceed with the rest of the inset.
- InsetText::addToToc(cpit, output_active, utype);
+ InsetText::addToToc(cpit, output_active, utype, backend);
}
break;
}
}
+ // no "changetype":
+ // fall through
default:
InsetText::doDispatch(cur, cmd);
// \caption{...}, later we will make it take advantage
// of the one of the caption packages. (Lgb)
OutputParams runparams = runparams_in;
+ // Some fragile commands (labels, index entries)
+ // are output after the caption (#2154)
+ runparams.postpone_fragile_stuff = true;
InsetText::latex(os, runparams);
+ if (!runparams.post_macro.empty()) {
+ // Output the stored fragile commands (labels, indices etc.)
+ // that need to be output after the caption.
+ os << runparams.post_macro;
+ runparams.post_macro.clear();
+ }
// Backwards compatibility: We always had a linebreak after
// the caption (see #8514)
os << breakln;
}
-docstring InsetCaption::xhtml(XHTMLStream &, OutputParams const & rp) const
+docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
if (rp.html_disable_captions)
return docstring();
else
attr = attr + " class='" + our_class + "'";
}
- odocstringstream ods;
- XHTMLStream ourxs(ods);
- ourxs << html::StartTag(tag, attr) << html::CR();
- docstring def = getCaptionAsHTML(ourxs, rp);
- ourxs << html::EndTag(tag) << html::CR();
- if (!def.empty())
- return ods.str() + "\n" + def;
- return ods.str();
+ xs << html::StartTag(tag, attr);
+ docstring def = getCaptionAsHTML(xs, rp);
+ xs << html::EndTag(tag);
+ return def;
}
if (!il.leftdelim().empty())
os << il.leftdelim();
-
+
OutputParams rp = runparams;
if (isPassThru())
rp.pass_thru = true;
if (il.isNeedProtect())
rp.moving_arg = true;
+ if (il.isNeedMBoxProtect())
+ ++rp.inulemcmd;
rp.par_begin = 0;
rp.par_end = paragraphs().size();
else
name = master.B_(tclass.floats().getType(type).name());
docstring counter = from_utf8(type);
- if ((is_subfloat_ = cnts.isSubfloat())) {
+ is_subfloat_ = cnts.isSubfloat();
+ if (is_subfloat_) {
// only standard captions allowed in subfloats
type_ = "Standard";
counter = "sub-" + from_utf8(type);