* do not lookup the same macro all the time

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 396ca2153d4fd5d08f99cad2aa8e61a503a76e0b..e53f89780548988fcf6ec64f7a2cf4004efa4bb2 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -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"
@@ -355,7 +355,7 @@ bool needEnumCounterReset(ParIterator const & it)
 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;
 
@@ -389,7 +389,7 @@ void setCaptionLabels(Inset & inset, string const & type,
 }
 
 
-void setCaptions(Paragraph & par, LyXTextClass const & textclass)
+void setCaptions(Paragraph & par, TextClass const & textclass)
 {
        if (par.insetlist.empty())
                return;
@@ -402,7 +402,7 @@ void setCaptions(Paragraph & par, LyXTextClass const & textclass)
                Inset & inset = *it->inset;
                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;
 
@@ -417,14 +417,20 @@ void setCaptions(Paragraph & par, LyXTextClass const & textclass)
                        // 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) {
@@ -559,13 +565,13 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
                                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));
@@ -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
@@ -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();
        }
 }