X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcharstyle.h;h=39231e9a57d7c83f6f26eceb7d44fdbb84f52bec;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=de785ed71c575d67fbf24eb979a502b593917f97;hpb=f0d215f75296b448835fed560fd49b177e41ba7c;p=lyx.git

diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index de785ed71c..39231e9a57 100644
--- 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;
 };
 
 
@@ -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,7 +68,7 @@ public:
 	///
 	void read(Buffer const & buf, LyXLex & lex);
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo &, int, int) const;
 	///
@@ -71,17 +76,16 @@ public:
 	///
 	bool forceDefaultParagraphs(idx_type) const { return true; }
 	///
-	int latex(Buffer const &, std::ostream &,
+	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;
 
@@ -89,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 &);
@@ -106,8 +110,9 @@ private:
 	void init();
 	///
 	InsetCharStyleParams params_;
-	///
-	bool has_label_;
 };
 
+
+} // namespace lyx
+
 #endif