cnts.saveLastCounter();
}
Paragraph const & outer = it.paragraph();
- InsetLayout const & il = getLayout();
- docstring const & count = il.counter();
- if (!outer.layout().intitle && cnts.hasCounter(count)) {
- cnts.step(count, utype);
- custom_label_= translateIfPossible(il.labelstring())
- + ' ' + cnts.theCounter(count, outer.getParLanguage(bp)->code());
- setLabel(custom_label_);
+ if (!outer.layout().intitle) {
+ InsetLayout const & il = getLayout();
+ docstring const & count = il.counter();
+ custom_label_ = translateIfPossible(il.labelstring()) + ' ';
+ if (cnts.hasCounter(count))
+ cnts.step(count, utype);
+ custom_label_ +=
+ cnts.theCounter(count, outer.getParLanguage(bp)->code());
+ setLabel(custom_label_);
}
InsetCollapsable::updateBuffer(it, utype);
if (utype == OutputUpdate)
}
-void InsetFoot::addToToc(DocIterator const & cpit)
+void InsetFoot::addToToc(DocIterator const & cpit) const
{
DocIterator pit = cpit;
- pit.push_back(CursorSlice(*this));
+ pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
Toc & toc = buffer().tocBackend().toc("footnote");
- docstring str;
- str = custom_label_ + ": " + text().getPar(0).asString();
- toc.push_back(TocItem(pit, 0, str, toolTipText()));
+ docstring str = custom_label_ + ": ";
+ text().forToc(str, TOC_ENTRY_LENGTH);
+ toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
// Proceed with the rest of the inset.
InsetFootlike::addToToc(cpit);
}
}
-int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetFoot::latex(otexstream & os, OutputParams const & runparams_in) const
{
OutputParams runparams = runparams_in;
// footnotes in titling commands like \title have moving arguments
runparams.moving_arg |= runparams_in.intitle;
+ os << safebreakln;
+ if (runparams.lastid != -1)
+ os.texrow().start(runparams.lastid, runparams.lastpos);
+
// in titling commands, \thanks should be used instead of \footnote.
// some classes (e.g. memoir) do not understand \footnote.
if (runparams_in.intitle)
- os << "%\n\\thanks{";
+ os << "\\thanks{";
else
- os << "%\n\\footnote{";
+ os << "\\footnote{";
- int const i = InsetText::latex(os, runparams);
+ InsetText::latex(os, runparams);
os << "%\n}";
runparams_in.encoding = runparams.encoding;
-
- return i + 2;
}