#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "Counters.h"
#include "Cursor.h"
#include "Dimension.h"
#include "Floating.h"
#include "FuncStatus.h"
#include "InsetList.h"
#include "Language.h"
+#include "LyXRC.h"
#include "MetricsInfo.h"
+#include "xml.h"
#include "output_latex.h"
#include "output_xhtml.h"
-#include "OutputParams.h"
#include "Paragraph.h"
#include "ParIterator.h"
#include "TexRow.h"
InsetCaption::InsetCaption(Buffer * buf, string const & type)
- : InsetText(buf, InsetText::PlainLayout),
- labelwidth_(0), is_subfloat_(false), type_(type)
+ : InsetText(buf, InsetText::PlainLayout),
+ labelwidth_(0), is_subfloat_(false), is_deleted_(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) 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);
}
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;
+ if (is_deleted_)
+ pi.base.font.setStrikeout(FONT_ON);
+ else if (isChanged() && lyxrc.ct_additions_underlined)
+ pi.base.font.setUnderbar(FONT_ON);
+ 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;
}
-int InsetCaption::docbook(odocstream & os,
- OutputParams const & runparams) const
+void InsetCaption::docbook(XMLStream &, OutputParams const &) const
{
- int ret;
- os << "<title>";
- ret = InsetText::docbook(os, runparams);
- os << "</title>\n";
- return ret;
+ // This function should never be called (rather InsetFloat::docbook, the titles should be skipped in floats).
}
-docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetCaption::xhtml(XMLStream & xs, OutputParams const & rp) const
{
if (rp.html_disable_captions)
return docstring();
else
attr = attr + " class='" + our_class + "'";
}
- xs << html::StartTag(tag, attr);
+ xs << xml::StartTag(tag, attr);
docstring def = getCaptionAsHTML(xs, rp);
- xs << html::EndTag(tag);
+ xs << xml::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();
}
-docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
+void InsetCaption::getCaptionAsDocBook(XMLStream & xs,
+ OutputParams const & runparams) const
+{
+ if (runparams.docbook_in_float)
+ return;
+
+ // Ignore full_label_, as the DocBook processor will deal with the numbering.
+ InsetText::XHTMLOptions opts = InsetText::WriteInnerTag;
+ InsetText::docbook(xs, runparams, opts);
+}
+
+
+docstring InsetCaption::getCaptionAsHTML(XMLStream & xs,
OutputParams const & runparams) const
{
xs << full_label_ << ' ';
}
-void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
Buffer const & master = *buffer().masterBuffer();
DocumentClass const & tclass = master.params().documentClass();
// counters are local to the caption
cnts.saveLastCounter();
}
+ is_deleted_ = deleted;
// Memorize type for addToToc().
floattype_ = type;
if (type.empty() || type == "senseless")
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);
docstring const labelstring = isAscii(lstring) ?
master.B_(to_ascii(lstring)) : lstring;
if (cnts.hasCounter(counter)) {
+ int val = cnts.value(counter);
// for longtables, we step the counter upstream
if (!cnts.isLongtable())
cnts.step(counter, utype);
sec = cnts.theCounter(counter, lang);
+ if (deleted && !cnts.isLongtable())
+ // un-step after deleted counter
+ cnts.set(counter, val);
}
if (labelstring != master.B_("standard")) {
if (!sec.empty())
}
// Do the real work now.
- InsetText::updateBuffer(it, utype);
+ InsetText::updateBuffer(it, utype, deleted);
if (utype == OutputUpdate)
cnts.restoreLastCounter();
}
projects / lyx.git / blobdiff