#include "gettext.h"
#include "Language.h"
#include "LaTeX.h"
-#include "LyXTextClass.h"
+#include "TextClass.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphList.h"
void setCaptionLabels(Inset & inset, string const & type,
docstring const label, Counters & counters)
{
- LyXText * text = inset.getText(0);
+ Text * text = inset.getText(0);
if (!text)
return;
setCaptionLabels(icap, type, label, counters);
if (icap.lyxCode() == Inset::CAPTION_CODE) {
// We found a caption!
- counters.step(counter);
+ counters.step(counter);
int number = counters.value(counter);
InsetCaption & ic = static_cast<InsetCaption &>(icap);
ic.setType(type);
}
-void setCaptions(Paragraph & par, LyXTextClass const & textclass)
+void setCaptions(Paragraph & par, TextClass const & textclass)
{
if (par.insetlist.empty())
return;
InsetList::iterator end = par.insetlist.end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- if (inset.lyxCode() == Inset::FLOAT_CODE
+ if (inset.lyxCode() == Inset::FLOAT_CODE
|| inset.lyxCode() == Inset::WRAP_CODE) {
- docstring const & name = inset.insetName();
+ docstring const name = inset.name();
if (name.empty())
continue;
// FIXME: are "table" and "Table" the correct type and label?
setCaptionLabels(inset, "table", from_ascii("Table"), counters);
}
+ else if (inset.lyxCode() == Inset::LISTINGS_CODE)
+ setCaptionLabels(inset, "listing", from_ascii("Listing"), counters);
+ else if (inset.lyxCode() == Inset::INCLUDE_CODE)
+ // if this include inset contains lstinputlisting, and has a caption
+ // it will increase the 'listing' counter by one
+ static_cast<InsetInclude &>(inset).updateCounter(counters);
}
}
// set the label of a paragraph. This includes the counters.
-void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass)
+void setLabel(Buffer const & buf, ParIterator & it, TextClass const & textclass)
{
Paragraph & par = *it;
Layout_ptr const & layout = par.layout();
break;
}
}
- // FIXME Can insetName() return an empty name for wide or
+ // FIXME Can Inset::name() 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->insetName();
+ type = in->name();
if (!type.empty()) {
Floating const & fl = textclass.floats().getType(to_ascii(type));
if (it == par_iterator_end(buf.inset()))
return false;
-// if (it.lastpit == 0 && LyXText::isMainText(buf))
+// if (it.lastpit == 0 && Text::isMainText(buf))
// return false;
switch (it->layout()->labeltype) {
case LABEL_CENTERED_TOP_ENVIRONMENT:
case LABEL_STATIC:
case LABEL_ITEMIZE:
- setLabel(buf, it, buf.params().getLyXTextClass());
+ setLabel(buf, it, buf.params().getTextClass());
return true;
case LABEL_SENSITIVE:
void updateLabels(Buffer const & buf, bool childonly)
{
// Use the master text class also for child documents
- LyXTextClass const & textclass = buf.params().getLyXTextClass();
+ TextClass const & textclass = buf.params().getTextClass();
if (!childonly) {
// If this is a child document start with the master
Buffer & cbuf = const_cast<Buffer &>(buf);
cbuf.tocBackend().update();
- cbuf.structureChanged();
+ if (!childonly)
+ cbuf.structureChanged();
}
{
if (par_it->layout()->labeltype == LABEL_COUNTER
&& par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
- buffer.tocBackend().updateItem(par_it);
- buffer.structureChanged();
+ Buffer * master = buffer.getMasterBuffer();
+ master->tocBackend().updateItem(par_it);
+ master->structureChanged();
}
}