Rename LatexRunParams::fragile as moving_arg.

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index c6a199386fa9ad8006eab6ab8408b99c4d3e4b9b..c42a2d0bae9387b7fa4ac337290d29861aa0bb8e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -12,15 +12,18 @@
 #ifndef INSETTEXT_H
 #define INSETTEXT_H
 
-
 #include "updatableinset.h"
 #include "LString.h"
 #include "LColor.h"
 #include "ParagraphList.h"
+#include "RowList.h"
+#include "dimension.h"
+#include "frontends/mouse_state.h"
 
 #include "support/types.h"
 
 #include <boost/shared_ptr.hpp>
+#include <map>
 
 class Painter;
 class BufferView;
@@ -84,26 +87,18 @@ public:
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
-       ///
-       int width(BufferView *, LyXFont const & f) const;
+       void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
        int textWidth(BufferView *, bool fordraw = false) const;
        ///
        void draw(BufferView *, LyXFont const &, int , float &) const;
        ///
-       void update(BufferView *, LyXFont const &, bool = false);
+       void update(BufferView *, bool = false);
        ///
        void setUpdateStatus(BufferView *, int what) const;
        ///
        string const editMessage() const;
        ///
-       void edit(BufferView *, int, int, mouse_button::state);
-       ///
-       void edit(BufferView *, bool front = true);
-       ///
        bool isTextInset() const { return true; }
        ///
        void insetUnlock(BufferView *);
@@ -118,7 +113,7 @@ public:
        RESULT localDispatch(FuncRequest const &);
        ///
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -129,17 +124,13 @@ public:
        void validate(LaTeXFeatures & features) const;
        ///
        Inset::Code lyxCode() const { return Inset::TEXT_CODE; }
-       ///
+       /// FIXME, document
        void getCursorPos(BufferView *, int & x, int & y) const;
+       /// Get the absolute document x,y of the cursor
+       virtual void getCursor(BufferView &, int &, int &) const;
        ///
        int insetInInsetY() const;
        ///
-       void toggleInsetCursor(BufferView *);
-       ///
-       void showInsetCursor(BufferView *, bool show = true);
-       ///
-       void hideInsetCursor(BufferView *);
-       ///
        void fitInsetCursor(BufferView *) const;
        ///
        bool insertInset(BufferView *, Inset *);
@@ -160,7 +151,7 @@ public:
        ///
        void writeParagraphData(Buffer const *, std::ostream &) const;
        ///
-       void setParagraphData(Paragraph *, bool same_id = false);
+       void setParagraphData(ParagraphList const &, bool same_id = false);
        ///
        void setText(string const &, LyXFont const &);
        ///
@@ -201,16 +192,10 @@ public:
        ///
        Inset * getInsetFromID(int id) const;
        ///
-       Paragraph * firstParagraph() const;
-       ///
-       Paragraph * getFirstParagraph(int) const;
+       ParagraphList * getParagraphs(int) const;
        ///
        LyXCursor const & cursor(BufferView *) const;
        ///
-       Paragraph * paragraph() const;
-       ///
-       void paragraph(Paragraph *);
-       ///
        bool allowSpellcheck() const { return true; }
        ///
        WordLangTuple const
@@ -244,7 +229,7 @@ public:
        ///
        void getDrawFont(LyXFont &) const;
        /// append text onto the existing text
-       void appendParagraphs(Buffer * bp, Paragraph *);
+       void appendParagraphs(Buffer * bp, ParagraphList &);
 
        ///
        void addPreview(grfx::PreviewLoader &) const;
@@ -254,6 +239,9 @@ public:
        ///
        mutable int need_update;
 
+       bool haveParagraphs() const {
+               return true;
+       }
        ///
        ParagraphList paragraphs;
 protected:
@@ -336,15 +324,15 @@ private:
        ///
        lyx::pos_type cpos(BufferView *) const;
        ///
-       Paragraph * cpar(BufferView *) const;
+       ParagraphList::iterator cpar(BufferView *) const;
        ///
        bool cboundary(BufferView *) const;
        ///
-       Row * crow(BufferView *) const;
+       RowList::iterator crow(BufferView *) const;
        ///
-       void drawFrame(Painter &) const;
+       void drawFrame(Painter &, int x) const;
        ///
-       void clearInset(BufferView *, int baseline) const;
+       void clearInset(BufferView *, int start_x, int baseline) const;
        ///
        void saveLyXTextState(LyXText *) const;
        ///
@@ -358,15 +346,11 @@ private:
        ///
        mutable bool locked;
        ///
-       mutable int insetAscent;
-       ///
-       mutable int insetDescent;
-       ///
-       mutable int insetWidth;
+       mutable Dimension dim_;
        ///
        mutable int top_y;
        ///
-       Paragraph * inset_par;
+       ParagraphList::iterator inset_par;
        ///
        lyx::pos_type inset_pos;
        ///
@@ -382,7 +366,7 @@ private:
        ///
        UpdatableInset * the_locking_inset;
        ///
-       mutable Paragraph * old_par;
+       mutable ParagraphList::iterator old_par;
        /// The cache.
        mutable Cache cache;
        ///