X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=5bb3ed0b0f6343d64e942c139eba72a20b29fa2d;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=f6d0d73a6c1280f0c46b03d0299fd840894865ad;hpb=0e0a17ff0a25dcd55451f78fe062832c760658a9;p=lyx.git

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index f6d0d73a6c..5bb3ed0b0f 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"
@@ -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,10 +364,7 @@ void setCaptionLabels(InsetBase & inset, Floating const & fl,
 	if (pars.empty())
 		return;
 
-	string const & type = fl.type();
-	docstring const counter = from_ascii(fl.type());
-	// FIXME UNICODE
-	docstring const label = from_utf8(fl.name());
+	docstring const counter = from_ascii(type);
 
 	ParagraphList::iterator p = pars.begin();
 	for (; p != pars.end(); ++p) {
@@ -377,7 +375,7 @@ 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); 
@@ -403,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);
+		}
 	}
 }
 
@@ -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));