Fix bug 886 and others not reported related with the document paper size.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index b4bef7289d78f73f36db04a44d7b504f20242921..504366885db4df7b156e6f3dc7fde2815052aa9f 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);
@@ -178,7 +180,7 @@ public:
        ///
        void setCursorFromCoordinates(LCursor & cur, int x, int y);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y) const;
+       InsetBase * editXY(LCursor & cur, int x, int y);
        /// Move cursor one line up.
        /**
         * Returns true if an update is needed after the move.
@@ -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_;
 
        ///