Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index b530e05f3fa01a8173d92427241036b94f57f02f..f92304aa397625f8c7db100ff862e28ee50a0f5a 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -37,23 +37,25 @@ public:
        static CollapseStatus string2params(std::string const &);
        ///
        static std::string params2string(CollapseStatus);
+
+       std::string contextMenuName() const
+               { return "context-ert"; }
 private:
        ///
        InsetCode lyxCode() const { return ERT_CODE; }
        ///
-       docstring name() const { return from_ascii("ERT"); }
+       docstring layoutName() const { return from_ascii("ERT"); }
        ///
        void write(std::ostream & os) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const {}
-       ///
-       bool showInsetDialog(BufferView *) const;
        /// should paragraph indendation be omitted in any case?
        bool neverIndent() const { return true; }
        ///