Now that Text knows its owner, use the associated Buffer access.

[features.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 1ec93b006a875d6992fd46bb3f61edfff6aac870..39cffceadee8bccf52d3a2dc8e107946efb2389e 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,7 +19,6 @@
 
 namespace lyx {
 
-class Buffer;
 class BufferParams;
 class BufferView;
 class CompletionList;
@@ -53,15 +52,14 @@ public:
        InsetText const * inset() { return owner_; }
 
        ///
-       FontInfo layoutFont(Buffer const & buffer, pit_type pit) const;
+       FontInfo layoutFont(pit_type pit) const;
        ///
-       FontInfo labelFont(Buffer const & buffer,
-               Paragraph const & par) const;
+       FontInfo labelFont(Paragraph const & par) const;
        /** Set font of character at position \p pos in paragraph \p pit.
         *  Must not be called if \p pos denotes an inset with text contents,
         *  and the inset is not allowed inside a font change (see below).
         */
-       void setCharFont(Buffer const & buffer, pit_type pit, pos_type pos,
+       void setCharFont(pit_type pit, pos_type pos,
                Font const & font, Font const & display_font);
 
        /** Needed to propagate font changes to all text cells of insets
@@ -78,7 +76,7 @@ public:
        void breakParagraph(Cursor & cur, bool inverse_logic = false);
 
        /// set layout over selection
-       void setLayout(Buffer const & buffer, pit_type start, pit_type end,
+       void setLayout(pit_type start, pit_type end,
                docstring const & layout);
        /// Set given layout to current cursor position.
        /// FIXME: replace Cursor with DocIterator.
@@ -265,15 +263,15 @@ public:
        ParagraphList const & paragraphs() const { return pars_; }
        ParagraphList & paragraphs() { return pars_; }
        /// return true if this is the main text
-       bool isMainText(Buffer const &) const;
+       bool isMainText() const;
 
        ///
-       double spacing(Buffer const & buffer, Paragraph const & par) const;
+       double spacing(Paragraph const & par) const;
        /// make a suggestion for a label
        /// FIXME: replace Cursor with DocIterator.
        docstring getPossibleLabel(Cursor const & cur) const;
        /// is this paragraph right-to-left?
-       bool isRTL(Buffer const &, Paragraph const & par) const;
+       bool isRTL(Paragraph const & par) const;
 
        ///
        bool checkAndActivateInset(Cursor & cur, bool front);
@@ -281,10 +279,10 @@ public:
        bool checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft);
 
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        /// returns true if \end_document has not been read
        /// insetPtr is the containing Inset
-       bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList, 
+       bool read(Lexer & lex, ErrorList & errorList, 
                  InsetText * insetPtr);
 
        /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
@@ -347,6 +345,11 @@ private:
        /// \param asParagraphs whether to paste as paragraphs or as lines
        void pasteString(Cursor & cur, docstring const & str,
                        bool asParagraphs);
+       ///
+       void readParToken(Paragraph & par, Lexer & lex, std::string const & token,
+               Font & font, Change & change, ErrorList & errorList);
+       ///
+       void readParagraph(Paragraph & par, Lexer & lex, ErrorList & errorList);
 
        /// Owner Inset.
        InsetText * owner_;