nomenclWidest(): take (proper) formatting into account.

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 48a70817cb5d3195cc5a333772737714be1245a5..db7e1ac3314181d7c8aa3c411cec13d1ae67c161 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -17,6 +17,7 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Language.h"
+#include "LaTeXFeatures.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "ParIterator.h"
@@ -26,17 +27,28 @@
 #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), infloattable_(false)
 {}
 
 
-void InsetFoot::updateLabels(ParIterator const & it, UpdateType utype)
+docstring InsetFoot::layoutName() const
+{
+       if (intitle_)
+               return from_ascii("Foot:InTitle");
+       else if (infloattable_)
+               return from_ascii("Foot:InFloatTable");
+       return from_ascii("Foot");
+}
+
+
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();
        Counters & cnts = bp.documentClass().counters();
@@ -44,69 +56,50 @@ void InsetFoot::updateLabels(ParIterator const & it, UpdateType utype)
                // the footnote counter is local to this inset
                cnts.saveLastCounter();
        }
-       Paragraph const & outer = it.paragraph();
+
+       intitle_ = false;
+       infloattable_ = false;
+       bool intable = false;
+       if (it.innerInsetOfType(TABULAR_CODE) != 0)
+               intable = true;
+       if (it.innerInsetOfType(FLOAT_CODE) != 0)
+               infloattable_ = intable;
+       for (size_type sl = 0 ; sl < it.depth() ; ++sl) {
+               if (it[sl].text() && it[sl].paragraph().layout().intitle) {
+                       intitle_ = true;
+                       break;
+               }
+       }
+
+       Language const * lang = it.paragraph().getParLanguage(bp);
        InsetLayout const & il = getLayout();
        docstring const & count = il.counter();
-       if (!outer.layout().intitle && cnts.hasCounter(count)) {
+       custom_label_ = translateIfPossible(il.labelstring());
+       if (cnts.hasCounter(count))
                cnts.step(count, utype);
-               custom_label_= translateIfPossible(il.labelstring()) 
-                       + ' ' + cnts.theCounter(count, outer.getParLanguage(bp)->code());
-               setLabel(custom_label_);        
-       }
-       InsetCollapsable::updateLabels(it, utype);
-       if (utype == OutputUpdate)
-               cnts.restoreLastCounter();      
-}
-
+       custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+       setLabel(custom_label_);
 
-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);
+       InsetCollapsible::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_ + "\n" + default_tip;
-       return default_tip;
-}
-
-
-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;
+       if (isOpen(bv))
+               // this will give us something useful if there is no button
+               return InsetCollapsible::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
@@ -122,4 +115,18 @@ int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
        return i;
 }
 
+
+void InsetFoot::validate(LaTeXFeatures & features) const
+{
+       if (!features.saveNoteEnv().empty()) {
+               features.require("footnote");
+               features.addPreambleSnippet(
+                       from_ascii("\\makesavenoteenv{"
+                                  + features.saveNoteEnv()
+                                  + "}\n"));
+       }
+
+       InsetText::validate(features);
+}
+
 } // namespace lyx