X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpecialChar.cpp;h=58df102dde2c4b5692e031249bb81b3dd7e99378;hb=e15d3d35cba7266d8a1a22c7e4cd92d12599e103;hp=09d14be295bc6532288b5d73f3dbb6e3851f8d0b;hpb=63c45ec226153a9f7f1314ac51e4c1f5a9de9fda;p=lyx.git

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 09d14be295..58df102dde 100644
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -5,7 +5,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.
  */
@@ -14,15 +14,17 @@
 
 #include "InsetSpecialChar.h"
 
-#include "support/debug.h"
 #include "Dimension.h"
+#include "Font.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 
 using namespace std;
@@ -31,7 +33,7 @@ namespace lyx {
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-	: kind_(k)
+	: Inset(0), kind_(k)
 {}
 
 
@@ -148,7 +150,7 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
 
 
 // In lyxf3 this will be just LaTeX
-void InsetSpecialChar::write(Buffer const &, ostream & os) const
+void InsetSpecialChar::write(ostream & os) const
 {
 	string command;
 	switch (kind_) {
@@ -179,7 +181,7 @@ void InsetSpecialChar::write(Buffer const &, ostream & os) const
 
 
 // This function will not be necessary when lyx3
-void InsetSpecialChar::read(Buffer const &, Lexer & lex)
+void InsetSpecialChar::read(Lexer & lex)
 {
 	lex.next();
 	string const command = lex.getString();
@@ -203,8 +205,8 @@ void InsetSpecialChar::read(Buffer const &, Lexer & lex)
 }
 
 
-int InsetSpecialChar::latex(Buffer const &, odocstream & os,
-			    OutputParams const &) const
+void InsetSpecialChar::latex(otexstream & os,
+			     OutputParams const & rp) const
 {
 	switch (kind_) {
 	case HYPHENATION:
@@ -220,26 +222,32 @@ int InsetSpecialChar::latex(Buffer const &, odocstream & os,
 		os << "\\ldots{}";
 		break;
 	case MENU_SEPARATOR:
-		os << "\\lyxarrow{}";
+		if (rp.local_font->isRightToLeft())
+			os << "\\lyxarrow*{}";
+		else
+			os << "\\lyxarrow{}";
 		break;
 	case SLASH:
 		os << "\\slash{}";
 		break;
 	case NOBREAKDASH:
+		if (rp.moving_arg)
+			os << "\\protect";
 		os << "\\nobreakdash-";
 		break;
 	}
-	return 0;
 }
 
 
-int InsetSpecialChar::plaintext(Buffer const &, 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;
@@ -253,15 +261,14 @@ int InsetSpecialChar::plaintext(Buffer const &, odocstream & os,
 		os << '/';
 		return 1;
 	case NOBREAKDASH:
-		os << '-';
+		os.put(0x2011);
 		return 1;
 	}
 	return 0;
 }
 
 
-int InsetSpecialChar::docbook(Buffer const &, odocstream & os,
-			      OutputParams const &) const
+int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
 {
 	switch (kind_) {
 	case HYPHENATION:
@@ -287,15 +294,55 @@ int InsetSpecialChar::docbook(Buffer const &, odocstream & os,
 }
 
 
-void InsetSpecialChar::textString(Buffer const & buf, odocstream & os) const
+docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	plaintext(buf, 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();
 }
 
 
-Inset * InsetSpecialChar::clone() const
+void InsetSpecialChar::toString(odocstream & os) const
 {
-	return new InsetSpecialChar(kind_);
+	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::forOutliner(docstring & os, size_t) const
+{
+	odocstringstream ods;
+	plaintext(ods, OutputParams(0));
+	os += ods.str();
 }
 
 
@@ -308,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;
 }
 
 
@@ -327,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