add config.h

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 4a05684b052f2730730f4767d0d66b3f3b192707..5bb3ed0b0f6343d64e942c139eba72a20b29fa2d 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -40,6 +40,7 @@
 #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"
@@ -400,19 +401,23 @@ void setCaptions(Paragraph & par, LyXTextClass const & textclass)
        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;
-
-               docstring const & name = inset.getInsetName();
-               if (name.empty())
-                       continue;
-
-               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);
+               if (inset.lyxCode() == InsetBase::FLOAT_CODE 
+                       || inset.lyxCode() == InsetBase::WRAP_CODE) {
+                       docstring const & name = inset.getInsetName();
+                       if (name.empty())
+                               continue;
+
+                       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);
+               }
        }
 }
 
@@ -545,15 +550,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;
+               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));