]> git.lyx.org Git - lyx.git/blobdiff - src/lyxtext.h
Applied Angus patch to compile on DEC C++ and to avoid name clashes
[lyx.git] / src / lyxtext.h
index e0f1ceb0cfe54a8d0792628025b9427cacf2aff6..b8439b2d4b1ba3d4b8a9ac72f45e4debb523ceac 100644 (file)
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 #endif
 
 #include "lyxfont.h"
-#include "lyxrow.h"
 #include "undo.h"
 #include "lyxcursor.h"
 #include "lyxparagraph.h"
+#include "layout.h"
 
 class Buffer;
 class BufferParams;
-class LyXScreen;
+class Row;
+class BufferView;
+class InsetText;
+
 
 /**
   This class holds the mapping between buffer paragraphs and screen rows.
@@ -36,112 +39,131 @@ public:
                ///
                UNCHANGED,
                ///
-               NEED_LITTLE_REFRESH,
-               ///
                NEED_MORE_REFRESH,
                ///
-               NEED_VERY_LITTLE_REFRESH
+               NEED_VERY_LITTLE_REFRESH,
+               ///
+               CHANGED_IN_DRAW
        };
 
-       /// points to Buffer.params
-       BufferParams * parameters;
-       /// points to Buffer
-       Buffer * params;
+       /// Constructor
+       LyXText(BufferView *);
+       ///
+       LyXText(InsetText *);
+   
+       /// Destructor
+       ~LyXText();
+
+       void init(BufferView *);
        ///
        mutable int number_of_rows;
        ///
-       mutable long height;
+       mutable int height;
+       ///
+       mutable unsigned int width;
        /// the current font settings
        mutable LyXFont current_font;
        /// the current font
        mutable LyXFont real_current_font;
+       /// first visible pixel-row is set from LyXScreen!!!
+       // unsigned is wrong here for text-insets!
+       int first;
+       ///
+       BufferView * bv_owner;
+       ///
+       InsetText * inset_owner;
+       ///
+       UpdatableInset * the_locking_inset;
 
-       /// Constructor
-       LyXText(int paperwidth, Buffer *);
-   
-       /// Destructor
-       ~LyXText();
-   
        ///
-       LyXFont GetFont(LyXParagraph * par,
+       int GetRealCursorX(BufferView *) const;
+       ///
+       LyXFont const GetFont(Buffer const *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
        ///
-       void SetCharFont(LyXParagraph * par,
+       void SetCharFont(Buffer const *, LyXParagraph * par,
                         LyXParagraph::size_type pos,
                         LyXFont const & font);
        /// returns a pointer to the very first LyXParagraph
        LyXParagraph * FirstParagraph() const;
   
        /// what you expect when pressing <enter> at cursor position
-       void BreakParagraph(char keep_layout = 0);
+       void BreakParagraph(BufferView *, char keep_layout = 0);
 
        /** set layout over selection and make a total rebreak of
          those paragraphs
          */
-       void SetLayout(char layout);
+       LyXParagraph * SetLayout(BufferView *, LyXCursor & actual_cursor,
+                                LyXCursor & selection_start,
+                                LyXCursor & selection_end,
+                                LyXTextClass::size_type layout);
+       void SetLayout(BufferView *, LyXTextClass::size_type layout);
        
        /// used in setlayout
-       void MakeFontEntriesLayoutSpecific(LyXParagraph * par);
+       void MakeFontEntriesLayoutSpecific(Buffer const *, LyXParagraph * par);
        
        /** increment depth over selection and make a total rebreak of those 
          paragraphs
          */
-       void IncDepth();
+       void IncDepth(BufferView *);
        
        /** decrement depth over selection and make a total rebreak of those  
          paragraphs */
-       void DecDepth();
+       void DecDepth(BufferView *);
 
        /** Get the depth at current cursor position
         */
