#include "insets/insetbibitem.h"
#include "insets/insetcaption.h"
#include "insets/insetinclude.h"
+#include "insets/insettabular.h"
#include "support/filetools.h"
#include "support/fs_extras.h"
}
-void setCaptionLabels(InsetBase & inset, Floating const & fl,
- Counters & counters)
+void setCaptionLabels(InsetBase & inset, string const & type,
+ docstring const label, Counters & counters)
{
LyXText * text = inset.getText(0);
if (!text)
if (pars.empty())
return;
- // FIXME UNICODE
- docstring const counter = from_ascii(fl.type());
- docstring const label = from_utf8(fl.name());
+ docstring const counter = from_ascii(type);
ParagraphList::iterator p = pars.begin();
for (; p != pars.end(); ++p) {
for (; it2 != end2; ++it2) {
InsetBase & icap = *it2->inset;
// Look deeper just in case.
- setCaptionLabels(icap, fl, counters);
+ setCaptionLabels(icap, type, label, counters);
if (icap.lyxCode() == InsetBase::CAPTION_CODE) {
// We found a caption!
counters.step(counter);
int number = counters.value(counter);
- static_cast<InsetCaption &>(icap).setCount(number);
- static_cast<InsetCaption &>(icap).setLabel(label);
+ InsetCaption & ic = static_cast<InsetCaption &>(icap);
+ ic.setType(type);
+ ic.setCount(number);
+ ic.setCustomLabel(label);
}
}
}
InsetList::iterator end = par.insetlist.end();
for (; it != end; ++it) {
InsetBase & inset = *it->inset;
- if (inset.lyxCode() != InsetBase::FLOAT_CODE
- && inset.lyxCode() != InsetBase::WRAP_CODE)
- continue;
+ if (inset.lyxCode() == InsetBase::FLOAT_CODE
+ || inset.lyxCode() == InsetBase::WRAP_CODE) {
+ docstring const & name = inset.getInsetName();
+ if (name.empty())
+ continue;
- docstring const & type = inset.getInsetName();
- if (type.empty())
- continue;
-
- Floating const & fl = textclass.floats().getType(to_ascii(type));
- setCaptionLabels(inset, fl, counters);
+ Floating const & fl = textclass.floats().getType(to_ascii(name));
+ // FIXME UNICODE
+ string const & type = fl.type();
+ docstring const label = from_utf8(fl.name());
+ setCaptionLabels(inset, type, label, counters);
+ }
+ else if (inset.lyxCode() == InsetBase::TABULAR_CODE
+ && static_cast<InsetTabular &>(inset).tabular.isLongTabular()) {
+ // FIXME: are "table" and "Table" the correct type and label?
+ setCaptionLabels(inset, "table", from_ascii("Table"), counters);
+ }
}
}
} else if (layout->labeltype == LABEL_SENSITIVE) {
// Search for the first float or wrap inset in the iterator
size_t i = it.depth();
- InsetBase * in;
+ InsetBase * in = 0;
while (i > 0) {
--i;
- in = &it[i].inset();
- if (in->lyxCode() == InsetBase::FLOAT_CODE
- || in->lyxCode() == InsetBase::WRAP_CODE)
+ InsetBase::Code const code = it[i].inset().lyxCode();
+ if (code == InsetBase::FLOAT_CODE ||
+ code == InsetBase::WRAP_CODE) {
+ in = &it[i].inset();
break;
+ }
}
- docstring const & type = in->getInsetName();
+ // FIXME Can getInsetName() return an empty name for wide or
+ // float insets? If not we can put the definition of type
+ // inside the if (in) clause and use that instead of
+ // if (!type.empty()).
+ docstring type;
+ if (in)
+ type = in->getInsetName();
if (!type.empty()) {
Floating const & fl = textclass.floats().getType(to_ascii(type));
}
}
- const_cast<Buffer &>(buf).tocBackend().update();
+ Buffer & cbuf = const_cast<Buffer &>(buf);
+ cbuf.tocBackend().update();
+ cbuf.structureChanged();
}
+void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
+{
+ if (par_it->layout()->labeltype == LABEL_COUNTER
+ && par_it->layout()->toclevel != LyXLayout::NOT_IN_TOC) {
+ buffer.tocBackend().updateItem(par_it);
+ buffer.structureChanged();
+ }
+}
+
} // namespace lyx