Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 748ae3eca511b6e451a72f978971d997f502b6ca..119c636877ecb31df33634b0a6118784d68c1136 100644 (file)
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -3,8 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,84 +16,42 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "OutputParams.h"
+#include "output_docbook.h"
 #include "TocBackend.h"
 
 #include "support/docstream.h"
 #include "support/gettext.h"
-
-#include <ostream>
-
+#include "support/lstrings.h"
 
 namespace lyx {
 
 
-InsetMarginal::InsetMarginal(Buffer const & buf)
+InsetMarginal::InsetMarginal(Buffer * buf)
        : InsetFootlike(buf)
 {}
 
 
-docstring InsetMarginal::editMessage() const
-{
-       return _("Opened Marginal Note Inset");
-}
-
-
-docstring InsetMarginal::toolTip(BufferView const & bv, int x, int y) const
-{
-       docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
-       OutputParams rp(&buffer().params().encoding());
-       odocstringstream ods;
-       InsetText::plaintext(ods, rp);
-       docstring margin_tip = ods.str();
-       // shorten it if necessary
-       if (margin_tip.size() > 200)
-               margin_tip = margin_tip.substr(0, 200) + "...";
-       if (!isOpen() && !margin_tip.empty())
-               return margin_tip + '\n' + default_tip;
-       return default_tip;
-}
-
-
-int InsetMarginal::latex(odocstream & os, OutputParams const & runparams) const
-{
-       os << "%\n\\marginpar{";
-       int const i = InsetText::latex(os, runparams);
-       os << "%\n}";
-       return i + 2;
-}
-
-
-int InsetMarginal::plaintext(odocstream & os,
-                            OutputParams const & runparams) const
+int InsetMarginal::plaintext(odocstringstream & os,
+                            OutputParams const & runparams, size_t max_length) const
 {
        os << '[' << buffer().B_("margin") << ":\n";
-       InsetText::plaintext(os, runparams);
+       InsetText::plaintext(os, runparams, max_length);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetMarginal::docbook(odocstream & os,
-                          OutputParams const & runparams) const
+void InsetMarginal::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       os << "<note role=\"margin\">";
-       int const i = InsetText::docbook(os, runparams);
-       os << "</note>";
-
-       return i;
+       // Implementation as per http://www.sagehill.net/docbookxsl/SideFloats.html
+       // Unfortunately, only for XSL-FO output with the default style sheets, hence the role.
+       xs << xml::StartTag("sidebar", "role=\"margin\"");
+       xs << xml::CR();
+       xs << "<?dbfo float-type=\"margin.note\"?>";
+       InsetText::docbook(xs, runparams);
+       xs << xml::EndTag("sidebar");
 }
 
 
-void InsetMarginal::addToToc(ParConstIterator const & cpit) const
-{
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
-
-       Toc & toc = buffer().tocBackend().toc("marginalnote");
-       docstring str;
-       str = getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
-}
-
 } // namespace lyx