#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "Counters.h"
#include "Cursor.h"
#include "Dimension.h"
#include "Floating.h"
labelwidth_(0), is_subfloat_(false), type_(type)
{
setDrawFrame(true);
- setFrameColor(Color_collapsableframe);
+ setFrameColor(Color_collapsibleframe);
}
}
-void InsetCaption::setCustomLabel(docstring const & label)
-{
- custom_label_ = translateIfPossible(label);
-}
-
-
void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
UpdateType utype, TocBackend & backend) const
{
mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
// add some space to separate the label from the inset text
- labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
+ labelwidth_ += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);
dim.wid = labelwidth_;
Dimension textdim;
// Correct for button and label width
void InsetCaption::drawBackground(PainterInfo & pi, int x, int y) const
{
TextMetrics & tm = pi.base.bv->textMetrics(&text());
- int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
- int const yy = y - TEXT_TO_INSET_OFFSET - tm.ascent();
+ int const h = tm.height() + topOffset(pi.base.bv) + bottomOffset(pi.base.bv);
+ int const yy = y - topOffset(pi.base.bv) - tm.ascent();
pi.pain.fillRectangle(x, yy, labelwidth_, h, pi.backgroundColor(this));
}
FontInfo tmpfont = pi.base.font;
pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
- int const xx = x + TEXT_TO_INSET_OFFSET;
+ int const xx = x + leftOffset(pi.base.bv);
pi.pain.text(xx, y, full_label_, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y);
pi.base.font = tmpfont;
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 = buffer().masterParams().postpone_fragile_content;
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;
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);