Math.lyx, Tutorial.lyx: fix some typos spotted by a user

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index a4c83f0b913873c146bfb47766d85fb8aa1e2e36..b1d1502393f0baf9f51e7e51917fa52cf9cb721f 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -73,7 +73,7 @@ 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;
        ///
@@ -93,6 +93,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 +149,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(); }
        ///
@@ -163,10 +166,14 @@ public:
 
        /// Update the counters of this inset and of its contents
        virtual void updateBuffer(ParIterator const &, UpdateType);
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       /// 
+       void setMacrocontextPositionRecursive(DocIterator const & pos);
        ///
-       void addToToc(DocIterator const &);
+       void toString(odocstream &) const;
+       ///
+       void forToc(docstring &, size_t) const;
+       ///
+       void addToToc(DocIterator const &) const;
        ///
        Inset * clone() const { return new InsetText(*this); }
        ///
@@ -190,9 +197,18 @@ public:
        bool insertCompletion(Cursor & cur, docstring const & s, bool finished);
        ///
        void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const;
+       /// returns the text to be used as tooltip
+       /// \param prefix: a string that will preced the tooltip,
+       /// e.g., "Index: ".
+       /// \param numlines: the number of lines in the tooltip
+       /// \param len: length of those lines
+       docstring toolTipText(docstring prefix = empty_docstring(),
+                       size_t numlines = 5, size_t len = 80) const;
 
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenu(BufferView const &, int, int) const;
+       ///
+       std::string contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected: