DocBook, InsetFloat: avoid a potential nullptr dereference when detecting the type...

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 455f19dfbef99dc17bda2a3593e48a7c286ff676..564702cd98c06102e5fe6ed22453692e330500dd 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -54,6 +54,8 @@ public:
        void read(Lexer & lex) override;
        ///
        void write(std::ostream & os) const override;
+       /// Let the inset compute and store its reference font from \c outer.
+       void setOuterFont(BufferView & bv, FontInfo const & outer) const;
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
@@ -91,9 +93,9 @@ public:
        ///
        docstring insetAsXHTML(XMLStream &, OutputParams const &,
                               XHTMLOptions) const;
-       ///
+       /// Outputs the inset as DocBook, with the given options regarding outer tags.
        void docbook(XMLStream &, OutputParams const &, XHTMLOptions opts) const;
-       ///
+       /// Outputs the whole inset as DocBook.
        void docbook(XMLStream &, OutputParams const &) const override;
        ///
        void validate(LaTeXFeatures & features) const override;
@@ -236,6 +238,10 @@ protected:
        ///
        void iterateForToc(DocIterator const & cdit, bool output_active,
                                           UpdateType utype, TocBackend & backend) const;
+       /// Outputs an inset that must be first rendered (with the given options regarding outer tags).
+       void docbookRenderAsImage(XMLStream & xs, OutputParams const & rp, XHTMLOptions opts) const;
+       /// Outputs the text of the inset with the correct DocBook tags (with the given options regarding outer tags).
+       void docbookText(XMLStream & xs, OutputParams const & rp, XHTMLOptions opts) const;
 private:
        /// Open the toc item for paragraph pit. Returns the paragraph index where
        /// it should end.