Store ASCII data in std::string

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index fb534585ee3010ad81809b5d0e405e7fa77927e7..e6759ef4361887018ed5ccceabfd0ed3e5086a67 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -82,8 +82,8 @@ public:
        /// set layout over selection
        void setLayout(pit_type start, pit_type end,
                docstring const & layout);
-       /// Set given layout to current cursor position.
-       /// FIXME: replace Cursor with DocIterator.
+       /// Set given layout to current cursor position or selection.
+       /// Handles undo.
        void setLayout(Cursor & cur, docstring const & layout);
 
        /// what type of depth change to make
@@ -130,7 +130,7 @@ public:
        /// if \param os is longer than maxlen chars.
        /// if \param maxlen is passed as 0, then it is ignored. (In fact,
        /// it is reset to the maximum value for size_t.)
-       void forToc(docstring & os, size_t maxlen, bool shorten = true) const;
+       void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
 
        /// insert a character at cursor position
        /// FIXME: replace Cursor with DocIterator.
@@ -293,7 +293,7 @@ public:
        void write(std::ostream & os) const;
        /// returns true if \end_document has not been read
        /// insetPtr is the containing Inset
-       bool read(Lexer & lex, ErrorList & errorList, 
+       bool read(Lexer & lex, ErrorList & errorList,
                  InsetText * insetPtr);
 
        /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
@@ -309,7 +309,7 @@ public:
 
        /// To resolve macros properly the texts get their DocIterator.
        /// Every macro definition is stored with its DocIterator
-       /// as well. Only those macros with a smaller iterator become 
+       /// as well. Only those macros with a smaller iterator become
        /// visible in a paragraph.
        DocIterator macrocontextPosition() const;
        ///
@@ -334,6 +334,8 @@ public:
        pit_type outerHook(pit_type par) const;
        /// Is it the first par with same depth and layout?
        bool isFirstInSequence(pit_type par) const;
+       /// Is this paragraph in the table of contents?
+       int getTocLevel(pit_type par) const;
        /// Get the font of the "environment" of paragraph \p par_offset in \p pars.
        /// All font changes of the paragraph are relative to this font.
        Font const outerFont(pit_type par_offset) const;
@@ -342,10 +344,6 @@ private:
        /// The InsetText owner shall have access to everything.
        friend class InsetText;
 
-       /// return past-the-last paragraph influenced by a layout
-       /// change on pit
-       pit_type undoSpan(pit_type pit);
-
        // fix the cursor `cur' after a characters has been deleted at `where'
        // position. Called by deleteEmptyParagraphMechanism
        static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
@@ -373,8 +371,8 @@ private:
        ///
        void readParagraph(Paragraph & par, Lexer & lex, ErrorList & errorList);
        /// Set Label Width string to all paragraphs of the same layout
-    /// and depth in a sequence.
-       void setLabelWidthStringToSequence(pit_type const par_offset, docstring const & s);
+       /// and depth in a sequence.
+       void setLabelWidthStringToSequence(Cursor const & cur, docstring const & s);
 
        /// Owner Inset.
        InsetText * owner_;