Cosmetics.

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 88295d2ba6ca96c50417288e1dd44bc758feb6e4..a28353c2b07537b17c7f5dda8cc78cd0f320b8de 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -14,16 +14,8 @@
 #ifndef TEXT_H
 #define TEXT_H
 
-#include "Bidi.h"
-#include "DispatchResult.h"
-#include "Font.h"
-#include "Layout.h"
-#include "lyxlayout_ptr_fwd.h"
 #include "ParagraphList.h"
 
-#include <iosfwd>
-
-
 namespace lyx {
 
 class Buffer;
@@ -32,13 +24,13 @@ class BufferView;
 class CursorSlice;
 class DocIterator;
 class ErrorList;
+class Font;
 class FuncRequest;
 class FuncStatus;
 class Inset;
 class Color_color;
 class Cursor;
 class PainterInfo;
-class Row;
 class Spacing;
 
 
@@ -53,11 +45,6 @@ public:
        // count as empty.
        bool empty() const;
 
-       ///
-       Font getFont(Buffer const & buffer, Paragraph const & par,
-               pos_type pos) const;
-       ///
-       void applyOuterFont(Buffer const & buffer, Font &) const;
        ///
        Font getLayoutFont(Buffer const & buffer, pit_type pit) const;
        ///
@@ -68,7 +55,7 @@ public:
         *  and the inset is not allowed inside a font change (see below).
         */
        void setCharFont(Buffer const & buffer, pit_type pit, pos_type pos,
-               Font const & font);
+               Font const & font, Font const & display_font);
 
        /** Needed to propagate font changes to all text cells of insets
         *  that are not allowed inside a font change (bug 1973).
@@ -77,7 +64,7 @@ public:
         *  FIXME: This should be removed, see documentation of noFontChange
         *  in insetbase.h
         */
-       void setInsetFont(Buffer const & buffer, pit_type pit, pos_type pos,
+       void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos,
                Font const & font, bool toggleall = false);
 
        /// what you expect when pressing \<enter\> at cursor position
@@ -107,7 +94,7 @@ public:
        /// FIXME: replace Cursor with DocIterator.
        void setFont(Cursor & cur, Font const &, bool toggleall = false);
        /// Set font from \p begin to \p end and rebreak.
-       void setFont(Buffer const & buffer, CursorSlice const & begin,
+       void setFont(BufferView const & bv, CursorSlice const & begin,
                CursorSlice const & end, Font const &,
                bool toggleall = false);
 
@@ -169,8 +156,6 @@ public:
        ///
        void setCursorIntern(Cursor & cur, pit_type par,
                 pos_type pos, bool setfont = true, bool boundary = false);
-       ///
-       void setCurrentFont(Cursor & cur);
 
        ///
        void recUndo(Cursor & cur, pit_type first, pit_type last) const;
@@ -191,17 +176,15 @@ public:
        bool cursorLeftOneWord(Cursor & cur);
        ///
        bool cursorRightOneWord(Cursor & cur);
+       /// Delete from cursor up to the end of the current or next word.
+       void deleteWordForward(Cursor & cur);
+       /// Delete from cursor to start of current or prior word.
+       void deleteWordBackward(Cursor & cur);
        ///
        bool cursorUpParagraph(Cursor & cur);
        ///
        bool cursorDownParagraph(Cursor & cur);
        ///
-       /// FIXME: move to TextMetrics.
-       bool cursorHome(Cursor & cur);
-       ///
-       /// FIXME: move to TextMetrics.
-       bool cursorEnd(Cursor & cur);
-       ///
        bool cursorTop(Cursor & cur);
        ///
        bool cursorBottom(Cursor & cur);
@@ -249,22 +232,12 @@ public:
        /// FIXME: replace Cursor with DocIterator.
        void insertStringAsParagraphs(Cursor & cur, docstring const & str);
 
-       /// return the color of the canvas
-       Color_color backgroundColor() const;
-
        /// access to our paragraphs
        ParagraphList const & paragraphs() const { return pars_; }
        ParagraphList & paragraphs() { return pars_; }
        /// return true if this is the main text
        bool isMainText(Buffer const &) const;
 
-       /// is this row the last in the text?
-       /// FIXME: move to TextMetrics.
-       bool isLastRow(pit_type pit, Row const & row) const;
-       /// is this row the first in the text?
-       /// FIXME: move to TextMetrics.
-       bool isFirstRow(pit_type pit, Row const & row) const;
-
        ///
        double spacing(Buffer const & buffer, Paragraph const & par) const;
        /// make a suggestion for a label
@@ -272,14 +245,6 @@ public:
        docstring getPossibleLabel(Cursor & cur) const;
        /// is this paragraph right-to-left?
        bool isRTL(Buffer const &, Paragraph const & par) const;
-       /// is this position in the paragraph right-to-left?
-       bool isRTL(Buffer const & buffer, CursorSlice const & sl, bool boundary) const;
-       /// is between pos-1 and pos an RTL<->LTR boundary?
-       bool isRTLBoundary(Buffer const & buffer, Paragraph const & par,
-         pos_type pos) const;
-       /// would be a RTL<->LTR boundary between pos and the given font?
-       bool isRTLBoundary(Buffer const & buffer, Paragraph const & par,
-         pos_type pos, Font const & font) const;
 
        ///
        bool checkAndActivateInset(Cursor & cur, bool front);
@@ -301,20 +266,9 @@ public:
        void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
 
 public:
-       /// the current font settings
-       Font current_font;
-       /// the current font
-       Font real_current_font;
-       ///
-       int background_color_;
-
        ///
        ParagraphList pars_;
 
-       /// our 'outermost' font. This is handed down from the surrounding
-       // inset through the pi/mi parameter (pi.base.font)
-       Font font_;
-
        ///
        bool autoBreakRows_;
 private:
@@ -331,13 +285,6 @@ private:
        bool backspacePos0(Cursor & cur);
        /// handle the case where bibitems were deleted
        bool handleBibitems(Cursor & cur);
-
-       ///
-       void deleteWordForward(Cursor & cur);
-       ///
-       void deleteWordBackward(Cursor & cur);
-       ///
-       void deleteLineForward(Cursor & cur);
        ///
        void charInserted();
        /// set 'number' font property