X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFoot.cpp;h=cb7462d503702c0f993f9492e4640bb47a4f9af7;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=66654e6cb71ef445c1b0d7aa174287d698b35e78;hpb=aedfb81808d837df00947e8ac86f8941045e538c;p=lyx.git

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 66654e6cb7..cb7462d503 100644
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -16,9 +16,8 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Counters.h"
+#include "Language.h"
 #include "Layout.h"
-// FIXME: the following is needed just to get the layout of the enclosing
-// paragraph. This seems a bit too much to me (JMarc)
 #include "OutputParams.h"
 #include "ParIterator.h"
 #include "TextClass.h"
@@ -33,85 +32,63 @@ using namespace std;
 
 namespace lyx {
 
-
-InsetFoot::InsetFoot(Buffer const & buf)
-	: InsetFootlike(buf)
+InsetFoot::InsetFoot(Buffer * buf)
+	: InsetFootlike(buf), intitle_(false)
 {}
 
 
-docstring InsetFoot::editMessage() const
+docstring InsetFoot::layoutName() const
 {
-	return _("Opened Footnote Inset");
+	return intitle_ ? from_ascii("Foot:InTitle") : from_ascii("Foot");
 }
 
 
-void InsetFoot::updateLabels(ParIterator const & it)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-	DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
-	Counters & cnts = tclass.counters();
-	docstring const foot = from_ascii("footnote");
-	Paragraph const & outer =  it.paragraph();
-	if (!outer.layout().intitle && cnts.hasCounter(foot)) {
-		cnts.step(foot);
-		// FIXME: the counter should format itself.
-		custom_label_= support::bformat(from_utf8("%1$s %2$s"),
-					  translateIfPossible(getLayout(buffer().params()).labelstring()),
-					  cnts.theCounter(foot));
-		setLabel(custom_label_);
-	
+	BufferParams const & bp = buffer().masterBuffer()->params();
+	Counters & cnts = bp.documentClass().counters();
+	if (utype == OutputUpdate) {
+		// the footnote counter is local to this inset
+		cnts.saveLastCounter();
 	}
-	InsetCollapsable::updateLabels(it);
-}
 
+	intitle_ = false;
+	for (size_type sl = 0 ; sl < it.depth() ; ++ sl) {
+		if (it[sl].text() && it[sl].paragraph().layout().intitle) {
+			intitle_ = true;
+			break;
+		}
+	}
 
-void InsetFoot::addToToc(DocIterator const & cpit)
-{
-	DocIterator pit = cpit;
-	pit.push_back(CursorSlice(*this));
-
-	Toc & toc = buffer().tocBackend().toc("footnote");
-	docstring str;
-	str = custom_label_ + ": " + getNewLabel(str);
-	toc.push_back(TocItem(pit, 0, str));
-	// Proceed with the rest of the inset.
-	InsetFootlike::addToToc(cpit);
+	Language const * lang = it.paragraph().getParLanguage(bp);
+	InsetLayout const & il = getLayout();
+	docstring const & count = il.counter();
+	custom_label_ = translateIfPossible(il.labelstring());
+	if (cnts.hasCounter(count))
+		cnts.step(count, utype);
+	custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+	setLabel(custom_label_);
+
+	InsetCollapsable::updateBuffer(it, utype);
+	if (utype == OutputUpdate)
+		cnts.restoreLastCounter();
 }
 
 
 docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
 {
-	docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
-	if (!isOpen(bv))
-		return custom_label_ + ": " + default_tip;
-	return default_tip;
+	if (isOpen(bv))
+		// this will give us something useful if there is no button
+		return InsetCollapsable::toolTip(bv, x, y);
+	return toolTipText(custom_label_+ ": ");
 }
 
 
-int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
-{
-	OutputParams runparams = runparams_in;
-	// footnotes in titling commands like \title have moving arguments
-	runparams.moving_arg |= runparams_in.intitle;
-
-	// in titling commands, \thanks should be used instead of \footnote.
-	// some classes (e.g. memoir) do not understand \footnote.
-	if (runparams_in.intitle)
-		os << "%\n\\thanks{";
-	else
-		os << "%\n\\footnote{";
-
-	int const i = InsetText::latex(os, runparams);
-	os << "%\n}";
-	runparams_in.encoding = runparams.encoding;
-
-	return i + 2;
-}
-
-
-int InsetFoot::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetFoot::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
 	os << '[' << buffer().B_("footnote") << ":\n";
-	InsetText::plaintext(os, runparams);
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -127,5 +104,4 @@ int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
 	return i;
 }
 
-
 } // namespace lyx