Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index e2cbc257c0f91544a1fc67c59ec5bf475cfa1c4e..f810a06fb1a023596105bd969742a87ddee701a4 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -21,7 +21,6 @@
 
 namespace lyx {
 
-class BufferParams;
 class CompletionList;
 class CursorSlice;
 class Dimension;
@@ -43,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 &);
        ///
@@ -80,7 +79,21 @@ 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;
+       // FIXME XHTMLStream to be removed
+       docstring xhtml(odocstream &, OutputParams const &) const 
+               { return docstring (); }
        ///
        void validate(LaTeXFeatures & features) const;
 
@@ -116,15 +129,15 @@ public:
        /// set the change for the entire inset
        void setChange(Change const & change);
        /// accept the changes within the inset
-       void acceptChanges(BufferParams const & bparams);
+       void acceptChanges();
        /// reject the changes within the inset
-       void rejectChanges(BufferParams const & bparams);
+       void rejectChanges();
 
        /// append text onto the existing text
        void appendParagraphs(ParagraphList &);
 
        ///
-       void addPreview(graphics::PreviewLoader &) const;
+       void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
 
        ///
        void edit(Cursor & cur, bool front, EntryDirection entry_from);
@@ -154,7 +167,7 @@ public:
                { return getLayout().allowParagraphCustomization(); }
 
        /// Update the counters of this inset and of its contents
-       virtual void updateLabels(ParIterator const &);
+       virtual void updateLabels(ParIterator const &, bool);
        /// the string that is passed to the TOC
        void tocString(odocstream &) const;
        ///
@@ -209,6 +222,9 @@ private:
        mutable Text text_;
 };
 
+
+InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2);
+
 } // namespace lyx
 
 #endif