-       int GetDepth() const { return cursor.par->GetDepth(); }
+       int GetDepth() const { return cursor.par()->GetDepth(); }
        
        /** set font over selection and make a total rebreak of those
          paragraphs.
          toggleall defaults to false.
          */
-       void SetFont(LyXFont const & font, bool toggleall = false);
+       void SetFont(BufferView *, LyXFont const &, bool toggleall = false);
        
        /** deletes and inserts again all paragaphs between the cursor
          and the specified par. The Cursor is needed to set the refreshing
          parameters. 
          This function is needed after SetLayout and SetFont etc.
          */
-       void RedoParagraphs(LyXCursor const & cursor,
+       void RedoParagraphs(BufferView *, LyXCursor const & cursor,
                            LyXParagraph const * end_par) const;
        ///
-       void RedoParagraph() const;
+       void RedoParagraph(BufferView *) const;
        
        ///
-       void ToggleFree(LyXFont const & font, bool toggleall = false);
+       void ToggleFree(BufferView *, LyXFont const &, bool toggleall = false);
        
        /** recalculates the heights of all previous rows of the
            specified paragraph.  needed, if the last characters font
            has changed.  
            */
-       void RedoHeightOfParagraph(LyXCursor const & cursor);
+       void RedoHeightOfParagraph(BufferView *, LyXCursor const & cursor);
        
        /** forces the redrawing of a paragraph. Needed when manipulating a 
            right address box
            */ 
-       void RedoDrawingOfParagraph(LyXCursor const & cursor);
+       void RedoDrawingOfParagraph(BufferView *, LyXCursor const & cursor);
        
        /** insert a character, moves all the following breaks in the 
          same Paragraph one to the right and make a little rebreak
          */
-       void InsertChar(char c);
+       void InsertChar(BufferView *, char c);
        ///
-       void InsertInset(Inset * inset);
+       void InsertInset(BufferView *, Inset * inset);
    
-       /// completes the insertion with a full rebreak
-       int FullRebreak();
+       /** Completes the insertion with a full rebreak.
+           Returns true if something was broken. */
+        bool FullRebreak(BufferView *);
 
+#ifndef NEW_INSETS
        ///
        LyXParagraph::footnote_flag GetFootnoteFlag(int row);
+#endif
        ///
        Row * need_break_row;
        ///
-       mutable long refresh_y;
+       mutable int refresh_y;
        ///
        int refresh_height;
        ///
@@ -162,18 +184,20 @@ public:
          (relative to the whole text). y is set to the real beginning
          of this row
          */ 
-       Row * GetRowNearY(long & y) const;
+       Row * GetRowNearY(int & y) const;
        
        /** returns the column near the specified x-coordinate of the row 
         x is set to the real beginning of this column
         */ 
-       int GetColumnNearX(Row * row, int & x) const;
+       int GetColumnNearX(BufferView *, Row * row,
+                          int & x, bool & boundary) const;
        
        /** returns a pointer to a specified row. y is set to the beginning
         of the row
         */
        Row * GetRow(LyXParagraph * par,
-                    LyXParagraph::size_type pos, long & y) const;
+                    LyXParagraph::size_type pos, int & y) const;
+
        /** returns the height of a default row, needed  for scrollbar
         */
        int DefaultHeight() const;
@@ -209,113 +233,143 @@ public:
        LyXCursor toggle_end_cursor;
    
        /// need the selection cursor:
-       void SetSelection();
+       void SetSelection(BufferView *);
        ///
-       void ClearSelection() const;
-
+       void ClearSelection(BufferView *) const;
+       ///
+       string const selectionAsString(Buffer const *) const;
+       
        /// just selects the word the cursor is in
-       void SelectWord();
+       void SelectWord(BufferView *);
 
        /** 'selects" the next word, where the cursor is not in 
         and returns this word as string. THe cursor will be moved 
         to the beginning of this word. 
         With SelectSelectedWord can this be highlighted really
         */ 
-       char * SelectNextWord(float & value);
+       string const SelectNextWord(BufferView *, float & value) const;
        ///
