tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 421870b0e6b2705e289e68a76c0dfb81053536e3..0110adf867a999ea9792f7bd6b0a207d502124ff 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;
        ///
@@ -91,9 +91,6 @@ public:
        ///
        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;
 
@@ -115,8 +112,6 @@ public:
        ///
        void setFrameColor(ColorCode);
        ///
-       bool showInsetDialog(BufferView *) const;
-       ///
        Text * getText(int i) const {
                return (i == 0) ? const_cast<Text*>(&text_) : 0;
        }
@@ -152,8 +147,8 @@ public:
        ParagraphList const & paragraphs() const;
        ///
        bool insetAllowed(InsetCode) const { return !getLayout().isPassThru(); }
-       /// Allow spellchecking, except for insets with latex_language
-       bool allowSpellCheck() const { return !getLayout().isPassThru(); }
+       ///
+       bool allowSpellCheck() const { return getLayout().spellcheck() && !getLayout().isPassThru(); }
        ///
        virtual bool isMacroScope() const { return false; }
        ///
@@ -167,11 +162,15 @@ public:
                { return getLayout().allowParagraphCustomization(); }
 
        /// Update the counters of this inset and of its contents
-       virtual void updateLabels(ParIterator const &);
-       /// the string that is passed to the TOC
-       void tocString(odocstream &) const;
+       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 &) const;
        ///
        Inset * clone() const { return new InsetText(*this); }
        ///
@@ -195,9 +194,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:
@@ -208,10 +216,6 @@ protected:
        ///
        docstring getCaptionHTML(OutputParams const &) const;
 private:
-       ///
-       void initParagraphs(UsePlain type);
-       ///
-       void setParagraphOwner();
        ///
        bool drawFrame_;
        ///