X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpecialChar.h;h=982b1d51a385ffa97f504e470779fe4da50fbc06;hb=b73879691f816b0874d9dec0c09e2db7889c4e8e;hp=d54e993d10fa30cb35fb57180808f29c04b6ecb6;hpb=897436efbb9bd641b61467d185a2dfae9839e575;p=lyx.git

diff --git a/src/insets/InsetSpecialChar.h b/src/insets/InsetSpecialChar.h
index d54e993d10..982b1d51a3 100644
--- a/src/insets/InsetSpecialChar.h
+++ b/src/insets/InsetSpecialChar.h
@@ -6,7 +6,7 @@
  *
  * \author Asger Alstrup Nielsen
  * \author Jean-Marc Lasgouttes
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -30,6 +30,8 @@ public:
 	enum Kind {
 		/// Optional hyphenation point (\-)
 		HYPHENATION,
+		/// Optional line wrap point without hyphen (ZWSP)
+		ALLOWBREAK,
 		/// Ligature break point (\textcompwordmark)
 		LIGATURE_BREAK,
 		/// ... (\ldots)
@@ -38,50 +40,68 @@ public:
 		END_OF_SENTENCE,
 		/// Menu separator
 		MENU_SEPARATOR,
+		/// breakable slash
+		SLASH,
+		/// protected dash
+		NOBREAKDASH,
+		/// LyX logo
+		PHRASE_LYX,
+		/// TeX logo
+		PHRASE_TEX,
+		/// LaTeX2e logo
+		PHRASE_LATEX2E,
+		/// LaTeX logo
+		PHRASE_LATEX
 	};
 
 	///
-	InsetSpecialChar() {}
+	InsetSpecialChar() : Inset(0), kind_(HYPHENATION) {}
 	///
-	explicit
-	InsetSpecialChar(Kind k);
+	explicit InsetSpecialChar(Kind k);
 	///
 	Kind kind() const;
 	///
-	bool metrics(MetricsInfo &, Dimension &) const;
+	docstring toolTip(BufferView const & bv, int x, int y) const;
+	///
+	void metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void write(Buffer const &, std::ostream &) const;
+	void write(std::ostream &) const;
 	/// Will not be used when lyxf3
-	void read(Buffer const &, Lexer & lex);
+	void read(Lexer & lex);
+	///
+	void latex(otexstream &, OutputParams const &) const;
+	///
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
+	///
+	int docbook(odocstream &, OutputParams const &) const;
+	///
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
-	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	void toString(odocstream &) const;
 	///
-	int plaintext(Buffer const &, odocstream &,
-		      OutputParams const &) const;
+	bool isInToc() const { return true; }
 	///
-	int docbook(Buffer const &, odocstream &,
-		    OutputParams const &) const;
-	/// the string that is passed to the TOC
-	virtual int textString(Buffer const &, odocstream &,
-		OutputParams const &) const;
+	void forOutliner(docstring &, size_t const, bool const) const;
 	///
-	Inset::Code lyxCode() const { return Inset::SPECIALCHAR_CODE; }
+	InsetCode lyxCode() const { return SPECIALCHAR_CODE; }
 	/// We don't need \begin_inset and \end_inset
 	bool directWrite() const { return true; }
 	///
 	void validate(LaTeXFeatures &) const;
 
-	// should this inset be handled like a normal charater
+	/// should this inset be handled like a normal character?
 	bool isChar() const;
 	/// is this equivalent to a letter?
 	bool isLetter() const;
-	// should we break lines after this inset?
+	/// should we break lines after this inset?
 	bool isLineSeparator() const;
+	/// Is the content of this inset part of the immediate (visible) text sequence?
+	bool isPartOfTextSequence() const { return isChar(); }
 private:
-	virtual std::auto_ptr<Inset> doClone() const;
+	Inset * clone() const { return new InsetSpecialChar(*this); }
 
 	/// And which kind is this?
 	Kind kind_;