X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpecialChar.cpp;h=f342d0f20d0ee24de9a2149da9e495e9b7c7ac0d;hb=6b49b6b129af9417fea7ea907a44a46fbbd38340;hp=0750187c650f1177f05f05e7997af9f045b2ae6c;hpb=b99fc9bcd99350d137859b59895c5dcecf4e6a95;p=lyx.git

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 0750187c65..f342d0f20d 100644
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -19,6 +19,7 @@
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -32,7 +33,7 @@ namespace lyx {
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-	: kind_(k)
+	: Inset(0), kind_(k)
 {}
 
 
@@ -204,8 +205,8 @@ void InsetSpecialChar::read(Lexer & lex)
 }
 
 
-int InsetSpecialChar::latex(odocstream & os,
-			    OutputParams const & rp) const
+void InsetSpecialChar::latex(otexstream & os,
+			     OutputParams const & rp) const
 {
 	switch (kind_) {
 	case HYPHENATION:
@@ -235,16 +236,18 @@ int InsetSpecialChar::latex(odocstream & os,
 		os << "\\nobreakdash-";
 		break;
 	}
-	return 0;
 }
 
 
-int InsetSpecialChar::plaintext(odocstream & os, OutputParams const &) const
+int InsetSpecialChar::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	switch (kind_) {
 	case HYPHENATION:
-	case LIGATURE_BREAK:
 		return 0;
+	case LIGATURE_BREAK:
+		os.put(0x200c);
+		return 1;
 	case END_OF_SENTENCE:
 		os << '.';
 		return 1;
@@ -258,7 +261,7 @@ int InsetSpecialChar::plaintext(odocstream & os, OutputParams const &) const
 		os << '/';
 		return 1;
 	case NOBREAKDASH:
-		os << '-';
+		os.put(0x2011);
 		return 1;
 	}
 	return 0;
@@ -291,9 +294,55 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetSpecialChar::tocString(odocstream & os) const
+docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	plaintext(os, OutputParams(0));
+	switch (kind_) {
+	case HYPHENATION:
+		break;
+	case LIGATURE_BREAK:
+		xs << XHTMLStream::ESCAPE_NONE << "&#8204;";
+		break;
+	case END_OF_SENTENCE:
+		xs << '.';
+		break;
+	case LDOTS:
+		xs << XHTMLStream::ESCAPE_NONE << "&hellip;";
+		break;
+	case MENU_SEPARATOR:
+		xs << XHTMLStream::ESCAPE_NONE << "&rArr;";
+		break;
+	case SLASH:
+		xs << XHTMLStream::ESCAPE_NONE << "&frasl;";
+		break;
+	case NOBREAKDASH:
+		xs << XHTMLStream::ESCAPE_NONE << "&#8209;";
+		break;
+	}
+	return docstring();
+}
+
+
+void InsetSpecialChar::toString(odocstream & os) const
+{
+	switch (kind_) {
+	case LIGATURE_BREAK:
+		// Do not output ZERO WIDTH NON JOINER here
+		// Spell checker would choke on it.
+		return;
+	default:
+		break;
+	}
+	odocstringstream ods;
+	plaintext(ods, OutputParams(0));
+	os << ods.str();
+}
+
+
+void InsetSpecialChar::forToc(docstring & os, size_t) const
+{
+	odocstringstream ods;
+	plaintext(ods, OutputParams(0));
+	os += ods.str();
 }
 
 
@@ -306,15 +355,10 @@ void InsetSpecialChar::validate(LaTeXFeatures & features) const
 }
 
 
-bool InsetSpecialChar::isChar() const
-{
-	return true;
-}
-
-
 bool InsetSpecialChar::isLetter() const
 {
-	return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK;
+	return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK
+		|| kind_ == NOBREAKDASH;
 }
 
 
@@ -325,7 +369,8 @@ bool InsetSpecialChar::isLineSeparator() const
 	// Paragraph::stripLeadingSpaces nukes the characters which
 	// have this property. I leave the code here, since it should
 	// eventually be made to work. (JMarc 20020327)
-	return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR;
+	return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR
+		|| kind_ == SLASH;
 #else
 	return false;
 #endif