tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 4a69a19d4eff218dbf61f1fea5d04cb94d4db010..dc7de0e3f3e2369a4bce6d82e10c9f5d75c7c512 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -60,11 +60,13 @@ private:
        ///
        InsetCode lyxCode() const { return NOTE_CODE; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        DisplayType display() const;
-       ///
-       bool noFontChange() const { return params_.type != InsetNoteParams::Note; }
+       /** returns false if, when outputing LaTeX, font changes should
+           be closed before generating this inset. This is needed for
+           insets that may contain several paragraphs */
+       bool inheritFont() const { return params_.type == InsetNoteParams::Note; }
        /// Is the content of this inset part of the output document?
        bool producesOutput() const
                { return params_.type == InsetNoteParams::Greyedout; }
@@ -79,7 +81,7 @@ private:
        ///
        bool isMacroScope() const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -91,7 +93,7 @@ private:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       void addToToc(DocIterator const &);
+       void addToToc(DocIterator const &) const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
@@ -99,7 +101,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        friend class InsetNoteParams;