Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index c4d3f9768189992743aa6404885b11547a70bacf..b4b806789a1717c0358d2e71ec6821e293749057 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -39,18 +39,14 @@ class DocumentClass;
 class Inset;
 class InsetBibitem;
 class LaTeXFeatures;
-class Inset_code;
 class InsetList;
 class Language;
 class Layout;
 class Font;
-class Font_size;
 class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
-class TexRow;
-class Toc;
 class WordLangTuple;
 class XHTMLStream;
 class otexstream;
@@ -155,6 +151,10 @@ public:
        ///
        void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
                bool output_active) const;
+       /// set the buffer flag if there are changes in the paragraph
+       void addChangesToBuffer(Buffer const & buf) const;
+       ///
+       bool isChangeUpdateRequired() const;
        ///
        Language const * getParLanguage(BufferParams const &) const;
        ///
@@ -181,7 +181,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 &,
@@ -356,9 +357,6 @@ public:
        char_type getUChar(BufferParams const &, pos_type pos) const;
        /// pos <= size() (there is a dummy font change at the end of each par)
        void setFont(pos_type pos, Font const & font);
-       /// Returns the height of the highest font in range
-       FontSize highestFontInRange(pos_type startpos,
-                                       pos_type endpos, FontSize def_size) const;
        ///
        void insert(pos_type pos, docstring const & str,
                    Font const & font, Change const & change);
@@ -483,10 +481,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()