* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index 84c20cbb588a3b10d3a0afa1f1f4fb8618bad423..39231e9a57d7c83f6f26eceb7d44fdbb84f52bec 100644 (file)
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -17,6 +17,9 @@
 #include "lyxtextclass.h"
 
 
+namespace lyx {
+
+
 class InsetCharStyleParams {
 public:
        ///
@@ -35,6 +38,8 @@ public:
        LyXFont font;
        ///
        LyXFont labelfont;
+       ///
+       bool show_label;
 };
 
 
@@ -44,7 +49,7 @@ public:
 class InsetCharStyle : public InsetCollapsable {
 public:
        /// Construct an undefined character style
-       InsetCharStyle::InsetCharStyle(BufferParams const &, std::string const);
+       InsetCharStyle(BufferParams const &, std::string const);
        ///
        InsetCharStyle(BufferParams const &, CharStyles::iterator);
        /// Is this character style defined in the document's textclass?
@@ -55,7 +60,7 @@ public:
        /// (Re-)set the character style parameters from \p cs
        void setDefined(CharStyles::iterator cs);
        ///
-       std::string const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        InsetBase::Code lyxCode() const { return InsetBase::CHARSTYLE_CODE; }
        ///
@@ -63,26 +68,24 @@ public:
        ///
        void read(Buffer const & buf, LyXLex & lex);
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo &, int, int) const;
        ///
        void getDrawFont(LyXFont &) const;
        ///
-       int latex(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
+       bool forceDefaultParagraphs(idx_type) const { return true; }
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
+       int latex(Buffer const &, odocstream &,
+                 OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, std::ostream & os,
-               OutputParams const &) const;
+       virtual void textString(Buffer const &, odocstream &) const;
        ///
        void validate(LaTeXFeatures &) const;
 
@@ -90,7 +93,7 @@ public:
        InsetCharStyleParams const & params() const { return params_; }
 
        /// should paragraph indendation be ommitted in any case?
-       bool neverIndent() const { return true; }
+       bool neverIndent(Buffer const &) const { return true; }
 
 protected:
        InsetCharStyle(InsetCharStyle const &);
@@ -107,8 +110,9 @@ private:
        void init();
        ///
        InsetCharStyleParams params_;
-       ///
-       bool has_label_;
 };
 
+
+} // namespace lyx
+
 #endif