Some master/child biblio fixes.

[lyx.git] / src / insets / InsetFoot.cpp

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index d1e0097c420634a548f95bdc945b22034c3878c2..cb7462d503702c0f993f9492e4640bb47a4f9af7 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -26,81 +26,69 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 using namespace std;
 
 namespace lyx {
 
-InsetFoot::InsetFoot(Buffer const & buf)
-       : InsetFootlike(buf)
+InsetFoot::InsetFoot(Buffer * buf)
+       : InsetFootlike(buf), intitle_(false)
 {}
 
 
-void InsetFoot::updateLabels(ParIterator const & it)
+docstring InsetFoot::layoutName() const
 {
-       BufferParams const & bp = buffer().masterBuffer()->params();
-       Counters & cnts = bp.documentClass().counters();
-       static docstring const foot = from_ascii("footnote");
-       Paragraph const & outer = it.paragraph();
-       if (!outer.layout().intitle && cnts.hasCounter(foot)) {
-               cnts.step(foot);
-               custom_label_= translateIfPossible(getLayout().labelstring()) 
-                       + ' ' + cnts.theCounter(foot, outer.getParLanguage(bp)->code());
-               setLabel(custom_label_);
-       
-       }
-       InsetCollapsable::updateLabels(it);
+       return intitle_ ? from_ascii("Foot:InTitle") : from_ascii("Foot");
 }
 
 
-void InsetFoot::addToToc(DocIterator const & cpit)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       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);
-}
+       BufferParams const & bp = buffer().masterBuffer()->params();
+       Counters & cnts = bp.documentClass().counters();
+       if (utype == OutputUpdate) {
+               // the footnote counter is local to this inset
+               cnts.saveLastCounter();
+       }
 
+       intitle_ = false;
+       for (size_type sl = 0 ; sl < it.depth() ; ++ sl) {
+               if (it[sl].text() && it[sl].paragraph().layout().intitle) {
+                       intitle_ = true;
+                       break;
+               }
+       }
 
-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_ + "\n" + default_tip;
-       return default_tip;
+       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();
 }
 
 
-int InsetFoot::latex(odocstream & os, OutputParams const & runparams_in) const
+docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) 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;
+       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::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