Some master/child biblio fixes.

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

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index ae8fa2f742a77008cfbf1b780369bf6b2d31926a..d6cc0a6510ec623e4903732b00ade77a1eaa1b64 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -60,17 +60,21 @@ 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; }
        ///
        bool allowSpellCheck() const;
        ///
+       FontInfo getFont() const;
+       ///
        void write(std::ostream &) const;
        ///
        void read(Lexer & lex);
@@ -79,9 +83,10 @@ private:
        ///
        bool isMacroScope() const;
        ///
-       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;
        ///
@@ -91,15 +96,13 @@ private:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       void addToToc(DocIterator const &) const;
-       ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Inset * clone() const { return new InsetNote(*this); }
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        friend class InsetNoteParams;