Improve handling of top and bottom margin

[lyx.git] / src / insets / InsetExternal.h

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index a6167b5dd901d46c19b4611014112736313ac96c..8fb95b33d8a7c5a446e8e791a49acf01c3d5b739 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -17,10 +17,12 @@
 #include "ExternalTemplate.h"
 
 #include "support/FileName.h"
+#include "support/unique_ptr.h"
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/signals/trackable.hpp>
 
+namespace lyx {
+
+namespace external {
 
 /** No two InsetExternalParams variables can have the same temporary file.
  *  This class has copy-semantics but the copy constructor
@@ -29,14 +31,6 @@
  *  copy constructor and assignment operator for the
  *  InsetExternalParams class.
  */
-namespace lyx {
-
-namespace support {
-class TempFile;
-}
-
-namespace external {
-
 class TempName {
 public:
        TempName();
@@ -45,7 +39,7 @@ public:
        TempName & operator=(TempName const &);
        support::FileName operator()() const;
 private:
-       support::TempFile * tempfile_;
+       support::FileName tempname_;
 };
 
 } // namespace external
@@ -94,10 +88,13 @@ private:
 class RenderBase;
 
 ///
-class InsetExternal : public Inset, public boost::signals::trackable
+class InsetExternal : public Inset
 {
+       // Disable assignment operator, since it is not used, and it is too
+       // complicated to implement it consistently with the copy constructor
+       InsetExternal & operator=(InsetExternal const &);
 public:
-       InsetExternal(Buffer *);
+       explicit InsetExternal(Buffer *);
        ///
        ~InsetExternal();
        ///
@@ -111,7 +108,7 @@ public:
        ///
        void setParams(InsetExternalParams const &);
        /// Update not loaded previews
-       void updatePreview();
+       void updatePreview() const;
        /// \returns the number of rows (\n's) of generated code.
        void latex(otexstream &, OutputParams const &) const;
        ///
@@ -119,14 +116,24 @@ public:
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool clickable(int, int) const { return true; }
-private:
+       bool clickable(BufferView const &, int, int) const { return true; }
        ///
-       InsetExternal(InsetExternal const &);
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype, TocBackend & backend) const;
        ///
        InsetCode lyxCode() const { return EXTERNAL_CODE; }
        ///
        bool hasSettings() const { return true; }
+
+       ///
+       int topOffset(BufferView const *) const { return 0; }
+       ///
+       int bottomOffset(BufferView const *) const { return 0; }
+       ///
+       int leftOffset(BufferView const *) const { return 0; }
+       ///
+       int rightOffset(BufferView const *) const { return 0; }
+
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
@@ -139,10 +146,12 @@ private:
        int plaintext(odocstringstream & ods, OutputParams const & op,
                      size_t max_length = INT_MAX) const;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
+       void generateXML(XMLStream &, OutputParams const &, std::string const &) const;
+       ///
+       void docbook(XMLStream &, OutputParams const &) const;
        /// For now, this does nothing. Someone who knows about this
        /// should see what needs doing for XHTML output.
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        /// Update needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///
@@ -155,19 +164,24 @@ private:
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Inset * clone() const { return new InsetExternal(*this); }
-       /** This method is connected to the graphics loader, so we are
-        *  informed when the image has been loaded.
-        */
-       void statusChanged() const;
        /** Slot receiving a signal that the external file has changed
         *  and the preview should be regenerated.
         */
        void fileChanged() const;
 
+private:
+       ///
+       InsetExternal(InsetExternal const &);
+
+       /// Is this inset using (instant or graphics) preview?
+       bool isPreviewed() const;
+       /// Do we have the right renderer (button, graphic or monitored preview)?
+       bool isRendererValid() const;
+
        /// The current params
        InsetExternalParams params_;
        /// The thing that actually draws the image on LyX's screen.
-       boost::scoped_ptr<RenderBase> renderer_;
+       mutable unique_ptr<RenderBase> renderer_;
        /// changes color of the button when mouse enters/leaves this inset
        mutable std::map<BufferView const *, bool> mouse_hover_;
 };