-       void SelectSelectedWord();
+       void SelectSelectedWord(BufferView *);
        ///
-       void SetCursor(LyXParagraph * par,
-                      LyXParagraph::size_type pos) const;
+       void SetCursor(BufferView *, LyXParagraph * par,
+                      LyXParagraph::size_type pos,
+                      bool setfont = true,
+                      bool boundary = false) const;
        ///
-       void SetCursorIntern(LyXParagraph * par,
-                            LyXParagraph::size_type pos) const;
+       void SetCursor(BufferView *, LyXCursor &, LyXParagraph * par,
+                      LyXParagraph::size_type pos,
+                      bool boundary = false) const;
        ///
-       void SetCursorFromCoordinates(int x, long y) const;
+       void SetCursorIntern(BufferView *, LyXParagraph * par,
+                            LyXParagraph::size_type pos,
+                            bool setfont = true,
+                            bool boundary = false) const;
        ///
-       void CursorUp() const;
+       void SetCurrentFont(BufferView *) const;
+
        ///
-       void CursorDown() const;
+       bool IsBoundary(Buffer const *, LyXParagraph * par,
+                       LyXParagraph::size_type pos) const;
        ///
-       void CursorLeft() const;
+       bool IsBoundary(Buffer const *, LyXParagraph * par,
+                        LyXParagraph::size_type pos,
+                        LyXFont const & font) const;
+
        ///
-       void CursorRight() const;
+       void SetCursorFromCoordinates(BufferView *, int x, int y) const;
        ///
-       void CursorLeftOneWord() const;
+       void SetCursorFromCoordinates(BufferView *, LyXCursor &,
+                                     int x, int y) const;
        ///
-       void CursorRightOneWord() const;
+       void CursorUp(BufferView *) const;
        ///
-       void CursorUpParagraph() const;
+       void CursorDown(BufferView *) const;
        ///
-       void CursorDownParagraph() const;
+       void CursorLeft(BufferView *, bool internal = true) const;
        ///
-       void CursorHome() const;
+       void CursorRight(BufferView *, bool internal = true) const;
        ///
-       void CursorEnd() const;
+       void CursorLeftOneWord(BufferView *) const;
        ///
-       void CursorTab() const;
+       void CursorRightOneWord(BufferView *) const;
        ///
-       void CursorTop() const;
+       void CursorUpParagraph(BufferView *) const;
        ///
-       void CursorBottom() const;
+       void CursorDownParagraph(BufferView *) const;
        ///
-       void Delete();
+       void CursorHome(BufferView *) const;
        ///
-       void Backspace();
+       void CursorEnd(BufferView *) const;
        ///
-       void DeleteWordForward();
+       void CursorTab(BufferView *) const;
        ///
-       void DeleteWordBackward();
+       void CursorTop(BufferView *) const;
        ///
-       void DeleteLineForward();
+       void CursorBottom(BufferView *) const;
+       ///
+       void Delete(BufferView *);
+       ///
+       void Backspace(BufferView *);
+       ///
+       void DeleteWordForward(BufferView *);
+       ///
+       void DeleteWordBackward(BufferView *);
+       ///
+       void DeleteLineForward(BufferView *);
+       ///
+       bool SelectWordWhenUnderCursor(BufferView *);
        ///
-       int SelectWordWhenUnderCursor();
-
        enum TextCase {
+               ///
                text_lowercase = 0,
+               ///
                text_capitalization = 1,
+               ///
                text_uppercase = 2
        };
        /// Change the case of the word at cursor position.
-       void ChangeWordCase(TextCase action);
+       void ChangeWordCase(BufferView *, TextCase action);
 
        /** returns a printed row in a pixmap. The y value is needed to
          decide, wether it is selected text or not. This is a strange
          solution but faster.
-        */ 
-       void GetVisibleRow(LyXScreen & scr, int offset, 
-                          Row * row_ptr, long y);
-                                          
+        */
+       void GetVisibleRow(BufferView *, int y_offset, int x_offset,
+                          Row * row_ptr, int y, bool cleared=false);
+
+#ifndef NEW_INSETS
        /* footnotes: */
        ///
