s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 399d48db5000c3cdf97f63a48c5094212e395f15..a4c83f0b913873c146bfb47766d85fb8aa1e2e36 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -42,7 +42,7 @@ public:
        /// \param useplain whether to use the plain layout
        /// This is needed because we cannot call the virtual function
        /// usePlainLayout() from within the constructor.
-       explicit InsetText(Buffer const & buffer, UsePlain type = DefaultLayout);
+       explicit InsetText(Buffer * buffer, UsePlain type = DefaultLayout);
        ///
        InsetText(InsetText const &);
        ///
@@ -79,7 +79,18 @@ public:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       ///
+       enum XHTMLOptions {
+               JustText = 0,
+               WriteOuterTag = 1,
+               WriteLabel = 2,
+               WriteInnerTag = 4,
+               WriteEverything = 7
+       };
+       ///
+       docstring insetAsXHTML(XHTMLStream &, OutputParams const &, 
+                              XHTMLOptions) const;
        ///
        void validate(LaTeXFeatures & features) const;
 
@@ -101,8 +112,6 @@ public:
        ///
        void setFrameColor(ColorCode);
        ///
-       bool showInsetDialog(BufferView *) const;
-       ///
        Text * getText(int i) const {
                return (i == 0) ? const_cast<Text*>(&text_) : 0;
        }
@@ -123,7 +132,7 @@ public:
        void appendParagraphs(ParagraphList &);
 
        ///
-       void addPreview(graphics::PreviewLoader &) const;
+       void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
 
        ///
        void edit(Cursor & cur, bool front, EntryDirection entry_from);
@@ -137,9 +146,9 @@ public:
        ///
        ParagraphList const & paragraphs() const;
        ///
-       bool insetAllowed(InsetCode) const { return true; }
-       /// Allow spellchecking, except for insets with latex_language
-       bool allowSpellCheck() const { return !getLayout().isPassThru(); }
+       bool insetAllowed(InsetCode) const { return !getLayout().isPassThru(); }
+       ///
+       bool allowSpellCheck() const { return getLayout().spellcheck() && !getLayout().isPassThru(); }
        ///
        virtual bool isMacroScope() const { return false; }
        ///
@@ -153,7 +162,7 @@ public:
                { return getLayout().allowParagraphCustomization(); }
 
        /// Update the counters of this inset and of its contents
-       virtual void updateLabels(ParIterator const &);
+       virtual void updateBuffer(ParIterator const &, UpdateType);
        /// the string that is passed to the TOC
        void tocString(odocstream &) const;
        ///
@@ -194,10 +203,6 @@ protected:
        ///
        docstring getCaptionHTML(OutputParams const &) const;
 private:
-       ///
-       void initParagraphs(UsePlain type);
-       ///
-       void setParagraphOwner();
        ///
        bool drawFrame_;
        ///
@@ -208,6 +213,9 @@ private:
        mutable Text text_;
 };
 
+
+InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2);
+
 } // namespace lyx
 
 #endif