Fix empty width support for Box inset

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 4fb9fc35d8804c3fcf7fc2f813955d05fb7da863..d16d41a249fe74cf0c2b2063415f0682042ba274 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;
@@ -75,7 +73,8 @@ public:
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
@@ -94,8 +93,8 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        
-       /// return the optional argument(s) only
-       void getOptArg(otexstream & os, OutputParams const &) const;
+       /// return the argument(s) only
+       void getArgs(otexstream & os, OutputParams const &, bool const post = false) const;
 
        /// return x,y of given position relative to the inset's baseline
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
@@ -149,7 +148,7 @@ public:
        ///
        ParagraphList const & paragraphs() const;
        ///
-       bool insetAllowed(InsetCode) const { return !getLayout().isPassThru(); }
+       bool insetAllowed(InsetCode) const;
        ///
        bool allowSpellCheck() const { return getLayout().spellcheck() && !getLayout().isPassThru(); }
        ///
@@ -173,7 +172,7 @@ public:
        ///
        void forToc(docstring &, size_t) const;
        ///
-       void addToToc(DocIterator const &) const;
+       void addToToc(DocIterator const & di, bool output_active) const;
        ///
        Inset * clone() const { return new InsetText(*this); }
        ///
@@ -224,8 +223,6 @@ private:
        ///
        ColorCode frame_color_;
        ///
-       mutable pit_type old_pit;
-       ///
        mutable Text text_;
 };