Two fixes involving RtL text drawing

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 24191ccaad015f7c6b09c484c7867dd4c1fb08f8..52f9b6b34b292b945551576f8049c539693cf2d0 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -60,6 +60,8 @@ public:
        ///
        LyXFont getFont(Paragraph const & par, pos_type pos) const;
        ///
+       void applyOuterFont(LyXFont &) const;
+       ///
        LyXFont getLayoutFont(pit_type pit) const;
        ///
        LyXFont getLabelFont(Paragraph const & par) const;
@@ -93,7 +95,7 @@ public:
        void setFont(LCursor & cur, LyXFont const &, bool toggleall = false);
 
        /// rebreaks the given par
-       void redoParagraph(pit_type pit);
+       bool redoParagraph(pit_type pit);
 
        /// returns pos in given par at given x coord
        pos_type x2pos(pit_type pit, int row, int x) const;
@@ -103,7 +105,7 @@ public:
        void toggleFree(LCursor & cur, LyXFont const &, bool toggleall = false);
 
        ///
-       std::string getStringToIndex(LCursor & cur);
+       std::string getStringToIndex(LCursor const & cur);
 
        /// insert a character at cursor position
        void insertChar(LCursor & cur, char c);
@@ -124,12 +126,12 @@ public:
                FuncStatus & status) const;
 
        /// access to out BufferView. This should go...
-//     BufferView * bv();
-       /// access to out BufferView. This should go...
        BufferView * bv() const;
 
-       /// access to individual paragraphs
-       Paragraph & getPar(pit_type par) const;
+       /// read-only access to individual paragraph
+       Paragraph const & getPar(pit_type pit) const { return pars_[pit]; }
+       /// read-write access to individual paragraph
+       Paragraph & getPar(pit_type pit) { return pars_[pit]; }
        // Returns the current font and depth as a message.
        std::string LyXText::currentState(LCursor & cur);
 
@@ -163,8 +165,7 @@ public:
        bool setCursor(LCursor & cur, pit_type par, pos_type pos,
                       bool setfont = true, bool boundary = false);
        ///
-       void setCursor(CursorSlice &, pit_type par,
-                      pos_type pos, bool boundary = false);
+       void setCursor(CursorSlice &, pit_type par, pos_type pos);
        ///
        void setCursorIntern(LCursor & cur, pit_type par,
                 pos_type pos, bool setfont = true, bool boundary = false);
@@ -178,31 +179,43 @@ public:
        ///
        void setCursorFromCoordinates(LCursor & cur, int x, int y);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y) const;
-       ///
-       void cursorUp(LCursor & cur);
-       ///
-       void cursorDown(LCursor & cur);
-       ///
-       void cursorLeft(LCursor & cur);
-       ///
-       void cursorRight(LCursor & cur);
+       InsetBase * editXY(LCursor & cur, int x, int y);
+       /// Move cursor one line up.
+       /**
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorUp(LCursor & cur);
+       /// Move cursor one line down.
+       /**
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorDown(LCursor & cur);
+       /// Move cursor one position left
+       /**
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorLeft(LCursor & cur);
+       /// Move cursor one position right
+       /**
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorRight(LCursor & cur);
        ///
-       void cursorLeftOneWord(LCursor & cur);
+       bool cursorLeftOneWord(LCursor & cur);
        ///
-       void cursorRightOneWord(LCursor & cur);
+       bool cursorRightOneWord(LCursor & cur);
        ///
-       void cursorUpParagraph(LCursor & cur);
+       bool cursorUpParagraph(LCursor & cur);
        ///
-       void cursorDownParagraph(LCursor & cur);
+       bool cursorDownParagraph(LCursor & cur);
        ///
        void cursorHome(LCursor & cur);
        ///
        void cursorEnd(LCursor & cur);
        ///
-       void cursorPrevious(LCursor & cur);
+       bool cursorPrevious(LCursor & cur);
        ///
-       void cursorNext(LCursor & cur);
+       bool cursorNext(LCursor & cur);
        ///
        void cursorTop(LCursor & cur);
        ///
@@ -243,24 +256,12 @@ public:
        /// needed to insert the selection
        void insertStringAsParagraphs(LCursor & cur, std::string const & str);
 
-       /// Find next inset of some specified type.
-       bool gotoNextInset(LCursor & cur,
-               std::vector<InsetBase_code> const & codes,
-               std::string const & contents = std::string());
-       ///
-       void gotoInset(LCursor & cur,
-               std::vector<InsetBase_code> const & codes, bool same_content);
-       ///
-       void gotoInset(LCursor & cur, InsetBase_code code, bool same_content);
-
        /// current text width
        int width() const;
 
        /// current text heigth
        int height() const;
 
-       /// updates all counters
-       void updateCounters();
        /// Returns an inset if inset was hit, or 0 if not.
        InsetBase * checkInsetHit(int x, int y) const;
 
@@ -289,7 +290,8 @@ public:
        RowMetrics computeRowMetrics(pit_type pit, Row const & row) const;
 
        /// access to our paragraphs
-       ParagraphList & paragraphs() const;
+       ParagraphList const & paragraphs() const { return pars_; }
+       ParagraphList & paragraphs() { return pars_; }
        /// return true if this is the main text
        bool isMainText() const;
 
@@ -320,9 +322,9 @@ public:
        ///
        int descent() const;
        ///
-       int cursorX(CursorSlice const & cursor) const;
+       int cursorX(CursorSlice const & cursor, bool boundary) const;
        ///
-       int cursorY(CursorSlice const & cursor) const;
+       int cursorY(CursorSlice const & cursor, bool boundary) const;
 
        ///
        friend class LyXScreen;
@@ -336,7 +338,7 @@ public:
        LyXFont current_font;
        /// the current font
        LyXFont real_current_font;
-       /// our buffer's default layout font
+       /// our buffer's default layout font. This is textclass specific
        LyXFont defaultfont_;
        ///
        int background_color_;
@@ -349,7 +351,8 @@ public:
        ///
        ParagraphList pars_;
 
-       /// our 'outermost' Font
+       /// our 'outermost' font. This is handed down from the surrounding
+       // inset through the pi/mi parameter (pi.base.font)
        LyXFont font_;
 
        ///
@@ -372,8 +375,6 @@ private:
        /// delete double space or empty paragraphs around old cursor
        bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor const & old);
 
-       ///
-       void setCounter(Buffer const &, pit_type pit);
        ///
        void deleteWordForward(LCursor & cur);
        ///
@@ -400,9 +401,4 @@ private:
 /// return the default height of a row in pixels, considering font zoom
 int defaultRowHeight();
 
-///
-std::string expandLabel(LyXTextClass const & textclass,
-               LyXLayout_ptr const & layout, bool appendix);
-
-
 #endif // LYXTEXT_H