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

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index d656fdcbc25cf39af6d7c35ed6e06a1668c34f6f..502422a21b965a2966cd5e6dd020244df1f3cc78 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -67,9 +67,11 @@ public:
        void setNewLabel();
        ///
        InsetFloatParams const & params() const { return params_; }
+       ///
+       bool allowsCaptionVariation() const { return !params_.subfloat; }
 private:
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
@@ -81,7 +83,7 @@ private:
        ///
        InsetCode lyxCode() const { return FLOAT_CODE; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -90,16 +92,14 @@ private:
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        bool insetAllowed(InsetCode) const;
-       /** returns true if, when outputing LaTeX, font changes should
+       /** 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 noFontChange() const { return true; }
-       ///
-       bool showInsetDialog(BufferView *) const;
+       bool inheritFont() const { return false; }
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       void updateLabels(ParIterator const &, UpdateType);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///