Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / insets / InsetSpecialChar.cpp

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 1dd92c5901a1d46a0f078fdfde7dfe8988a5afff..f342d0f20d0ee24de9a2149da9e495e9b7c7ac0d 100644 (file)
--- 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.
  */
@@ -15,9 +15,11 @@
 #include "InsetSpecialChar.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"
@@ -31,7 +33,7 @@ namespace lyx {
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-       : kind_(k)
+       : Inset(0), kind_(k)
 {}
 
 
@@ -203,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:
@@ -220,7 +222,10 @@ int InsetSpecialChar::latex(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{}";
@@ -231,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;
@@ -254,7 +261,7 @@ int InsetSpecialChar::plaintext(odocstream & os, OutputParams const &) const
                os << '/';
                return 1;
        case NOBREAKDASH:
-               os << '-';
+               os.put(0x2011);
                return 1;
        }
        return 0;
@@ -287,9 +294,55 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-void InsetSpecialChar::textString(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();
 }
 
 
@@ -302,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;
 }
 
 
@@ -321,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