Make lyx2lyx output the new external inset format.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 3d533145ae93dd235b42e3a1edabb130e4d6517a..9978e0d53f2c26ea66d7bab0ccd2303e23799730 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -88,6 +88,8 @@ private:
         */
        int anchor_row_offset_;
 public:
+       /// update all cached row positions
+       void updateRowPositions();
        /// get the y coord. of the top of the screen (relative to doc start)
        int top_y() const;
        /// set the y coord. of the top of the screen (relative to doc start)
@@ -102,17 +104,20 @@ public:
        ///
        int getRealCursorX() const;
        ///
-       LyXFont const getFont(Buffer const *, Paragraph * par,
+       LyXFont const getFont(Buffer const *, ParagraphList::iterator pit,
                lyx::pos_type pos) const;
        ///
-       LyXFont const getLayoutFont(Buffer const *, Paragraph * par) const;
+       LyXFont const getLayoutFont(Buffer const *,
+                                   ParagraphList::iterator pit) const;
        ///
-       LyXFont const getLabelFont(Buffer const *, Paragraph * par) const;
+       LyXFont const getLabelFont(Buffer const *,
+                                  ParagraphList::iterator pit) const;
        ///
-       void setCharFont(Buffer const *, Paragraph * par,
+       void setCharFont(Buffer const *, ParagraphList::iterator pit,
                         lyx::pos_type pos, LyXFont const & font);
-       void setCharFont(Paragraph * par,
-                        lyx::pos_type pos, LyXFont const & font, bool toggleall);
+       void setCharFont(ParagraphList::iterator pit,
+                        lyx::pos_type pos,
+                        LyXFont const & font, bool toggleall);
 
        ///
        void breakAgainOneRow(RowList::iterator rit);
@@ -122,10 +127,11 @@ public:
        /** set layout over selection and make a total rebreak of
          those paragraphs
          */
-       Paragraph * setLayout(LyXCursor & actual_cursor,
-                             LyXCursor & selection_start,
-                             LyXCursor & selection_end,
-                             string const & layout);
+       ParagraphList::iterator
+       setLayout(LyXCursor & actual_cursor,
+                 LyXCursor & selection_start,
+                 LyXCursor & selection_end,
+                 string const & layout);
        ///
        void setLayout(string const & layout);
 
@@ -151,7 +157,7 @@ public:
          This function is needed after SetLayout and SetFont etc.
          */
        void redoParagraphs(LyXCursor const & cursor,
-                           Paragraph const * end_par);
+                           ParagraphList::iterator endpit);
        ///
        void redoParagraph();
 
@@ -246,7 +252,7 @@ public:
         of the row
         */
        RowList::iterator
-       getRow(Paragraph * par, lyx::pos_type pos, int & y) const;
+       getRow(ParagraphList::iterator pit, lyx::pos_type pos, int & y) const;
 
        RowList & rows() const {
                return rowlist_;
@@ -347,10 +353,10 @@ public:
        void setCurrentFont();
 
        ///
-       bool isBoundary(Buffer const *, Paragraph * par,
+       bool isBoundary(Buffer const *, Paragraph const & par,
                        lyx::pos_type pos) const;
        ///
-       bool isBoundary(Buffer const *, Paragraph * par,
+       bool isBoundary(Buffer const *, Paragraph const & par,
                         lyx::pos_type pos,
                         LyXFont const & font) const;
 
@@ -413,10 +419,6 @@ public:
        void copySelection();
        ///
        void pasteSelection();
-       ///
-       void copyEnvironmentType();
-       ///
-       void pasteEnvironmentType();
 
        /** the DTP switches for paragraphs. LyX will store the top settings
         always in the first physical paragraph, the bottom settings in the
@@ -466,11 +468,11 @@ public:
        /// returns false if inset wasn't found
        bool updateInset(Inset *);
        ///
-       void checkParagraph(Paragraph * par, lyx::pos_type pos);
+       void checkParagraph(ParagraphList::iterator pit, lyx::pos_type pos);
        ///
        int workWidth() const;
-       ///
-       int workWidth(Inset * inset) const;
+       /// returns width of row containing inset
+       int workWidth(Inset const * inset) const;
 
        ///
        void computeBidiTables(Buffer const *, RowList::iterator row) const;
@@ -499,12 +501,6 @@ private:
            */
        void redoDrawingOfParagraph(LyXCursor const & cursor);
 
-       /** Copybuffer for copy environment type.
-         Asger has learned that this should be a buffer-property instead
-         Lgb has learned that 'char' is a lousy type for non-characters
-         */
-       string copylayouttype;
-
        /// removes the row and reset the touched counters
        void removeRow(RowList::iterator rit);
 
@@ -512,7 +508,8 @@ private:
        void removeParagraph(RowList::iterator rit);
 
        /// insert the specified paragraph behind the specified row
-       void insertParagraph(Paragraph * par, RowList::iterator rowit);
+       void insertParagraph(ParagraphList::iterator pit,
+                            RowList::iterator rowit);
 
        /** appends  the implizit specified paragraph behind the specified row,
         * start at the implizit given position */
@@ -544,10 +541,10 @@ public:
        Inset * checkInsetHit(int & x, int & y);
 
        ///
-       int singleWidth(Paragraph * par,
+       int singleWidth(ParagraphList::iterator pit,
                lyx::pos_type pos) const;
        ///
-       int singleWidth(Paragraph * par,
+       int singleWidth(ParagraphList::iterator pit,
                lyx::pos_type pos, char c) const;
 
        /// return the color of the canvas
@@ -556,7 +553,7 @@ public:
        ///
        mutable bool bidi_same_direction;
 
-       unsigned char transformChar(unsigned char c, Paragraph * par,
+       unsigned char transformChar(unsigned char c, Paragraph const & par,
                                    lyx::pos_type pos) const;
 
        /**
@@ -579,7 +576,7 @@ public:
 
 private:
        ///
-       void setCounter(Buffer const *, Paragraph * par);
+       void setCounter(Buffer const *, ParagraphList::iterator pit);
        ///
        void deleteWordForward();
        ///
@@ -626,10 +623,6 @@ public:
        // special owner functions
        ///
        ParagraphList & ownerParagraphs() const;
-       //
-       void ownerParagraph(Paragraph *) const;
-       // set it searching first for the right owner using the paragraph id
-       void ownerParagraph(int id, Paragraph *) const;
 
        /// return true if this is owned by an inset.
        bool isInInset() const;