Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 39a1fd7eea05538d18c3cff92e214541fe6678b1..cb7462d503702c0f993f9492e4640bb47a4f9af7 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -26,16 +26,23 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 
 using namespace std;
 
 namespace lyx {
 
 InsetFoot::InsetFoot(Buffer * buf)
-       : InsetFootlike(buf)
+       : InsetFootlike(buf), intitle_(false)
 {}
 
 
+docstring InsetFoot::layoutName() const
+{
+       return intitle_ ? from_ascii("Foot:InTitle") : from_ascii("Foot");
+}
+
+
 void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();
@@ -44,34 +51,27 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
                // the footnote counter is local to this inset
                cnts.saveLastCounter();
        }
-       Paragraph const & outer = it.paragraph();
-       if (!outer.layout().intitle) {
-               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, outer.getParLanguage(bp)->code());
-               setLabel(custom_label_);
+
+       intitle_ = false;
+       for (size_type sl = 0 ; sl < it.depth() ; ++ sl) {
+               if (it[sl].text() && it[sl].paragraph().layout().intitle) {
+                       intitle_ = true;
+                       break;
+               }
        }
-       InsetCollapsable::updateBuffer(it, utype);
-       if (utype == OutputUpdate)
-               cnts.restoreLastCounter();      
-}
 
+       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_);
 
-void InsetFoot::addToToc(DocIterator const & cpit, bool output_active) const
-{
-       DocIterator pit = cpit;
-       pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
-
-       Toc & toc = buffer().tocBackend().toc("footnote");
-       docstring str = custom_label_ + ": ";
-       text().forToc(str, TOC_ENTRY_LENGTH);
-       toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
-       // Proceed with the rest of the inset.
-       InsetFootlike::addToToc(cpit, output_active);
+       InsetCollapsable::updateBuffer(it, utype);
+       if (utype == OutputUpdate)
+               cnts.restoreLastCounter();
 }
 
 
@@ -80,30 +80,7 @@ docstring InsetFoot::toolTip(BufferView const & bv, int x, int y) const
        if (isOpen(bv))
                // this will give us something useful if there is no button
                return InsetCollapsable::toolTip(bv, x, y);
-       return toolTipText(custom_label_);
-}
-
-
-void InsetFoot::latex(otexstream & 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;
-
-       os << safebreakln;
-       if (runparams.lastid != -1)
-               os.texrow().start(runparams.lastid, runparams.lastpos);
-
-       // in titling commands, \thanks should be used instead of \footnote.
-       // some classes (e.g. memoir) do not understand \footnote.
-       if (runparams_in.intitle)
-               os << "\\thanks{";
-       else
-               os << "\\footnote{";
-
-       InsetText::latex(os, runparams);
-       os << "%\n}";
-       runparams_in.encoding = runparams.encoding;
+       return toolTipText(custom_label_+ ": ");
 }