Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index e941f4aa011d78f730a20403b212d6d1561f191d..3a2f5b377d0237480d73f98dd9521f39bb9bd29a 100644 (file)
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -12,13 +12,16 @@
 #include <config.h>
 
 #include "InsetFoot.h"
+#include "InsetBox.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Language.h"
+#include "LaTeXFeatures.h"
 #include "Layout.h"
 #include "OutputParams.h"
+#include "output_docbook.h"
 #include "ParIterator.h"
 #include "TextClass.h"
 #include "TocBackend.h"
@@ -26,23 +29,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), intitle_(false)
+       : InsetFootlike(buf), intitle_(false), infloattable_(false)
 {}
 
 
 docstring InsetFoot::layoutName() const
 {
-       return intitle_ ? from_ascii("Foot:InTitle") : from_ascii("Foot");
+       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)
+void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
        BufferParams const & bp = buffer().masterBuffer()->params();
        Counters & cnts = bp.documentClass().counters();
@@ -52,7 +60,21 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
        }
 
        intitle_ = false;
-       for (size_type sl = 0 ; sl < it.depth() ; ++ sl) {
+       infloattable_ = false;
+       bool intable = false;
+       if (it.innerInsetOfType(TABULAR_CODE) != 0)
+               intable = true;
+       if (it.innerInsetOfType(FLOAT_CODE) != 0)
+               infloattable_ = intable;
+       // If we are in a table in a float, but the table is also in a minipage,
+       // we do not use tablefootnote, since minipages provide their own footnotes.
+       if (intable && infloattable_ && it.innerInsetOfType(BOX_CODE) != 0) {
+               InsetBoxParams const & boxp =
+                               static_cast<InsetBox*>(it.innerInsetOfType(BOX_CODE))->params();
+               if (boxp.inner_box && !boxp.use_parbox && !boxp.use_makebox)
+                       infloattable_ = false;
+       }
+       for (size_type sl = 0 ; sl < it.depth() ; ++sl) {
                if (it[sl].text() && it[sl].paragraph().layout().intitle) {
                        intitle_ = true;
                        break;
@@ -63,36 +85,29 @@ void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype)
        InsetLayout const & il = getLayout();
        docstring const & count = il.counter();
        custom_label_ = translateIfPossible(il.labelstring());
-       if (cnts.hasCounter(count))
+
+       int val = cnts.value(count);
+       if (cnts.hasCounter(count)) {
                cnts.step(count, utype);
-       custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+               custom_label_ += ' ' + cnts.theCounter(count, lang->code());
+               if (deleted)
+                       // un-step after deleted counter
+                       cnts.set(count, val);
+       } else
+               custom_label_ += ' ' + from_ascii("#");
        setLabel(custom_label_);
 
-       InsetCollapsable::updateBuffer(it, utype);
+       InsetCollapsible::updateBuffer(it, utype, deleted);
        if (utype == OutputUpdate)
                cnts.restoreLastCounter();
 }
 
 
-void InsetFoot::addToToc(DocIterator const & cpit, bool output_active) const
-{
-       DocIterator pit = cpit;
-       pit.push_back(CursorSlice(const_cast<InsetFoot &>(*this)));
-
-       shared_ptr<Toc> toc = buffer().tocBackend().toc("footnote");
-       docstring str = custom_label_ + ": ";
-       text().forOutliner(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);
-}
-
-
 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 InsetCollapsible::toolTip(bv, x, y);
        return toolTipText(custom_label_+ ": ");
 }
 
@@ -108,13 +123,29 @@ int InsetFoot::plaintext(odocstringstream & os,
 }
 
 
-int InsetFoot::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetFoot::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       os << "<footnote>";
-       int const i = InsetText::docbook(os, runparams);
-       os << "</footnote>";
+       OutputParams rp = runparams;
+       rp.docbook_force_pars = true;
+       rp.docbook_in_par = false;
+       InsetText::docbook(xs, rp);
+}
+
+
+void InsetFoot::validate(LaTeXFeatures & features) const
+{
+       // Use footnote package to provide footnotes in tables
+       // unless an alternative approach is built in the class.
+       if (!features.saveNoteEnv().empty()
+           && !features.isProvided("footnote-alternative")) {
+               features.require("footnote");
+               features.addPreambleSnippet(
+                       from_ascii("\\makesavenoteenv{"
+                                  + features.saveNoteEnv()
+                                  + "}\n"));
+       }
 
-       return i;
+       InsetText::validate(features);
 }
 
 } // namespace lyx