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

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

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 4100a631ccd6261180113112280f8687f0829f1d..6588bc61b3e81a86a9e5cf4bda002783875b4a35 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -65,7 +65,7 @@ private:
        ///
        ColorCode backgroundColor(PainterInfo const &) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -73,22 +73,24 @@ private:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       void tocString(odocstream &) const;
+       void toString(odocstream &) const;
+       ///
+       void forToc(docstring &, size_t) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenuName() const;
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const &) const;
        ///
        InsetBranchParams const & params() const { return params_; }
        ///
        void setParams(InsetBranchParams const & params) { params_ = params; }
 
        /** \returns true if params_.branch is listed as 'selected' in
-           \c buffer. This handles the case of child documents.
+               \c buffer. \p child only checks within child documents.
         */
-       bool isBranchSelected() const;
+       bool isBranchSelected(bool const child = false) const;
        /*!
         * Is the content of this inset part of the output document?
         *
@@ -107,7 +109,7 @@ private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       docstring name() const { return from_ascii("Branch"); }
+       docstring layoutName() const { return from_ascii("Branch:") + branch(); }
        ///
        Inset * clone() const { return new InsetBranch(*this); }