]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetspecialchar.C
read the ChangeLog... no huge changes .. but some might get reversed...
[lyx.git] / src / insets / insetspecialchar.C
index 111b55218a7d00ca3b96c6c010e041ccb60201e6..3c4193b08fb5283f72d5d97f3d5349023baca844 100644 (file)
 #endif
 
 #include "insetspecialchar.h"
-#include "lyxdraw.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-
-InsetSpecialChar::InsetSpecialChar()
-{
-}
+#include "Painter.h"
 
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
        : kind(k)
-{
-}
+{}
 
 
-InsetSpecialChar::~InsetSpecialChar()
-{
-}
-
-
-int InsetSpecialChar::Ascent(LyXFont const & font) const
+int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
 {
        return font.maxAscent();
 }
 
 
-int InsetSpecialChar::Descent(LyXFont const & font) const
+int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
 {
        return font.maxDescent();
 }
 
 
-int InsetSpecialChar::Width(LyXFont const & font) const
+int InsetSpecialChar::width(Painter &, LyXFont const & font) const
 {
-       LyXFont f = font;
        switch (kind) {
        case HYPHENATION:
        {
-               int w = f.textWidth("-", 1);
+               int w = font.textWidth("-", 1);
                if (w > 5) 
                        w -= 2; // to make it look shorter
                return w;
        }
        case END_OF_SENTENCE:
        {
-               return f.textWidth(".", 1);
+               return font.textWidth(".", 1);
        }
        case LDOTS:
        {
-               return f.textWidth(". . .", 5);
+               return font.textWidth(". . .", 5);
        }
-       case MENU_SEPARATOR: {
-               return f.textWidth(" x ", 3);
+       case MENU_SEPARATOR:
+       {
+               return font.textWidth(" x ", 3);
        }
+#if 0
+       case NEWLINE:
+       {
+       }
+#endif
+       case PROTECTED_SEPARATOR:
+       {
+               return font.textWidth("x", 1);
+       }
+       
        }
        return 1; // To shut up gcc
 }
 
 
-void InsetSpecialChar::Draw(LyXFont font, LyXScreen & scr,
-                           int baseline, float & x)
+void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
+                           int baseline, float & x) const
 {
+       LyXFont font(f);
        switch (kind) {
        case HYPHENATION:
        {
-               font.setColor(LyXFont::MAGENTA);
-               scr.drawText(font, "-", 1, baseline, int(x));
-               x += Width(font);
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, "-", font);
+               x += width(pain, font);
                break;
        }
        case END_OF_SENTENCE:
        {
-               font.setColor(LyXFont::MAGENTA);
-               scr.drawText(font, ".", 1, baseline, int(x));
-               x += Width(font);
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, ".", font);
+               x += width(pain, font);
                break;
        }
        case LDOTS:
        {
-               font.setColor(LyXFont::MAGENTA);
-               scr.drawText(font, ". . .", 5, baseline, int(x));
-               x += Width(font);
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, ". . .", font);
+               x += width(pain, font);
                break;
        }
        case MENU_SEPARATOR:
@@ -104,20 +105,50 @@ void InsetSpecialChar::Draw(LyXFont font, LyXScreen & scr,
                int w = font.textWidth("x", 1);
                int ox = font.textWidth(" ", 1) + int(x);
                int h = font.ascent('x');
-               XPoint p[4];
-               p[0].x = ox;    p[0].y = baseline;
-               p[1].x = ox;    p[1].y = baseline - h;
-               p[2].x = ox + w;p[2].y = baseline - h/2;
-               p[3].x = ox;    p[3].y = baseline;
-               scr.drawLines(getGC(gc_copy), p, 4);
-               x += Width(font);
+               int xp[4], yp[4];
+               
+               xp[0] = ox;     yp[0] = baseline;
+               xp[1] = ox;     yp[1] = baseline - h;
+               xp[2] = ox + w; yp[2] = baseline - h/2;
+               xp[3] = ox;     yp[3] = baseline;
+               
+               pain.lines(xp, yp, 4, LColor::special);
+               x += width(pain, font);
+               break;
+       }
+#if 0
+       case NEWLINE:
+       {
+       }
+#endif
+       case PROTECTED_SEPARATOR:
+       {
+               float w = width(pain, font);
+               int h = font.ascent('x');
+               int xp[4], yp[4];
+               
+               xp[0] = int(x);
+               yp[0] = baseline - max(h / 4, 1);
+
+               xp[1] = int(x);
+               yp[1] = baseline;
+
+               xp[2] = int(x + w);
+               yp[2] = baseline;
+
+               xp[3] = int(x + w);
+               yp[3] = baseline - max(h / 4, 1);
+               
+               pain.lines(xp, yp, 4, LColor::special);
+               x += w;
+               break;
        }
        }
 }
 
 
 // In lyxf3 this will be just LaTeX
