X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=d1b0e76b56fe8f37e86083d04e1939e0f91197cb;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=4a05684b052f2730730f4767d0d66b3f3b192707;hpb=e1caf604088561acc0555d953d31d60929ae6f90;p=lyx.git diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index 4a05684b05..d1b0e76b56 100644 --- 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(inset).tabular.isLongTabular()) { + // FIXME: are "table" and "Table" the correct type and label? + setCaptionLabels(inset, "table", from_ascii("Table"), counters); + } } }