-       void ToggleFootnote();
+       void ToggleFootnote(BufferView *);
        ///
-       void OpenStuff();
+       void OpenStuff(BufferView *);
        ///
        void OpenFootnotes();
        ///
-       void OpenFootnote();
+       void OpenFootnote(BufferView *);
        ///
        void CloseFootnotes();
        ///
-       void CloseFootnote();
+       void CloseFootnote(BufferView *);
 
        /** turn the selection into a new environment. If there is no
          selection, create an empty environment
         */ 
-       void InsertFootnoteEnvironment(LyXParagraph::footnote_kind kind);
+       void InsertFootnoteEnvironment(BufferView *,
+                                      LyXParagraph::footnote_kind kind);
        ///
-       void MeltFootnoteEnvironment();
+       void MeltFootnoteEnvironment(BufferView *);
+#endif
        ///
-       void CutSelection(bool = true);
+       void CutSelection(BufferView *, bool = true);
        ///
-       void CopySelection();
+       void CopySelection(BufferView *);
        ///
-       void PasteSelection();
+       void PasteSelection(BufferView *);
        ///
        void copyEnvironmentType();
        ///
-       void pasteEnvironmentType();
+       void pasteEnvironmentType(BufferView *);
        ///
        void InsertFootnote();
        ///
@@ -331,109 +385,64 @@ public:
         settings are given to the new one. So I can make shure, they do not
         duplicate themself (and you cannnot make dirty things with them! )
         */ 
