Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 57c138b3054089b144e0537604145ded4b795079..7c9868123d88b1de7f7572b28318adaa0af8f327 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -7,7 +7,7 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETERT_H
@@ -38,45 +38,41 @@ public:
        ///
        InsetERT(BufferParams const &, bool collapsed = false);
        ///
-       InsetERT(InsetERT const &, bool same_id = false);
+       InsetERT(InsetERT const &);
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        InsetERT(BufferParams const &,
                 Language const *, string const & contents, bool collapsed);
        ///
        ~InsetERT();
        ///
-       Inset::Code lyxCode() const { return Inset::ERT_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
-       void write(Buffer const * buf, std::ostream & os) const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
        string const editMessage() const;
        ///
-       bool insertInset(BufferView *, Inset *);
+       bool insertInset(BufferView *, InsetOld *);
        ///
-       bool insetAllowed(Inset::Code code) const { return code == Inset::NEWLINE_CODE; }
+       bool insetAllowed(InsetOld::Code code) const { return code == InsetOld::NEWLINE_CODE; }
        ///
        void setFont(BufferView *, LyXFont const &,
                             bool toggleall = false, bool selectall = false);
        ///
-       void edit(BufferView *, int, int, mouse_button::state);
-       ///
-       void edit(BufferView * bv, bool front = true);
-       ///
        EDITABLE editable() const;
        ///
-       int latex(Buffer const *, std::ostream &, bool fragile,
-                 bool free_spc) const;
+       int latex(Buffer const &, std::ostream &,
+                 LatexRunParams const &) const;
        ///
-       int ascii(Buffer const *,
+       int ascii(Buffer const &,
                          std::ostream &, int linelen = 0) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
        void validate(LaTeXFeatures &) const {}
        ///
@@ -84,9 +80,7 @@ public:
        ///
        bool checkInsertChar(LyXFont &);
        ///
-       // this are needed here because of the label/inlined functionallity
-       ///
-       bool needFullRow() const { return status_ == Open; }
+       // these are needed here because of the label/inlined functionallity
        ///
        bool isOpen() const { return status_ == Open || status_ == Inlined; }
        ///
@@ -103,13 +97,9 @@ public:
        WordLangTuple const
        selectNextWordToSpellcheck(BufferView *, float &) const;
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       int width(BufferView *, LyXFont const &) const;
-       ///
-       void draw(BufferView *, const LyXFont &, int , float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        /// set the status of the inset
        void status(BufferView *, ERTStatus const st) const;
        ///
@@ -117,13 +107,9 @@ public:
        ///
        void getDrawFont(LyXFont &) const;
        ///
-       bool forceDefaultParagraphs(Inset const *) const {
+       bool forceDefaultParagraphs(InsetOld const *) const {
                return true;
        }
-       ///
-       int getMaxWidth(BufferView *, UpdatableInset const *) const;
-       ///
-       void update(BufferView *, LyXFont const &, bool =false);
 
 private:
        ///
@@ -163,7 +149,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static void string2params(string const &, InsetERT::ERTStatus &);
        ///