some small updates to Painter, and make the new painter the default.

[lyx.git] / src / insets / insetspecialchar.C

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index 2e61e5f20b90d8ec2b852d9e3c1eb72a3bbefbd4..e1eba4e01a0e1cafcac681b88874416914237387 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -5,7 +5,7 @@
  *      
  *         Copyright 1997 Asger Alstrup
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 
@@ -14,39 +14,72 @@
 #endif
 
 #include "insetspecialchar.h"
-#include "lyxdraw.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-
-InsetSpecialChar::InsetSpecialChar()
-{
-}
-
+#include "Painter.h"
+#ifndef USE_PAINTER
+#include "lyxdraw.h"
+#endif
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
        : kind(k)
-{
-}
+{}
 
 
-InsetSpecialChar::~InsetSpecialChar()
+#ifdef USE_PAINTER
+int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
 {
+       return font.maxAscent();
 }
-
-
-int InsetSpecialChar::Ascent(LyXFont const&font) const
+#else
+int InsetSpecialChar::Ascent(LyXFont const & font) const
 {
        return font.maxAscent();
 }
+#endif
 
 
-int InsetSpecialChar::Descent(LyXFont const&font) const
+#ifdef USE_PAINTER
+int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
 {
        return font.maxDescent();
 }
+#else
+int InsetSpecialChar::Descent(LyXFont const & font) const
+{
+       return font.maxDescent();
+}
+#endif
 
 
-int InsetSpecialChar::Width(LyXFont const&font) const
+#ifdef USE_PAINTER
+int InsetSpecialChar::width(Painter &, LyXFont const & font) const
+{
+       LyXFont f(font);
+       switch (kind) {
+       case HYPHENATION:
+       {
+               int w = f.textWidth("-", 1);
+               if (w > 5) 
+                       w -= 2; // to make it look shorter
+               return w;
+       }
+       case END_OF_SENTENCE:
+       {
+               return f.textWidth(".", 1);
+       }
+       case LDOTS:
+       {
+               return f.textWidth(". . .", 5);
+       }
+       case MENU_SEPARATOR: {
+               return f.textWidth(" x ", 3);
+       }
+       }
+       return 1; // To shut up gcc
+}
+#else
+int InsetSpecialChar::Width(LyXFont const & font) const
 {
        LyXFont f = font;
        switch (kind) {
@@ -71,29 +104,76 @@ int InsetSpecialChar::Width(LyXFont const&font) const
        }
        return 1; // To shut up gcc
 }
+#endif
 
 
-void InsetSpecialChar::Draw(LyXFont font, LyXScreen &scr,
-                           int baseline, float &x)
+#ifdef USE_PAINTER
+void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
+                           int baseline, float & x) const
+{
+       LyXFont font(f);
+       switch (kind) {
+       case HYPHENATION:
+       {
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, "-", font);
+               x += width(pain, font);
+               break;
+       }
+       case END_OF_SENTENCE:
+       {
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, ".", font);
+               x += width(pain, font);
+               break;
+       }
+       case LDOTS:
+       {
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, ". . .", font);
+               x += width(pain, font);
+               break;
+       }
+       case MENU_SEPARATOR:
+       {
+               // A triangle the width and height of an 'x'
+               int w = font.textWidth("x", 1);
+               int ox = font.textWidth(" ", 1) + int(x);
+               int h = font.ascent('x');
+               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);
+       }
+       }
+}
+#else
+void InsetSpecialChar::Draw(LyXFont font, LyXScreen & scr,
+                           int baseline, float & x)
 {
        switch (kind) {
        case HYPHENATION:
        {
-               font.setColor(LyXFont::MAGENTA);
+               font.setColor(LyXFont::BLUE);
                scr.drawText(font, "-", 1, baseline, int(x));
                x += Width(font);
                break;
        }
        case END_OF_SENTENCE:
        {
-               font.setColor(LyXFont::MAGENTA);
+               font.setColor(LyXFont::BLUE);
                scr.drawText(font, ".", 1, baseline, int(x));
                x += Width(font);
                break;
        }
        case LDOTS:
        {
-               font.setColor(LyXFont::MAGENTA);
+               font.setColor(LyXFont::BLUE);
                scr.drawText(font, ". . .", 5, baseline, int(x));
                x += Width(font);
                break;
@@ -114,10 +194,11 @@ void InsetSpecialChar::Draw(LyXFont font, LyXScreen &scr,
        }
        }
 }
+#endif
 
 
 // In lyxf3 this will be just LaTeX
-void InsetSpecialChar::Write(FILE *file)
+void InsetSpecialChar::Write(ostream & os)
 {
        string command;
        switch (kind) {
@@ -126,40 +207,40 @@ void InsetSpecialChar::Write(FILE *file)
        case LDOTS:             command = "\\ldots{}";  break;
        case MENU_SEPARATOR:    command = "\\menuseparator"; break;
        }
-       fprintf(file, "\\SpecialChar %s\n", command.c_str());
+       os << "\\SpecialChar " << command << "\n";
 }
 
 
 // This function will not be necessary when lyx3
-void InsetSpecialChar::Read(LyXLex &lex)
+void InsetSpecialChar::Read(LyXLex & lex)
 {    
        lex.nextToken();
        string command = lex.GetString();
 
-       if (command=="\\-")
+       if (command == "\\-")
                kind = HYPHENATION;
-       else if (command=="\\@.")
+       else if (command == "\\@.")
                kind = END_OF_SENTENCE;
-       else if (command=="\\ldots{}")
+       else if (command == "\\ldots{}")
                kind = LDOTS;
-       else if (command=="\\menuseparator")
+       else if (command == "\\menuseparator")
                kind = MENU_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
 }
 
 
-int InsetSpecialChar::Latex(FILE *file, signed char /*fragile*/)
+int InsetSpecialChar::Latex(ostream & os, signed char /*fragile*/)
 {
        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*/)
 {
        switch (kind) {
        case HYPHENATION:       file += "\\-";  break;
@@ -171,7 +252,7 @@ int InsetSpecialChar::Latex(string &file, signed char /*fragile*/)
 }
 
 
-int InsetSpecialChar::Linuxdoc(string &file)
+int InsetSpecialChar::Linuxdoc(string & file)
 {
        switch (kind) {
        case HYPHENATION:       file += "";     break;
@@ -183,7 +264,7 @@ int InsetSpecialChar::Linuxdoc(string &file)
 }
 
 
-int InsetSpecialChar::DocBook(string &file)
+int InsetSpecialChar::DocBook(string & file)
 {
        switch (kind) {
        case HYPHENATION:       file += "";     break;
@@ -195,14 +276,13 @@ int InsetSpecialChar::DocBook(string &file)
 }
 
 
-Inset* InsetSpecialChar::Clone()
+Inset * InsetSpecialChar::Clone() const
 {
-       InsetSpecialChar *result = new InsetSpecialChar(kind);
-       return result;
+       return new InsetSpecialChar(kind);
 }
 
 
-void InsetSpecialChar::Validate(LaTeXFeatures& features) const
+void InsetSpecialChar::Validate(LaTeXFeatures & features) const
 {
        if (kind == MENU_SEPARATOR) {
                features.lyxarrow = true;