X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=d0ed94bfb0291cbc830aace8bb43940b5d570d25;hb=8fd223146b02c83fbe78ff361590c9578a7d0454;hp=587612d76b3c5a7f64711ed55cba79648e8fbe25;hpb=13cb7da11d04bba9fb4af5e538ca2332a5341b71;p=lyx.git diff --git a/src/Paragraph.h b/src/Paragraph.h index 587612d76b..d0ed94bfb0 100644 --- a/src/Paragraph.h +++ b/src/Paragraph.h @@ -49,7 +49,6 @@ class MetricsInfo; class OutputParams; class PainterInfo; class ParagraphParameters; -class TexRow; class Toc; class WordLangTuple; class XHTMLStream; @@ -76,7 +75,7 @@ public: return first == s.first && last == s.last; } - inline bool inside(pos_type p) const + inline bool contains(pos_type p) const { return first <= p && p <= last; } @@ -90,15 +89,15 @@ public: inline FontSpan intersect(FontSpan const & f) const { FontSpan result = FontSpan(); - if (inside(f.first)) + if (contains(f.first)) result.first = f.first; - else if (f.inside(first)) + else if (f.contains(first)) result.first = first; else return result; - if (inside(f.last)) + if (contains(f.last)) result.last = f.last; - else if (f.inside(last)) + else if (f.contains(last)) result.last = last; return result; } @@ -181,7 +180,8 @@ public: int options = AS_STR_NONE, const OutputParams *runparams = 0) const; /// - void forOutliner(docstring &, size_t maxlen) const; + void forOutliner(docstring &, size_t const maxlen, + bool const shorten = true) const; /// void write(std::ostream &, BufferParams const &, @@ -404,6 +404,8 @@ public: bool isInset(pos_type pos) const; /// bool isNewline(pos_type pos) const; + /// + bool isEnvSeparator(pos_type pos) const; /// return true if the char is a word separator bool isSeparator(pos_type pos) const; /// @@ -429,8 +431,6 @@ public: /// return true if we allow this par to stay empty bool allowEmpty() const; /// - char_type transformChar(char_type c, pos_type pos) const; - /// ParagraphParameters & params(); /// ParagraphParameters const & params() const; @@ -483,10 +483,9 @@ public: /// \return true if one of the tested positions is misspelled. bool isMisspelled(pos_type pos, bool check_boundary = false) const; - /// \return true if both positions are inside the same - /// spell range - i.e. the same word. - /// use it for positions inside misspelled range only. - bool isSameSpellRange(pos_type pos1, pos_type pos2) const; + /// \return the spell range (misspelled area) around position. + /// Range is empty if word at position is correctly spelled. + FontSpan const & getSpellRange(pos_type pos) const; /// spell check of whole paragraph /// remember results until call of requestSpellCheck()