adjust

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index b5db10f07e5ac04e0915d81cce14b03c721898c4..b542c36a15b5fec7ea81e487d81eb594ab26614b 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,11 +24,13 @@ class BufferView;
 class CursorSlice;
 class DocIterator;
 class ErrorList;
+class Font;
 class FuncRequest;
 class FuncStatus;
 class Inset;
 class Color_color;
 class Cursor;
+class Lexer;
 class PainterInfo;
 class Spacing;
 
@@ -52,11 +46,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;
        ///
@@ -67,7 +56,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).
@@ -76,11 +65,11 @@ 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
-       void breakParagraph(Cursor & cur, bool keep_layout = false);
+       void breakParagraph(Cursor & cur, bool inverse_logic = false);
 
        /// set layout over selection
        void setLayout(Buffer const & buffer, pit_type start, pit_type end,
@@ -106,7 +95,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);
 
@@ -168,8 +157,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;
@@ -246,9 +233,6 @@ 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_; }
@@ -262,14 +246,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);
@@ -291,20 +267,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: