#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"
InsetCaption::InsetCaption(Buffer * buf, string const & type)
: InsetText(buf, InsetText::PlainLayout),
- labelwidth_(0), is_subfloat_(false), type_(type)
+ labelwidth_(0), is_subfloat_(false), is_deleted_(false), type_(type)
{
setDrawFrame(true);
setFrameColor(Color_collapsibleframe);
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);
+ 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);
}
-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;
}
}
-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 const opts =
+ InsetText::WriteLabel | 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")
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();
}