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).
+ * that are not allowed inside a font change (bugs 1973, 6919).
* Must not be called if \p pos denotes an ordinary character or an
* inset that is alowed inside a font change.
- * FIXME: This should be removed, see documentation of noFontChange
- * in insetbase.h
*/
void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos,
- Font const & font, bool toggleall = false);
+ Font const & font);
/// what you expect when pressing \<enter\> at cursor position
/// \param inverse_logic if false, the same layout is set for the
/// 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
void setFont(Cursor & cur, Font const &, bool toggleall = false);
/// Set font from \p begin to \p end and rebreak.
void setFont(BufferView const & bv, CursorSlice const & begin,
- CursorSlice const & end, Font const &,
- bool toggleall = false);
+ CursorSlice const & end, Font const &);
///
void toggleFree(Cursor & cur, Font const &, bool toggleall = false);
docstring asString(pit_type beg, pit_type end,
int options = AS_STR_NONE) const;
+ /// truncates str to maxlenwith an ellipsis and replaces the characters '\n'
+ /// and '\t' with spaces
+ static void shortenForOutliner(docstring & str, size_t const maxlen);
+
+ /// Appends a possibly abbreviated representation of our text to \param os,
+ /// where \param maxlen defines the maximum size of \param os. If \param
+ /// shorten is true, then os is shortened as above.
+ void forOutliner(docstring & os, size_t maxlen, bool shorten = true) const;
+ /// Appends a possibly abbreviated representation of our text, from
+ /// start to end, to \param os, where \param maxlen defines the
+ /// maximum size of \param os. Omits the label of the first paragraph.
+ void forOutliner(docstring & os, size_t maxlen, pit_type start, pit_type end,
+ bool shorten = true) const;
+
/// insert a character at cursor position
/// FIXME: replace Cursor with DocIterator.
void insertChar(Cursor & cur, char_type c);
void rejectChanges();
/// returns true if par was empty and was removed
- bool setCursor(Cursor & cur, pit_type par, pos_type pos,
+ bool setCursor(Cursor & cur, pit_type pit, pos_type pos,
bool setfont = true, bool boundary = false);
///
- void setCursor(CursorSlice &, pit_type par, pos_type pos);
- ///
- void setCursorIntern(Cursor & cur, pit_type par,
+ void setCursorIntern(Cursor & cur, pit_type pit,
pos_type pos, bool setfont = true, bool boundary = false);
- ///
- void recUndo(Cursor & cur, pit_type first, pit_type last) const;
- ///
- void recUndo(Cursor & cur, pit_type first) const;
-
/// Move cursor one position backwards
/**
* Returns true if an update is needed after the move.
///
bool cursorVisRightOneWord(Cursor & cur);
/// Delete from cursor up to the end of the current or next word.
- void deleteWordForward(Cursor & cur);
+ /// Use force to skip the confirmDeletion check.
+ void deleteWordForward(Cursor & cur, bool force = false);
/// Delete from cursor to start of current or prior word.
- void deleteWordBackward(Cursor & cur);
+ void deleteWordBackward(Cursor & cur, bool force = false);
///
bool cursorUpParagraph(Cursor & cur);
///
///
bool selectWordWhenUnderCursor(Cursor & cur, word_location);
/// Change the case of the word at cursor position.
- void changeCase(Cursor & cur, TextCase action);
+ void changeCase(Cursor & cur, TextCase action, bool partial);
/// Transposes the character at the cursor with the one before it
void charsTranspose(Cursor & cur);
/* these things are for search and replace */
/// needed to insert the selection
- void insertStringAsLines(DocIterator const & dit, docstring const & str,
+ void insertStringAsLines(Cursor & cur, docstring const & str,
Font const & font);
/// needed to insert the selection
- void insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+ void insertStringAsParagraphs(Cursor & cur, docstring const & str,
Font const & font);
/// access to our paragraphs
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.
/// 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;
///
bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/);
///
docstring completionPrefix(Cursor const & cur) const;
- /// for the environments
- pit_type depthHook(pit_type par, depth_type depth) const;
- ///
- pit_type outerHook(pit_type par) const;
+ /// find a paragraph before \p par with the given \p depth, if such
+ /// a paragraph cannot be found, \p par is returned
+ pit_type depthHook(pit_type pit, depth_type depth) const;
+ /// find a paragraph before \p par with depth less than the
+ /// depth of \p par. If such paragraph cannot be found because
+ /// \p par already has depth 0, lastpar + 1 is returned. If
+ /// such paragraph cannot be found because there isn't a par
+ /// with less depth before this one, \p par is returned.
+ pit_type outerHook(pit_type pit) const;
/// Is it the first par with same depth and layout?
- bool isFirstInSequence(pit_type par) const;
+ bool isFirstInSequence(pit_type pit) const;
+ /// Return the last paragraph with same depth and layout, or a strictly
+ /// greater depth
+ pit_type lastInSequence(pit_type pit) const;
+ /// Is this paragraph in the table of contents?
+ int getTocLevel(pit_type pit) 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;
+ Font const outerFont(pit_type pit_offset) const;
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);
///
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_;
///
ParagraphList pars_;
- ///
- bool autoBreakRows_;
/// position of the text in the buffer.
DocIterator macrocontext_position_;
- ///
- unsigned int undo_counter_;
};
///
void breakParagraphConservative(BufferParams const & bparams,
ParagraphList & paragraphs,
- pit_type par,
+ pit_type pit,
pos_type pos);
/**
* Be careful, this doesent make any check at all.
*/
void mergeParagraph(BufferParams const & bparams,
- ParagraphList & paragraphs, pit_type par);
+ ParagraphList & paragraphs, pit_type pit);
/// accept the changes within the complete ParagraphList
void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
+/// reject the changes within the complete ParagraphList
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams);
+
} // namespace lyx
#endif // TEXT_H
projects / lyx.git / blobdiff