-       void SetParagraph(bool line_top, bool line_bottom,
+       void SetParagraph(BufferView *,
+                         bool line_top, bool line_bottom,
                          bool pagebreak_top, bool pagebreak_bottom,
                          VSpace const & space_top,
                          VSpace const & space_bottom,
                          LyXAlignment align, 
                          string labelwidthstring,
                          bool noindent);
-        void SetParagraphExtraOpt(int type,
-                                  char const * width,
-                                  char const * widthp,
-                                  int alignment, bool hfill,
-                                  bool start_minipage);
-
+#ifndef NO_PEXTRA
+       ///
+       void SetParagraphExtraOpt(BufferView *, int type,
+                                 string const & width,
+                                 string const & widthp,
+                                 int alignment, bool hfill,
+                                 bool start_minipage);
+#endif
        /* these things are for search and replace */
 
-       /** returns true if the specified string is at the specified
-         position
-         */
-       bool IsStringInText(LyXParagraph * par,
-                           LyXParagraph::size_type pos,
-                           char const * str) const;
        /** sets the selection over the number of characters of string,
          no check!!
          */
-       void SetSelectionOverString(char const * str);
+       void SetSelectionOverString(BufferView *, string const & str);
 
        /** simple replacing. The font of the first selected character
          is used
          */
-       void ReplaceSelectionWithString(char const * str);
+       void ReplaceSelectionWithString(BufferView *, string const & str);
 
-       /** if the string can be found: return true and set the cursor to
-         the new position */
-       bool SearchForward(char const * str) const;
-       bool SearchBackward(char const * str) const;
-
-       /// needed to insert the selection
-       void InsertStringA(LyXParagraph::TextContainer const & text);
-       /// needed to insert the selection
-       void InsertStringB(LyXParagraph::TextContainer const & text);
        /// needed to insert the selection
-       void InsertStringA(char const * str);
+       void InsertStringA(BufferView *, string const & str);
        /// needed to insert the selection
-       void InsertStringB(char const * str);
+       void InsertStringB(BufferView *, string const & str);
 
-       /// usefull when texing from within LyX
-       bool GotoNextError() const;
-
-       /// just another feature :)
-       bool GotoNextNote() const;
-
-       /** needed to switch between different classes this works
-         for a list of paragraphs beginning with the specified par 
-         return value is the number of wrong conversions
-         */ 
-       int SwitchLayoutsBetweenClasses(char class1, char class2,
-                                       LyXParagraph * par);
+       /// Find next inset of some specified type.
+       bool GotoNextInset(BufferView *, std::vector<Inset::Code> const & codes,
+                          string const & contents = string()) const;
+       ///
 
        /* for the greater insets */
   
-       /// returns 0 if inset wasn't found
-       int UpdateInset(Inset * inset);
+       /// returns false if inset wasn't found
+       bool UpdateInset(BufferView *, Inset *);
        ///
-       void CheckParagraph(LyXParagraph * par,
+       void CheckParagraph(BufferView *, LyXParagraph * par,
                            LyXParagraph::size_type pos);
        ///
        int NumberOfCell(LyXParagraph * par,
                         LyXParagraph::size_type pos) const;
-       /* table stuff -- begin*/
-
-       /** all table features of the text-class are put together in
-         this function. Possible values of feature are defined in table.h
-         */
-       void TableFeatures(int feature, string const & val) const;
-        ///
-       void TableFeatures(int feature) const;
-
-       /** pos points at the beginning of the next cell (if there is one)
-        */
-       int WidthOfCell(LyXParagraph * par,
-                       LyXParagraph::size_type & pos) const;
-       ///
-       void CheckParagraphInTable(LyXParagraph * par,
-                                  LyXParagraph::size_type pos);
-       ///
-       void InsertCharInTable(char c);
-       ///
-       void BackspaceInTable();
-       ///
-       bool HitInTable(Row * row, int x) const;
-       ///
-       bool MouseHitInTable(int x, long y) const;
-       /* table stuff -- end*/
        ///
        LyXParagraph * GetParFromID(int id);
 
        // undo functions
        /// returns false if no undo possible
-       bool TextUndo();
+       bool TextUndo(BufferView *);
        /// returns false if no redo possible
-       bool TextRedo();
+       bool TextRedo(BufferView *);
        /// used by TextUndo/TextRedo
-       bool TextHandleUndo(Undo * undo);
+       bool TextHandleUndo(BufferView *, Undo * undo);
        /// makes sure the next operation will be stored
        void FinishUndo();
        /// this is dangerous and for internal use only
@@ -445,57 +454,77 @@ public:
        /// a flag
        bool undo_frozen;
        ///
-       void SetUndo(Undo::undo_kind kind,
+       void SetUndo(Buffer *, Undo::undo_kind kind,
                     LyXParagraph const * before,
                     LyXParagraph const * end) const;
        ///
-       void SetRedo(Undo::undo_kind kind,
+       void SetRedo(Buffer *, Undo::undo_kind kind,
                     LyXParagraph const * before,
                     LyXParagraph const * end);
        ///
-       Undo * CreateUndo(Undo::undo_kind kind,
+       Undo * CreateUndo(Buffer *, Undo::undo_kind kind,
                          LyXParagraph const * before,
                          LyXParagraph const * end) const;
        /// for external use in lyx_cb.C
-       void SetCursorParUndo();
-       ///
-       void CursorLeftIntern() const;
-       ///
-       void CursorRightIntern() const;
-        ///
-        void RemoveTableRow(LyXCursor * cursor) const;
-#if 0
-        ///
-        bool IsEmptyTableRow(LyXCursor const & cursor) const;
-#endif
-        ///
-        bool IsEmptyTableCell() const;
-        ///
-        void toggleAppendix();
-       ///
-       unsigned short paperWidth() const { return paperwidth; }
+       void SetCursorParUndo(Buffer *);
+       ///
+       void RemoveTableRow(LyXCursor & cursor) const;
+       ///
+       bool IsEmptyTableCell() const;
+       ///
+       void toggleAppendix(BufferView *);
+       ///
+       int workWidth(BufferView *) const;
+       ///
+       void ComputeBidiTables(Buffer const *, Row * row) const;
+
+       /// Maps positions in the visual string to positions in logical string.
+       inline
+       LyXParagraph::size_type log2vis(LyXParagraph::size_type pos) const {
+               if (bidi_start == -1)
+                       return pos;
+               else
+                       return log2vis_list[pos-bidi_start];
+       }
+
+       /// Maps positions in the logical string to positions in visual string.
+       inline
+       LyXParagraph::size_type vis2log(LyXParagraph::size_type pos) const {
+               if (bidi_start == -1)
+                       return pos;
+               else
+                       return vis2log_list[pos-bidi_start];
+       }
+       ///
+       inline
+       LyXParagraph::size_type bidi_level(LyXParagraph::size_type pos) const {
+               if (bidi_start == -1)
+                       return 0;
+               else
+                       return bidi_levels[pos-bidi_start];
+       }       
+       ///
+       inline
+       bool bidi_InRange(LyXParagraph::size_type pos) const {
+               return bidi_start == -1 ||
+                       (bidi_start <= pos && pos <= bidi_end);
+       }
 private:
-       /// width of the paper
-       unsigned short  paperwidth;
-
+       ///
+       void init();
        ///
        mutable Row * firstrow;
        ///
        mutable Row * lastrow;
 
-       /** Copybuffer for copy environment type
+       /** 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
          */
-       char copylayouttype;
+       LyXTextClass::size_type copylayouttype;
 
-       /// the currentrow is needed to access rows faster*/ 
-       mutable Row * currentrow; // pointer to the current row
-       /// position in the text 
-       mutable long currentrow_y;
-   
        /** inserts a new row behind the specified row, increments
-        * the touched counters */
+           the touched counters */
        void InsertRow(Row * row, LyXParagraph * par,
                       LyXParagraph::size_type pos) const;
        /** removes the row and reset the touched counters */
@@ -505,97 +534,136 @@ private:
        void RemoveParagraph(Row * row) const;
 
        /** insert the specified paragraph behind the specified row */
-       void InsertParagraph(LyXParagraph * par, Row * row) const;
+       void InsertParagraph(BufferView *,
+                            LyXParagraph * par, Row * row) const;
 
        /** appends  the implizit specified paragraph behind the specified row,
         * start at the implizit given position */
-       void AppendParagraph(Row * row) const;
+       void AppendParagraph(BufferView *, Row * row) const;
    
        ///
-       void BreakAgain(Row * row) const;
+       void BreakAgain(BufferView *, Row * row) const;
        ///
-       void BreakAgainOneRow(Row * row);
+       void BreakAgainOneRow(BufferView *, Row * row);
        /// Calculate and set the height of the row
-       void SetHeightOfRow(Row * row_ptr) const;
+       void SetHeightOfRow(BufferView *, Row * row_ptr) const;
 
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */ 
-       void PrepareToPrint(Row * row, float & x,
+       void PrepareToPrint(BufferView *, Row * row, float & x,
                            float & fill_separator, 
                            float & fill_hfill,
-                           float & fill_label_hfill) const;
+                           float & fill_label_hfill,
+                           bool bidi = true) const;
+
        ///
-       void DeleteEmptyParagraphMechanism(LyXCursor const & old_cursor) const;
+       void DeleteEmptyParagraphMechanism(BufferView *,
+                                          LyXCursor const & old_cursor) const;
 
        /** Updates all counters starting BEHIND the row. Changed paragraphs
         * with a dynamic left margin will be rebroken. */ 
-       void UpdateCounters(Row * row) const;
+       void UpdateCounters(BufferView *, Row * row) const;
        ///
-       void SetCounter(LyXParagraph * par) const;
+       void SetCounter(Buffer const *, LyXParagraph * par) const;
    
        /*
         * some low level functions
         */
        
        ///
-       int SingleWidth(LyXParagraph * par,
+       int SingleWidth(BufferView *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
        ///
-       int SingleWidth(LyXParagraph * par,
+       int SingleWidth(BufferView *, LyXParagraph * par,
                        LyXParagraph::size_type pos, char c) const;
        ///
-       void Draw(Row const * row, LyXParagraph::size_type & pos,
-                 LyXScreen & scr,
-                 int offset, float & x);
+       void draw(BufferView *, Row const * row,
+                 LyXParagraph::size_type & pos,
+                 int offset, float & x, bool cleared);
+
        /// get the next breakpoint in a given paragraph
-       LyXParagraph::size_type NextBreakPoint(Row const * row,
+       LyXParagraph::size_type NextBreakPoint(BufferView *, Row const * row,
                                               int width) const;
        /// returns the minimum space a row needs on the screen in pixel
-       int Fill(Row const * row, int paperwidth) const;
+       int Fill(BufferView *, Row * row, int workwidth) const;
        
        /** returns the minimum space a manual label needs on the
          screen in pixel */ 
-       int LabelFill(Row const * row) const;
+       int LabelFill(BufferView *, Row const * row) const;
 
        ///
-       LyXParagraph::size_type BeginningOfMainBody(LyXParagraph * par) const;
+       LyXParagraph::size_type
+       BeginningOfMainBody(Buffer const *, LyXParagraph const * par) const;
+       
        /** Returns the left beginning of the text.
          This information cannot be taken from the layouts-objekt, because
          in LaTeX the beginning of the text fits in some cases
          (for example sections) exactly the label-width.
          */
-       int LeftMargin(Row const * row) const;
+       int LeftMargin(BufferView *, Row const * row) const;
        ///
-       int RightMargin(Row const * row) const;
+       int RightMargin(Buffer const *, Row const * row) const;
        ///
-       int LabelEnd (Row const * row) const;
+       int LabelEnd (BufferView *, Row const * row) const;
 
        /** returns the number of separators in the specified row.
          The separator on the very last column doesnt count
          */ 
-       int NumberOfSeparators(Row const * row) const;
+       int NumberOfSeparators(Buffer const *, Row const * row) const;
 
        /** returns the number of hfills in the specified row. The
          LyX-Hfill is a LaTeX \hfill so that the hfills at the
          beginning and at the end were ignored. This is {\em MUCH}
          more usefull than not to ignore!
          */
-       int NumberOfHfills(Row const * row) const;
+       int NumberOfHfills(Buffer const *, Row const * row) const;
    
        /// like NumberOfHfills, but only those in the manual label!
-       int NumberOfLabelHfills(Row const * row) const;
-
+       int NumberOfLabelHfills(Buffer const *, Row const * row) const;
        /** returns true, if a expansion is needed. Rules are given by 
          LaTeX
          */
-       bool HfillExpansion(Row const * row_ptr,
+       bool HfillExpansion(Buffer const *, Row const * row_ptr,
                            LyXParagraph::size_type pos) const;
+
+
+       ///
+       mutable std::vector<LyXParagraph::size_type> log2vis_list;
+
+       ///
+       mutable std::vector<LyXParagraph::size_type> vis2log_list;
+
+       ///
+       mutable std::vector<LyXParagraph::size_type> bidi_levels;
+
+       ///
+       mutable LyXParagraph::size_type bidi_start;
+
+       ///
+       mutable LyXParagraph::size_type bidi_end;
+
+       ///
+       mutable bool bidi_same_direction;
+
+       ///
+       unsigned char TransformChar(unsigned char c, LyXParagraph * par,
+                               LyXParagraph::size_type pos) const;
+
        /** returns the paragraph position of the last character in the 
          specified row
          */
        LyXParagraph::size_type RowLast(Row const * row) const;
+       ///
+       LyXParagraph::size_type RowLastPrintable(Row const * row) const;
+
        ///
        void charInserted();
+       //
+       // special owner functions
+       ///
+       LyXParagraph * OwnerParagraph() const;
+       //
+       LyXParagraph * OwnerParagraph(LyXParagraph *) const;
 };
 
 #endif