Some things did not need to be mutable after all

[lyx.git] / src / insets / InsetText.h

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index e986d3650d947df404b10672606a1386f61914e8..28340193c7705d814cf5e8f6f096258e9df9bf46 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -17,8 +17,6 @@
 #include "ColorCode.h"
 #include "Text.h"
 
-#include "insets/InsetLayout.h"
-
 namespace lyx {
 
 class CompletionList;
@@ -65,6 +63,8 @@ public:
        bool editable() const { return true; }
        ///
        bool canTrackChanges() const { return true; }
+       /// Rely on RowPainter to draw the cue of inline insets.
+       bool canPaintChange(BufferView const &) const { return allowMultiPar(); }
        ///
        InsetText * asInsetText() { return this; }
        ///
@@ -106,10 +106,6 @@ public:
        ///
        void setText(docstring const &, Font const &, bool trackChanges);
        ///
-       void setAutoBreakRows(bool);
-       ///
-       bool getAutoBreakRows() const { return text_.autoBreakRows_; }
-       ///
        void setDrawFrame(bool);
        ///
        ColorCode frameColor() const;
@@ -159,11 +155,14 @@ public:
        virtual bool allowMultiPar() const { return getLayout().isMultiPar(); }
        ///
        /// should paragraphs be forced to use the empty layout?
-       virtual bool forcePlainLayout(idx_type = 0) const 
+       virtual bool forcePlainLayout(idx_type = 0) const
                { return getLayout().forcePlainLayout(); }
        /// should the user be allowed to customize alignment, etc.?
-       virtual bool allowParagraphCustomization(idx_type = 0) const 
+       virtual bool allowParagraphCustomization(idx_type = 0) const
                { return getLayout().allowParagraphCustomization(); }
+       /// should paragraphs be forced to use a local font language switch?
+       virtual bool forceLocalFontSwitch() const
+               { return getLayout().forcelocalfontswitch(); }
 
        /// Update the counters of this inset and of its contents
        virtual void updateBuffer(ParIterator const &, UpdateType);
@@ -172,9 +171,10 @@ public:
        ///
        void toString(odocstream &) const;
        ///
-       void forToc(docstring &, size_t) const;
+       void forOutliner(docstring &, size_t const, bool const) const;
        ///
-       void addToToc(DocIterator const & di, bool output_active) const;
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype) const;
        ///
        Inset * clone() const { return new InsetText(*this); }
        ///
@@ -201,10 +201,14 @@ public:
        /// returns the text to be used as tooltip
        /// \param prefix: a string that will preced the tooltip,
        /// e.g., "Index: ".
-       /// \param numlines: the number of lines in the tooltip
-       /// \param len: length of those lines
+       /// \param len: length of the resulting string
+       /// NOTE This routine is kind of slow. It's fine to use it within the 
+       /// GUI, but definitely do not try to use it in updateBuffer or anything
+       /// of that sort. (Note: unnecessary internal copies have been removed
+       /// since the previous note. The efficiency would have to be assessed
+       /// again by profiling.)
        docstring toolTipText(docstring prefix = empty_docstring(),
-                       size_t numlines = 5, size_t len = 80) const;
+                             size_t len = 400) const;
 
        ///
        std::string contextMenu(BufferView const &, int, int) const;
@@ -219,15 +223,16 @@ protected:
        docstring getCaptionText(OutputParams const &) const;
        ///
        docstring getCaptionHTML(OutputParams const &) const;
+       ///
+       void iterateForToc(DocIterator const & cdit, bool output_active,
+                                          UpdateType utype) const;
 private:
        ///
        bool drawFrame_;
        ///
        ColorCode frame_color_;
        ///
-       mutable pit_type old_pit;
-       ///
-       mutable Text text_;
+       Text text_;
 };