Fix some bugs in the bibinfo caching mechanism. Comments to follow.

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

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 8671f72959a2e86acd3c4ac03081b1f192105d3c..139834c21aec6f2ff178ca17238505d04fb1cfa0 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -4,8 +4,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.
  */
@@ -14,7 +14,6 @@
 #define INSETERT_H
 
 #include "InsetCollapsable.h"
-#include "MailInset.h"
 
 
 namespace lyx {
@@ -33,92 +32,44 @@ class Language;
 class InsetERT : public InsetCollapsable {
 public:
        ///
-       InsetERT(BufferParams const &, CollapseStatus status = Open);
-#if 0
+       InsetERT(Buffer *, CollapseStatus status = Open);
        ///
-       InsetERT(BufferParams const &,
-                Language const *, std::string const & contents, CollapseStatus status);
-#endif
+       static CollapseStatus string2params(std::string const &);
        ///
-       ~InsetERT();
+       static std::string params2string(CollapseStatus);
+
+       docstring contextMenu(BufferView const &, int, int) const
+               { return from_ascii("context-ert"); }
+private:
        ///
        InsetCode lyxCode() const { return ERT_CODE; }
        ///
        docstring name() const { return from_ascii("ERT"); }
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
-       ///
-       void read(Buffer const & buf, Lexer & lex);
+       void write(std::ostream & os) const;
        ///
-       virtual docstring const editMessage() const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       bool insetAllowed(InsetCode code) const;
+       int docbook(odocstream &, OutputParams const &) const;
        ///
-       int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
-       ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
-       ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const {}
+       /// should paragraph indendation be omitted in any case?
+       bool neverIndent() const { return true; }
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
-       ///
-       void draw(PainterInfo & pi, int x, int y) const;
-       ///
-       bool showInsetDialog(BufferView *) const;
-       ///
-       void getDrawFont(FontInfo &) const;
-       ///
-       bool forceDefaultParagraphs(idx_type) const { return true; }
-       /// should paragraph indendation be ommitted in any case?
-       bool neverIndent(Buffer const &) const { return true; }
-protected:
-       InsetERT(InsetERT const &);
-       ///
-       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        ///
-       void resetParagraphsFont();
-
-private:
-       virtual Inset * clone() const;
-       ///
-       void init();
+       Inset * clone() const { return new InsetERT(*this); }
        ///
-       void setButtonLabel();
+       docstring const buttonLabel(BufferView const & bv) const;
        ///
        bool allowSpellCheck() const { return false; }
 };
 
 
-class InsetERTMailer : public MailInset {
-public:
-       ///
-       InsetERTMailer(InsetERT & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &,
-               InsetCollapsable::CollapseStatus &);
-       ///
-       static std::string const params2string(InsetCollapsable::CollapseStatus);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetERT & inset_;
-};
-
-
 } // namespace lyx
 
 #endif