* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 0429580415ee70e8396f74b1f0cfb8181c12e715..d1b0e76b56fe8f37e86083d04e1939e0f91197cb 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"
@@ -352,8 +353,8 @@ bool needEnumCounterReset(ParIterator const & it)
 }
 
 
-void setCaptionLabels(InsetBase & inset, Floating const & fl,
-               Counters & counters)
+void setCaptionLabels(InsetBase & inset, string const & type,
+               docstring const label, Counters & counters)
 {
        LyXText * text = inset.getText(0);
        if (!text)
@@ -363,9 +364,7 @@ void setCaptionLabels(InsetBase & inset, Floating const & fl,
        if (pars.empty())
                return;
 
-       // FIXME UNICODE
-       docstring const counter = from_ascii(fl.type());
-       docstring const label = from_utf8(fl.name());
+       docstring const counter = from_ascii(type);
 
        ParagraphList::iterator p = pars.begin();
        for (; p != pars.end(); ++p) {
@@ -376,13 +375,15 @@ void setCaptionLabels(InsetBase & inset, Floating const & fl,
                for (; it2 != end2; ++it2) {
                        InsetBase & icap = *it2->inset;
                        // Look deeper just in case.
-                       setCaptionLabels(icap, fl, counters);
+                       setCaptionLabels(icap, type, label, counters);
                        if (icap.lyxCode() == InsetBase::CAPTION_CODE) {
                                // We found a caption!
                                counters.step(counter); 
                                int number = counters.value(counter);
-                               static_cast<InsetCaption &>(icap).setCount(number);
-                               static_cast<InsetCaption &>(icap).setLabel(label);
+                               InsetCaption & ic = static_cast<InsetCaption &>(icap);
+                               ic.setType(type);
+                               ic.setCount(number);
+                               ic.setCustomLabel(label);
                        }
                }
        }
@@ -400,16 +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;
+               if (inset.lyxCode() == InsetBase::FLOAT_CODE 
+                       || inset.lyxCode() == InsetBase::WRAP_CODE) {
+                       docstring const & name = inset.getInsetName();
+                       if (name.empty())
+                               continue;
 
-               docstring const & type = inset.getInsetName();
-               if (type.empty())
-                       continue;
-
-               Floating const & fl = textclass.floats().getType(to_ascii(type));
-               setCaptionLabels(inset, fl, counters);
+                       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);
+               }
        }
 }