Circumvent odd stmary font metrics (part of #9990).

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index b18f8a5f02ecefdd32a72f313cc9e987c173aacd..96071faf7dd7e716bef8622c7440f9a9654c865c 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -74,7 +74,7 @@ std::string insetName(InsetCode);
 /// Eg, insetDisplayName(BRANCH_CODE) == _("Branch")
 docstring insetDisplayName(InsetCode);
 ///
-static int const TOC_ENTRY_LENGTH = 40;
+static int const TOC_ENTRY_LENGTH = 120;
 
 /// Common base class to all insets
 
@@ -108,8 +108,6 @@ public:
 
        /// change associated Buffer
        virtual void setBuffer(Buffer & buffer);
-       /// remove the buffer reference
-       void resetBuffer() { setBuffer( *static_cast<Buffer *>(0)); }
        /// retrieve associated Buffer
        virtual Buffer & buffer();
        virtual Buffer const & buffer() const;
@@ -263,10 +261,6 @@ public:
        virtual row_type row(idx_type) const { return 0; }
        /// cell index corresponding to row and column;
        virtual idx_type index(row_type row, col_type col) const;
-       /// any additional x-offset when drawing a cell?
-       virtual int cellXOffset(idx_type) const { return 0; }
-       /// any additional y-offset when drawing a cell?
-       virtual int cellYOffset(idx_type) const { return 0; }
        /// number of embedded cells
        virtual size_t nargs() const { return 0; }
        /// number of rows in gridlike structures
@@ -333,8 +327,9 @@ public:
        virtual void toString(odocstream &) const {}
        /// Appends a potentially abbreviated version of the inset to
        /// \param str. Intended for use by the TOC.
-       virtual void forToc(docstring & str,
-                           size_t maxlen = TOC_ENTRY_LENGTH) const;
+       virtual void forOutliner(docstring & str,
+                                                        size_t const maxlen = TOC_ENTRY_LENGTH,
+                                                        bool const shorten = true) const;
 
        /// can the contents of the inset be edited on screen ?
        // true for InsetCollapsables (not ButtonOnly) (not InsetInfo), InsetText
@@ -404,6 +399,9 @@ public:
                { return true; }
        /// Is the width forced to some value?
        virtual bool hasFixedWidth() const { return false; }
+       /// if this inset has paragraphs should they be forced to use a
+       /// local font language switch?
+       virtual bool forceLocalFontSwitch() const { return false; }
 
        /// Is the content of this inset part of the output document?
        virtual bool producesOutput() const { return true; }
@@ -437,8 +435,8 @@ public:
        /// is this equivalent to a space (which is BTW different from
        /// a line separator)?
        virtual bool isSpace() const { return false; }
-       /// is this an expandible space (rubber length)?
-       virtual bool isStretchableSpace() const { return false; }
+       /// does this inset try to use all available space (like \\hfill does)?
+       virtual bool isHfill() const { return false; }
 
        enum DisplayType {
                Inline = 0,
@@ -496,7 +494,15 @@ public:
        /// Add an entry to the TocList
        /// Pass a DocIterator that points at the paragraph containing
        /// the inset
-       virtual void addToToc(DocIterator const & /* di */, bool /* output_active */) const {}
+       ///
+       /// \param output_active : is the inset active or is it in an inactive
+       /// branch or a note?
+       ///
+       /// \param utype : is the toc being generated for use by the output
+       /// routines?
+       virtual void addToToc(DocIterator const & /* di */,
+                                                 bool /* output_active */,
+                                                 UpdateType /* utype*/) const {}
        /// Collect BibTeX information
        virtual void collectBibKeys(InsetIterator const &) const {}
        /// Update the counters of this inset and of its contents.