Links between citations and bibliography entries were broken in XHTML

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 9c30cb90156efe1cd3ede30295c84eda04a6914b..e986d3650d947df404b10672606a1386f61914e8 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -73,9 +73,10 @@ public:
        Text & text() { return text_; }
        Text const & text() const { return text_; }
        ///
-       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;
        ///
@@ -93,6 +94,9 @@ public:
                               XHTMLOptions) const;
        ///
        void validate(LaTeXFeatures & features) 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,
@@ -146,7 +150,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(); }
        ///
@@ -164,11 +168,13 @@ public:
        /// Update the counters of this inset and of its contents
        virtual void updateBuffer(ParIterator const &, UpdateType);
        /// 
+       void setMacrocontextPositionRecursive(DocIterator const & pos);
+       ///
        void toString(odocstream &) const;
        ///
        void forToc(docstring &, size_t) const;
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const & di, bool output_active) const;
        ///
        Inset * clone() const { return new InsetText(*this); }
        ///
@@ -201,9 +207,9 @@ public:
                        size_t numlines = 5, size_t len = 80) const;
 
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected: