X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetspecialchar.h;h=833256b703350837c30a290c838e9ecf773d6a2f;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=e75fcd71071bf1d97f6a0b5abad142bd9d23b03d;hpb=77e706c44175f3cf71473a42d5db890c77b3b7b3;p=lyx.git

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index e75fcd7107..833256b703 100644
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -15,7 +15,7 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
 
 struct LaTeXFeatures;
@@ -28,16 +28,14 @@ public:
 	enum Kind {
 		/// Optional hyphenation point (\-)
 		HYPHENATION,
+		/// Ligature break point (\textcompwordmark)
+		LIGATURE_BREAK,
 		/// ... (\ldots)
 		LDOTS,
 		/// End of sentence punctuation (\@)
 		END_OF_SENTENCE,
 		/// Menu separator
 		MENU_SEPARATOR,
-#if 0
-		/// Newline
-		NEWLINE,
-#endif
 		/// Protected Separator
 		PROTECTED_SEPARATOR
 	};
@@ -45,42 +43,58 @@ public:
 	///
 	InsetSpecialChar() {}
 	///
+	explicit
 	InsetSpecialChar(Kind k);
 	///
-	int ascent(Painter &, LyXFont const &) const;
+	Kind kind() const;
+	///
+	int ascent(BufferView *, LyXFont const &) const;
 	///
-	int descent(Painter &, LyXFont const &) const;
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	int width(Painter &, LyXFont const &) const;
+	int width(BufferView *, LyXFont const &) const;
 	///
-	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+	void draw(BufferView *, LyXFont const &, int, float &, bool) const;
 	///
-	void Write(std::ostream &) const;
+	void write(Buffer const *, std::ostream &) const;
 	/// Will not be used when lyxf3
-	void Read(LyXLex & lex);
+	void read(Buffer const *, LyXLex & lex);
 	/// 
-	int Latex(std::ostream &, signed char fragile, bool free_spc) const;
+	int latex(Buffer const *, std::ostream &,
+		  bool fragile, bool free_spc) const;
+	///
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(std::ostream &) const;
+	int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	int DocBook(std::ostream &) const;
+	int docbook(Buffer const *, std::ostream &) const;
 	///
-	Inset * Clone() const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///  
-	Inset::Code LyxCode() const
+	Inset::Code lyxCode() const
 	{
 		return Inset::SPECIALCHAR_CODE;
 	}
 	/// We don't need \begin_inset and \end_inset
-	bool DirectWrite() const 
+	bool directWrite() const 
 	{
 		return true;
 	};
 	///
-	void Validate(LaTeXFeatures &) const;
+	void validate(LaTeXFeatures &) const;
+	
+	// should this inset be handled like a normal charater
+	bool isChar() const;
+	/// is this equivalent to a letter?
+	bool isLetter() const;
+	/// is this equivalent to a space (which is BTW different from
+	// a line separator)?
+	bool isSpace() const;
+	// should we break lines after this inset?
+	bool isLineSeparator() const;
 private:
 	/// And which kind is this?
-	Kind kind;
+	Kind kind_;
 };
 
 #endif