Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index ee1401306fe92586aeac63ec816094245dbcfa26..a28d233fc2cb0edc6a35ce567e4e3a79de4ef0c6 100644 (file)
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -28,7 +28,7 @@ public:
                ///
                std::string short_gui_name;
        };
-       static type_info types[];
+       static const type_info types[];
        ///
        static int getType(std::string const & name);
        ///
@@ -45,15 +45,18 @@ public:
        docstring toolTip(BufferView const &, int, int) const
                { return tooltip_; }
        ///
+  docstring getTOCString() const;
+       ///
        bool hasSettings() const { return true; }
        ///
        InsetCode lyxCode() const { return REF_CODE; }
        ///
        DisplayType display() const { return Inline; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       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;
        ///
@@ -61,13 +64,14 @@ public:
        /// 
        void toString(odocstream &) const;
        ///
-       void forToc(docstring &, size_t) const;
+       void forOutliner(docstring &, size_t const, bool const) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
        void updateBuffer(ParIterator const & it, UpdateType);
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype) const;
        ///
        bool forceLTR() const { return true; }
        //@}
@@ -107,7 +111,7 @@ private:
        /// \param argument for reference command
        /// \param prefix of the label (before :)
        docstring getFormattedCmd(docstring const & ref, docstring & label,
-                       docstring & prefix) const;
+                       docstring & prefix, docstring const & caps) const;
 
        ///
        mutable docstring screen_label_;