X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetquotes.h;h=60592c8f86ff2e564df9dcfbb0ca948cf685b4f8;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=0d01c22baa2339c0ac401c64d769101ef2b872f7;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index 0d01c22baa..60592c8f86 100644
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team
+ *          Copyright 1995-2001 The LyX Team
  *
  * ====================================================== */
 
@@ -16,11 +16,10 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
-
-using std::ostream;
+#include "inset.h"
 
 class BufferParams;
+class Language;
 
 struct LaTeXFeatures;
 
@@ -29,7 +28,7 @@ struct LaTeXFeatures;
 
   Used for the various quotes. German, English, French, all either
   double or single **/ 
-class InsetQuotes: public Inset {
+class InsetQuotes : public Inset {
 public:
 	///
 	enum quote_language {
@@ -67,52 +66,62 @@ public:
 	    \item grd <- german double quote right 
 	    \item etc.
 	  \end{itemize}
-	  */ 
+	  */
+	explicit
 	InsetQuotes(string const & str = "eld");
 	/// Create the right quote inset after character c
 	InsetQuotes(char c, BufferParams const & params);
 
 	///
-	int ascent(Painter &, LyXFont const &) const;
+	int ascent(BufferView *, LyXFont const &) const;
+	///
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	int descent(Painter &, LyXFont const &) const;
+	int width(BufferView *, LyXFont const &) const;
 	///
-	int width(Painter &, LyXFont const &) const;
+	void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+#if 0
 	///
-	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+	LyXFont const convertFont(LyXFont const & font) const;
+#endif
 	///
-	LyXFont ConvertFont(LyXFont font);
+	void write(Buffer const *, std::ostream &) const;
 	///
-	void Write(ostream &) const;
+	void read(Buffer const *, LyXLex & lex);
 	///
-	void Read(LyXLex & lex);
+	int latex(Buffer const *, std::ostream &,
+		  bool fragile, bool free_spc) const;
 	///
-	int Latex(ostream &, signed char fragile, bool free_spc) const;
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(ostream &) const;
+	int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	int DocBook(ostream &) const;
+	int docbook(Buffer const *, std::ostream &) const;
 	///
-	void Validate(LaTeXFeatures &) const;
+	void validate(LaTeXFeatures &) const;
 	///
-	Inset * Clone() const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///
-	Inset::Code LyxCode() const;
+	Inset::Code lyxCode() const;
+	// should this inset be handled like a normal charater
+	bool isChar() const { return true; }
+	
 private:
 	///
-	quote_language language;
+	quote_language language_;
 	///
-	quote_side side;
+	quote_side side_;
 	///
-	quote_times times;
+	quote_times times_;
 
 	/** The parameters of the constructor are the language, the
 	    side and the multiplicity of the quote.
 	 */
 	InsetQuotes(quote_language l, quote_side s, quote_times t);
 	///
-	void ParseString(string const &);
+	void parseString(string const &);
 	///
-	string DispString() const;
+	string const dispString(Language const *) const;
 };
 #endif
+