-void InsetSpecialChar::Write(FILE * file)
+void InsetSpecialChar::Write(ostream & os) const
 {
        string command;
        switch (kind) {
@@ -125,8 +156,13 @@ void InsetSpecialChar::Write(FILE * file)
        case END_OF_SENTENCE:   command = "\\@.";       break;
        case LDOTS:             command = "\\ldots{}";  break;
        case MENU_SEPARATOR:    command = "\\menuseparator"; break;
+#if 0
+       case NEWLINE:           command = "\\newline";  break;
+#endif
+       case PROTECTED_SEPARATOR:
+                               command = "\\protected_separator";          break;
        }
-       fprintf(file, "\\SpecialChar %s\n", command.c_str());
+       os << "\\SpecialChar " << command << "\n";
 }
 
 
@@ -144,61 +180,65 @@ void InsetSpecialChar::Read(LyXLex & lex)
                kind = LDOTS;
        else if (command == "\\menuseparator")
                kind = MENU_SEPARATOR;
+       else if (command == "\\protected_separator")
+               kind = PROTECTED_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
 }
 
 
-int InsetSpecialChar::Latex(FILE * file, signed char /*fragile*/)
+int InsetSpecialChar::Latex(ostream & os, signed char /*fragile*/) const
 {
        string command;
        signed char dummy = 0;
        Latex(command, dummy);
-       fprintf(file, "%s", command.c_str());
+       os << command;
        return 0;
 }
 
 
-int InsetSpecialChar::Latex(string & file, signed char /*fragile*/)
+int InsetSpecialChar::Latex(string & file, signed char /*fragile*/) const
 {
        switch (kind) {
        case HYPHENATION:       file += "\\-";  break;
        case END_OF_SENTENCE:   file += "\\@."; break;
        case LDOTS:             file += "\\ldots{}";    break;
        case MENU_SEPARATOR:    file += "\\lyxarrow{}"; break;
+       case PROTECTED_SEPARATOR: file += "~";          break;
        }
        return 0;
 }
 
 
-int InsetSpecialChar::Linuxdoc(string & file)
+int InsetSpecialChar::Linuxdoc(string & file) const
 {
        switch (kind) {
        case HYPHENATION:       file += "";     break;
        case END_OF_SENTENCE:   file += "";     break;
        case LDOTS:             file += "...";  break;
        case MENU_SEPARATOR:    file += "->";   break;
+       case PROTECTED_SEPARATOR:    file += " ";   break;
        }
        return 0;
 }
 
 
-int InsetSpecialChar::DocBook(string & file)
+int InsetSpecialChar::DocBook(string & file) const
 {
        switch (kind) {
        case HYPHENATION:       file += "";     break;
        case END_OF_SENTENCE:   file += "";     break;
        case LDOTS:             file += "...";  break;
        case MENU_SEPARATOR:    file += "->";   break;
+       case PROTECTED_SEPARATOR:    file += " ";   break;
        }
        return 0;
 }
 
 
-Inset * InsetSpecialChar::Clone()
+Inset * InsetSpecialChar::Clone() const
 {
-       InsetSpecialChar * result = new InsetSpecialChar(kind);
-       return result;
+       return new InsetSpecialChar(kind);
 }