]> git.lyx.org Git - lyx.git/blobdiff - src/buffer_funcs.cpp
* Only enter inset which return true on isActive(). This is the behavior in the curso...
[lyx.git] / src / buffer_funcs.cpp
index aa15b8963f2819a2e0c90a04d6db7d8bf8766e7e..bed9c147ae5690ad4528d15486c1556df3b89304 100644 (file)
@@ -24,7 +24,7 @@
 #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"
@@ -35,7 +35,7 @@
 #include "TocBackend.h"
 #include "VCBackend.h"
 
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
@@ -352,10 +352,10 @@ bool needEnumCounterReset(ParIterator const & it)
 }
 
 
-void setCaptionLabels(InsetBase & inset, string const & type,
+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;
 
@@ -372,12 +372,12 @@ void setCaptionLabels(InsetBase & inset, string const & type,
                // Any caption within this float should have the same
                // label prefix but different numbers.
                for (; it2 != end2; ++it2) {
-                       InsetBase & icap = *it2->inset;
+                       Inset & icap = *it2->inset;
                        // Look deeper just in case.
                        setCaptionLabels(icap, type, label, counters);
-                       if (icap.lyxCode() == InsetBase::CAPTION_CODE) {
+                       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);
@@ -389,7 +389,7 @@ void setCaptionLabels(InsetBase & inset, string const & type,
 }
 
 
-void setCaptions(Paragraph & par, LyXTextClass const & textclass)
+void setCaptions(Paragraph & par, TextClass const & textclass)
 {
        if (par.insetlist.empty())
                return;
@@ -399,10 +399,10 @@ void setCaptions(Paragraph & par, LyXTextClass const & textclass)
        InsetList::iterator it = par.insetlist.begin();
        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) {
-                       docstring const & name = inset.getInsetName();
+               Inset & inset = *it->inset;
+               if (inset.lyxCode() == Inset::FLOAT_CODE
+                       || inset.lyxCode() == Inset::WRAP_CODE) {
+                       docstring const name = inset.name();
                        if (name.empty())
                                continue;
 
@@ -412,19 +412,25 @@ void setCaptions(Paragraph & par, LyXTextClass const & textclass)
                        docstring const label = from_utf8(fl.name());
                        setCaptionLabels(inset, type, label, counters);
                }
-               else if (inset.lyxCode() == InsetBase::TABULAR_CODE
+               else if (inset.lyxCode() == Inset::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 (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;
-       LyXLayout_ptr const & layout = par.layout();
+       Layout_ptr const & layout = par.layout();
        Counters & counters = textclass.counters();
 
        if (it.pit() == 0) {
@@ -549,23 +555,23 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
        } else if (layout->labeltype == LABEL_SENSITIVE) {
                // Search for the first float or wrap inset in the iterator
                size_t i = it.depth();
-               InsetBase * in = 0;
+               Inset * in = 0;
                while (i > 0) {
                        --i;
-                       InsetBase::Code const code = it[i].inset().lyxCode();
-                       if (code == InsetBase::FLOAT_CODE ||
-                           code == InsetBase::WRAP_CODE) {
+                       Inset::Code const code = it[i].inset().lyxCode();
+                       if (code == Inset::FLOAT_CODE ||
+                           code == Inset::WRAP_CODE) {
                                in = &it[i].inset();
                                break;
                        }
                }
-               // FIXME Can getInsetName() 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->getInsetName();
+                       type = in->name();
 
                if (!type.empty()) {
                        Floating const & fl = textclass.floats().getType(to_ascii(type));
@@ -598,7 +604,7 @@ bool updateCurrentLabel(Buffer const & buf,
     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) {
@@ -610,7 +616,7 @@ bool updateCurrentLabel(Buffer const & buf,
        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:
@@ -651,7 +657,7 @@ void updateLabels(Buffer const & buf, ParIterator & iter, bool childonly)
 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
@@ -688,7 +694,7 @@ void updateLabels(Buffer const & buf, bool childonly)
                InsetList::const_iterator iit = it->insetlist.begin();
                InsetList::const_iterator end = it->insetlist.end();
                for (; iit != end; ++iit) {
-                       if (iit->inset->lyxCode() == InsetBase::INCLUDE_CODE)
+                       if (iit->inset->lyxCode() == Inset::INCLUDE_CODE)
                                static_cast<InsetInclude const *>(iit->inset)
                                        ->updateLabels(buf);
                }
@@ -696,16 +702,18 @@ void updateLabels(Buffer const & buf, bool childonly)
 
        Buffer & cbuf = const_cast<Buffer &>(buf);
        cbuf.tocBackend().update();
-       cbuf.structureChanged();
+       if (!childonly)
+               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();
+               && par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
+               Buffer * master = buffer.getMasterBuffer();
+               master->tocBackend().updateItem(par_it);
+               master->structureChanged();
        }
 }