#include <config.h>
#include "InsetFoot.h"
+#include "InsetBox.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "LaTeXFeatures.h"
#include "Layout.h"
#include "OutputParams.h"
+#include "output_docbook.h"
#include "ParIterator.h"
#include "TextClass.h"
#include "TocBackend.h"
namespace lyx {
InsetFoot::InsetFoot(Buffer * buf)
- : InsetFootlike(buf), intitle_(false)
+ : InsetFootlike(buf), intitle_(false), infloattable_(false)
{}
docstring InsetFoot::layoutName() const
{
- return intitle_ ? from_ascii("Foot:InTitle") : from_ascii("Foot");
+ if (intitle_)
+ return from_ascii("Foot:InTitle");
+ else if (infloattable_)
+ return from_ascii("Foot:InFloatTable");
+ return from_ascii("Foot");
}
-void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
BufferParams const & bp = buffer().masterBuffer()->params();
Counters & cnts = bp.documentClass().counters();
}
intitle_ = false;
- for (size_type sl = 0 ; sl < it.depth() ; ++ sl) {
+ infloattable_ = false;
+ bool intable = false;
+ if (it.innerInsetOfType(TABULAR_CODE) != 0)
+ intable = true;
+ if (it.innerInsetOfType(FLOAT_CODE) != 0)
+ infloattable_ = intable;
+ // If we are in a table in a float, but the table is also in a minipage,
+ // we do not use tablefootnote, since minipages provide their own footnotes.
+ if (intable && infloattable_ && it.innerInsetOfType(BOX_CODE) != 0) {
+ InsetBoxParams const & boxp =
+ static_cast<InsetBox*>(it.innerInsetOfType(BOX_CODE))->params();
+ if (boxp.inner_box && !boxp.use_parbox && !boxp.use_makebox)
+ infloattable_ = false;
+ }
+ for (size_type sl = 0 ; sl < it.depth() ; ++sl) {
if (it[sl].text() && it[sl].paragraph().layout().intitle) {
intitle_ = true;
break;
InsetLayout const & il = getLayout();
docstring const & count = il.counter();
custom_label_ = translateIfPossible(il.labelstring());
- if (cnts.hasCounter(count))
+
+ int val = cnts.value(count);
+ if (cnts.hasCounter(count)) {
cnts.step(count, utype);
- custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+ custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+ if (deleted)
+ // un-step after deleted counter
+ cnts.set(count, val);
+ } else
+ custom_label_ += ' ' + from_ascii("#");
setLabel(custom_label_);
- InsetCollapsible::updateBuffer(it, utype);
+ InsetCollapsible::updateBuffer(it, utype, deleted);
if (utype == OutputUpdate)
cnts.restoreLastCounter();
}
}
-int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetFoot::docbook(XMLStream & xs, OutputParams const & runparams) const
{
- os << "<footnote>";
- int const i = InsetText::docbook(os, runparams);
- os << "</footnote>";
-
- return i;
+ OutputParams rp = runparams;
+ rp.docbook_force_pars = true;
+ rp.docbook_in_par = false;
+ InsetText::docbook(xs, rp);
}
void InsetFoot::validate(LaTeXFeatures & features) const
{
- if (!features.saveNoteEnv().empty()) {
+ // Use footnote package to provide footnotes in tables
+ // unless an alternative approach is built in the class.
+ if (!features.saveNoteEnv().empty()
+ && !features.isProvided("footnote-alternative")) {
features.require("footnote");
features.addPreambleSnippet(
from_ascii("\\makesavenoteenv{"