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

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index 52f9b6f5e3..5bb3ed0b0f 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -38,7 +38,9 @@
 #include "frontends/Alert.h"
 
 #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"
@@ -351,6 +353,74 @@ bool needEnumCounterReset(ParIterator const & it)
 }
 
 
+void setCaptionLabels(InsetBase & inset, string const & type,
+		docstring const label, Counters & counters)
+{
+	LyXText * text = inset.getText(0);
+	if (!text)
+		return;
+
+	ParagraphList & pars = text->paragraphs();
+	if (pars.empty())
+		return;
+
+	docstring const counter = from_ascii(type);
+
+	ParagraphList::iterator p = pars.begin();
+	for (; p != pars.end(); ++p) {
+		InsetList::iterator it2 = p->insetlist.begin();
+		InsetList::iterator end2 = p->insetlist.end();
+		// Any caption within this float should have the same
+		// label prefix but different numbers.
+		for (; it2 != end2; ++it2) {
+			InsetBase & icap = *it2->inset;
+			// Look deeper just in case.
+			setCaptionLabels(icap, type, label, counters);
+			if (icap.lyxCode() == InsetBase::CAPTION_CODE) {
+				// We found a caption!
+				counters.step(counter); 
+				int number = counters.value(counter);
+				InsetCaption & ic = static_cast<InsetCaption &>(icap);
+				ic.setType(type);
+				ic.setCount(number);
+				ic.setCustomLabel(label);
+			}
+		}
+	}
+}
+
+
+void setCaptions(Paragraph & par, LyXTextClass const & textclass)
+{
+	if (par.insetlist.empty())
+		return;
+
+	Counters & counters = textclass.counters();
+
+	InsetList::iterator it = par.insetlist.begin();
+	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) {
+			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);
+		}
+	}
+}
+
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textclass)
 {
@@ -480,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));
@@ -602,6 +680,11 @@ void updateLabels(Buffer const & buf, bool childonly)
 		// set the counter for this paragraph
 		setLabel(buf, it, textclass);
 
+		// It is better to set the captions after setLabel because
+		// the caption number might need the section number in the
+		// future.
+		setCaptions(*it, textclass);
+
 		// Now included docs
 		InsetList::const_iterator iit = it->insetlist.begin();
 		InsetList::const_iterator end = it->insetlist.end();