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

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index 7eed007e61..833256b703 100644
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -4,7 +4,7 @@
  *
  *           LyX, The Document Processor
  * 	 
- *	    Copyright (C) 1997 Asger Alstrup
+ *	    Copyright 1997 Asger Alstrup
  *
  * ====================================================== */
 
@@ -15,68 +15,86 @@
 #pragma interface
 #endif
 
-#include "lyxinset.h"
+#include "inset.h"
 #include "LString.h"
 
 struct LaTeXFeatures;
 
 ///  Used to insert special chars
-class InsetSpecialChar: public Inset {
+class InsetSpecialChar : public Inset {
 public:
 
 	/// The different kinds of special chars we support
 	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
+		MENU_SEPARATOR,
+		/// Protected Separator
+		PROTECTED_SEPARATOR
 	};
 
 	///
 	InsetSpecialChar() {}
 	///
+	explicit
 	InsetSpecialChar(Kind k);
 	///
-	int Ascent(LyXFont const & font) const;
+	Kind kind() const;
 	///
-	int Descent(LyXFont const & font) const;
+	int ascent(BufferView *, LyXFont const &) const;
 	///
-	int Width(LyXFont const & font) const;
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	void Draw(LyXFont, LyXScreen & scr, int baseline, float & x);
+	int width(BufferView *, LyXFont const &) const;
 	///
-	void Write(FILE * file);
+	void draw(BufferView *, LyXFont const &, int, float &, bool) 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(FILE * file, signed char fragile);
+	int latex(Buffer const *, std::ostream &,
+		  bool fragile, bool free_spc) const;
 	///
-	int Latex(string & file, signed char fragile);
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(string & file);
+	int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	int DocBook(string & file);
+	int docbook(Buffer const *, std::ostream &) const;
 	///
-	InsetSpecialChar * Clone() const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///  
-	Inset::Code LyxCode() const
+	Inset::Code lyxCode() const
 	{
-		return Inset::NO_CODE;
+		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