Rename eolString() to eol() and pass a MathTeXStream parameter

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 3faccb8c59d0abb79413477a44ac868af69e832c..9736981941b2b7d99c337ef195d85f512b344dcc 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -19,14 +19,13 @@
 
 namespace lyx {
 
-class Buffer;
 class BufferParams;
 class BufferView;
+class Change;
 class CompletionList;
 class Cursor;
 class CursorData;
 class CursorSlice;
-class DocIterator;
 class ErrorList;
 class Font;
 class FontInfo;
@@ -35,8 +34,8 @@ class FuncStatus;
 class Inset;
 class InsetText;
 class Lexer;
-class PainterInfo;
-class Spacing;
+class Paragraph;
+class ParagraphParameters;
 
 /// This class encapsulates the main text data and operations in LyX.
 /// This is more or less the private implementation of InsetText.
@@ -172,6 +171,8 @@ public:
        void getWord(CursorSlice & from, CursorSlice & to, word_location const) const;
        /// just selects the word the cursor is in
        void selectWord(Cursor & cur, word_location loc);
+       /// expands the selection to the word the cursor is in
+       void expandWordSel(Cursor & cur);
        /// select all text
        void selectAll(Cursor & cur);
 
@@ -246,6 +247,8 @@ public:
        // Dissolve the inset under cursor
        /// FIXME: replace Cursor with DocIterator.
        bool dissolveInset(Cursor & cur);
+       /// FIXME: replace Cursor with DocIterator.
+       bool splitInset(Cursor & cur);
        ///
        bool selectWordWhenUnderCursor(Cursor & cur, word_location);
        /// Change the case of the word at cursor position.
@@ -259,7 +262,7 @@ public:
         settings are given to the new one.
         This function will handle a multi-paragraph selection.
         */
-       void setParagraphs(Cursor const & cur, docstring const & arg, bool modify = false);
+       void setParagraphs(Cursor const & cur, docstring const & arg, bool merge = false);
        /// Sets parameters for current or selected paragraphs
        void setParagraphs(Cursor const & cur, ParagraphParameters const & p);
 
@@ -309,6 +312,13 @@ public:
        /// Does NOT handle undo (responsibility of the caller)
        void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
 
+       /// delete double spaces, leading spaces, and empty paragraphs
+       /// from \first to \last paragraph and \first_pos to \last_pos
+       /// Does NOT handle undo (responsibility of the caller)
+       void deleteEmptyParagraphMechanism(pit_type first, pit_type last,
+                                          pos_type first_pos, pos_type last_pos,
+                                          bool trackChanges);
+
        /// 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