Minor string fixes

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

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 8fa6eadc0ea86abf4139e5f5e69807d4e3defe4f..ff4c7208a60c2abaa05fdd89e015b6cc7b4689b0 100644 (file)
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -20,6 +20,7 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -128,14 +129,23 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
        }
        if (dim.wid == 0)
                dim.wid = fm.width(s);
-
-       setDimCache(mi, dim);
 }
 
 
 namespace {
 
-void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
+// helper function: draw text and update x.
+void drawChar(PainterInfo & pi, int & x, int const y, char_type ch)
+{
+       FontInfo font = pi.base.font;
+       font.setPaintColor(pi.textColor(font.realColor()));
+       pi.pain.text(x, y, ch, font);
+       x += theFontMetrics(font).width(ch);
+}
+
+
+void drawLogo(PainterInfo & pi, int & x, int const y, InsetSpecialChar::Kind kind)
+{
        FontInfo const & font = pi.base.font;
        int const em = theFontMetrics(font).em();
        switch (kind) {
@@ -143,11 +153,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
                /** Reference macro:
                 *  \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@};
                 */
-               x += pi.pain.text(x, y, from_ascii("L"), font);
+               drawChar(pi, x, y, 'L');
                x -= em / 6;
-               x += pi.pain.text(x, y + em / 4, from_ascii("Y"), font);
+               drawChar(pi, x, y + em / 4, 'Y');
                x -= em / 8;
-               x += pi.pain.text(x, y, from_ascii("X"), font);
+               drawChar(pi, x, y, 'X');
                break;
 
        case InsetSpecialChar::PHRASE_TEX: {
@@ -155,11 +165,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
                 *  \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
                 */
                int const ex = theFontMetrics(font).ascent('x');
-               x += pi.pain.text(x, y, from_ascii("T"), font);
+               drawChar(pi, x, y, 'T');
                x -= em / 6;
-               x += pi.pain.text(x, y + ex / 2, from_ascii("E"), font);
+               drawChar(pi, x, y + ex / 2, 'E');
                x -= em / 8;
-               x += pi.pain.text(x, y, from_ascii("X"), font);
+               drawChar(pi, x, y, 'X');
                break;
        }
        case InsetSpecialChar::PHRASE_LATEX2E:
@@ -168,10 +178,10 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
                 *    \if b\expandafter\@car\f@series\@nil\boldmath\fi
                 *    \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}}
                 */
-               drawLogo(pi, InsetSpecialChar::PHRASE_LATEX, x, y);
+               drawLogo(pi, x, y, InsetSpecialChar::PHRASE_LATEX);
                x += 3 * em / 20;
-               x += pi.pain.text(x, y, from_ascii("2"), font);
-               x += pi.pain.text(x, y + em / 4, char_type(0x03b5), font);
+               drawChar(pi, x, y, '2');
+               drawChar(pi, x, y + em / 4, char_type(0x03b5));
                break;
 
        case InsetSpecialChar::PHRASE_LATEX: {
@@ -187,13 +197,13 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
                 *        \kern-.15em%
                 *        \TeX}
                 */
-               x += pi.pain.text(x, y, from_ascii("L"), font);
+               drawChar(pi, x, y, 'L');
                x -= 9 * em / 25;
-               FontInfo smaller = font;
-               smaller.decSize().decSize();
-               x += pi.pain.text(x, y - em / 5, from_ascii("A"), smaller);
+               PainterInfo pi2 = pi;
+               pi2.base.font.decSize().decSize();
+               drawChar(pi2, x, y - em / 5, 'A');
                x -= 3 * em / 20;
-               drawLogo(pi, InsetSpecialChar::PHRASE_TEX, x, y);
+               drawLogo(pi, x, y, InsetSpecialChar::PHRASE_TEX);
                break;
        }
        default:
@@ -269,13 +279,12 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
        case PHRASE_TEX:
        case PHRASE_LATEX2E:
        case PHRASE_LATEX:
-               drawLogo(pi, kind_, x, y);
+               drawLogo(pi, x, y, kind_);
                break;
        }
 }
 
 
-// In lyxf3 this will be just LaTeX
 void InsetSpecialChar::write(ostream & os) const
 {
        string command;
@@ -318,7 +327,6 @@ void InsetSpecialChar::write(ostream & os) const
 }
 
 
-// This function will not be necessary when lyx3
 void InsetSpecialChar::read(Lexer & lex)
 {
        lex.next();
@@ -359,22 +367,23 @@ void InsetSpecialChar::latex(otexstream & os,
                os << "\\-";
                break;
        case LIGATURE_BREAK:
-               os << "\\textcompwordmark{}";
+               os << "\\textcompwordmark" << termcmd;
                break;
        case END_OF_SENTENCE:
                os << "\\@.";
                break;
        case LDOTS:
-               os << "\\ldots{}";
+               os << "\\ldots" << termcmd;
                break;
        case MENU_SEPARATOR:
                if (rp.local_font->isRightToLeft())
-                       os << "\\lyxarrow*{}";
+                       os << "\\lyxarrow*";
                else
-                       os << "\\lyxarrow{}";
+                       os << "\\lyxarrow";
+               os << termcmd;
                break;
        case SLASH:
-               os << "\\slash{}";
+               os << "\\slash" << termcmd;
                break;
        case NOBREAKDASH:
                if (rp.moving_arg)
@@ -384,22 +393,22 @@ void InsetSpecialChar::latex(otexstream & os,
        case PHRASE_LYX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LyX{}";
+               os << "\\LyX" << termcmd;
                break;
        case PHRASE_TEX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\TeX{}";
+               os << "\\TeX" << termcmd;
                break;
        case PHRASE_LATEX2E:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LaTeXe{}";
+               os << "\\LaTeXe" << termcmd;
                break;
        case PHRASE_LATEX:
                if (rp.moving_arg)
                        os << "\\protect";
-               os << "\\LaTeX{}";
+               os << "\\LaTeX" << termcmd;
                break;
        }
 }
@@ -562,6 +571,12 @@ void InsetSpecialChar::validate(LaTeXFeatures & features) const
 }
 
 
+bool InsetSpecialChar::isChar() const
+{
+       return kind_ != HYPHENATION || kind_ != LIGATURE_BREAK;
+}
+
+
 bool InsetSpecialChar::isLetter() const
 {
        return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK