* add PreBabelPreamble to Language definition (fixes #4786).

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

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index db365de0fff732de1ddf8c2e5e511530d1c3b865..91c13645b535af7e541e949f2c71748b8fce16b2 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.
  */
@@ -14,23 +14,26 @@
 
 #include "InsetSpecialChar.h"
 
-#include "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"
 
-namespace lyx {
+using namespace std;
 
-using std::string;
-using std::ostream;
+namespace lyx {
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-       : kind_(k)
+       : Inset(0), kind_(k)
 {}
 
 
@@ -49,11 +52,27 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
 
        string s;
        switch (kind_) {
-               case LIGATURE_BREAK:      s = "|";     break;
-               case END_OF_SENTENCE:     s = ".";     break;
-               case LDOTS:               s = ". . ."; break;
-               case MENU_SEPARATOR:      s = " x ";   break;
-               case HYPHENATION:      s = "-";   break;
+               case LIGATURE_BREAK:
+                       s = "|";
+                       break;
+               case END_OF_SENTENCE:
+                       s = ".";
+                       break;
+               case LDOTS:
+                       s = ". . .";
+                       break;
+               case MENU_SEPARATOR:
+                       s = " x ";
+                       break;
+               case HYPHENATION:
+                       s = "-";
+                       break;
+               case SLASH:
+                       s = "/";
+                       break;
+               case NOBREAKDASH:
+                       s = "-";
+                       break;
        }
        docstring ds(s.begin(), s.end());
        dim.wid = fm.width(ds);
@@ -66,7 +85,7 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
 {
-       Font font = pi.base.font;
+       FontInfo font = pi.base.font;
 
        switch (kind_) {
        case HYPHENATION:
@@ -114,12 +133,24 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
                pi.pain.lines(xp, yp, 4, Color_special);
                break;
        }
+       case SLASH:
+       {
+               font.setColor(Color_special);
+               pi.pain.text(x, y, char_type('/'), font);
+               break;
+       }
+       case NOBREAKDASH:
+       {
+               font.setColor(Color_latex);
+               pi.pain.text(x, y, char_type('-'), font);
+               break;
+       }
        }
 }
 
 
 // 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_) {
@@ -138,13 +169,19 @@ void InsetSpecialChar::write(Buffer const &, ostream & os) const
        case MENU_SEPARATOR:
                command = "\\menuseparator";
                break;
+       case SLASH:
+               command = "\\slash{}";
+               break;
+       case NOBREAKDASH:
+               command = "\\nobreakdash-";
+               break;
        }
        os << "\\SpecialChar " << command << "\n";
 }
 
 
 // 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();
@@ -159,13 +196,17 @@ void InsetSpecialChar::read(Buffer const &, Lexer & lex)
                kind_ = LDOTS;
        else if (command == "\\menuseparator")
                kind_ = MENU_SEPARATOR;
+       else if (command == "\\slash{}")
+               kind_ = SLASH;
+       else if (command == "\\nobreakdash-")
+               kind_ = NOBREAKDASH;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
 }
 
 
-int InsetSpecialChar::latex(Buffer const &, odocstream & os,
-                           OutputParams const &) const
+int InsetSpecialChar::latex(odocstream & os,
+                           OutputParams const & rp) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -181,15 +222,25 @@ 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(odocstream & os, OutputParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:
@@ -204,13 +255,18 @@ int InsetSpecialChar::plaintext(Buffer const &, odocstream & os,
        case MENU_SEPARATOR:
                os << "->";
                return 2;
+       case SLASH:
+               os << '/';
+               return 1;
+       case NOBREAKDASH:
+               os << '-';
+               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:
@@ -225,21 +281,46 @@ int InsetSpecialChar::docbook(Buffer const &, odocstream & os,
        case MENU_SEPARATOR:
                os << "&lyxarrow;";
                break;
+       case SLASH:
+               os << '/';
+               break;
+       case NOBREAKDASH:
+               os << '-';
+               break;
        }
        return 0;
 }
 
 
-int InsetSpecialChar::textString(Buffer const & buf, odocstream & os,
-                      OutputParams const & op) const
+docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       return plaintext(buf, os, op);
+       switch (kind_) {
+       case HYPHENATION:
+       case LIGATURE_BREAK:
+               break;
+       case END_OF_SENTENCE:
+               xs << '.';
+               break;
+       case LDOTS:
+               xs << XHTMLStream::NextRaw() << "&hellip;";
+               break;
+       case MENU_SEPARATOR:
+               xs << XHTMLStream::NextRaw() << "&rArr;";
+               break;
+       case SLASH:
+               xs << XHTMLStream::NextRaw() << "&frasl;";
+               break;
+       case NOBREAKDASH:
+               xs << '-';
+               break;
+       }
+       return docstring();
 }
 
 
-Inset * InsetSpecialChar::clone() const
+void InsetSpecialChar::tocString(odocstream & os) const
 {
-       return new InsetSpecialChar(kind_);
+       plaintext(os, OutputParams(0));
 }
 
 
@@ -247,12 +328,8 @@ void InsetSpecialChar::validate(LaTeXFeatures & features) const
 {
        if (kind_ == MENU_SEPARATOR)
                features.require("lyxarrow");
-}
-
-
-bool InsetSpecialChar::isChar() const
-{
-       return true;
+       if (kind_ == NOBREAKDASH)
+               features.require("amsmath");
 }