]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetspecialchar.C
clear()->erase() ; lots of using directives for cxx
[lyx.git] / src / insets / insetspecialchar.C
index 3f38317bbab0534a3f3a19d0da018ebd2c0f0f49..8caa469bfebcb8ef3c215c006d2fd9843b1d9c83 100644 (file)
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "Painter.h"
+#include "font.h"
 
+using std::ostream;
+using std::max;
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
        : kind(k)
@@ -26,38 +29,43 @@ InsetSpecialChar::InsetSpecialChar(Kind k)
 
 int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
 {
-       return font.maxAscent();
+       return lyxfont::maxAscent(font);
 }
 
 
 int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
 {
-       return font.maxDescent();
+       return lyxfont::maxDescent(font);
 }
 
 
 int InsetSpecialChar::width(Painter &, LyXFont const & font) const
 {
-       LyXFont f(font);
        switch (kind) {
        case HYPHENATION:
        {
-               int w = f.textWidth("-", 1);
+               int w = lyxfont::width('-', font);
                if (w > 5) 
                        w -= 2; // to make it look shorter
                return w;
        }
        case END_OF_SENTENCE:
        {
-               return f.textWidth(".", 1);
+               return lyxfont::width('.', font);
        }
        case LDOTS:
        {
-               return f.textWidth(". . .", 5);
+               return lyxfont::width(". . .", font);
        }
-       case MENU_SEPARATOR: {
-               return f.textWidth(" x ", 3);
+       case MENU_SEPARATOR:
+       {
+               return lyxfont::width(" x ", font);
+       }
+       case PROTECTED_SEPARATOR:
+       {
+               return lyxfont::width('x', font);
        }
+       
        }
        return 1; // To shut up gcc
 }
@@ -92,9 +100,9 @@ void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
        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 w = lyxfont::width('x', font);
+               int ox = lyxfont::width(' ', font) + int(x);
+               int h = lyxfont::ascent('x', font);
                int xp[4], yp[4];
                
                xp[0] = ox;     yp[0] = baseline;
@@ -104,13 +112,36 @@ void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
                
                pain.lines(xp, yp, 4, LColor::special);
                x += width(pain, font);
+               break;
+       }
+       case PROTECTED_SEPARATOR:
+       {
+               float w = width(pain, font);
+               int h = lyxfont::ascent('x', font);
+               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(ostream & os)
+void InsetSpecialChar::Write(ostream & os) const
 {
        string command;
        switch (kind) {
@@ -118,6 +149,8 @@ void InsetSpecialChar::Write(ostream & os)
        case END_OF_SENTENCE:   command = "\\@.";       break;
        case LDOTS:             command = "\\ldots{}";  break;
        case MENU_SEPARATOR:    command = "\\menuseparator"; break;
+       case PROTECTED_SEPARATOR:
+                               command = "\\protected_separator";          break;
        }
        os << "\\SpecialChar " << command << "\n";
 }
@@ -137,54 +170,48 @@ 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(ostream & os, signed char /*fragile*/)
+int InsetSpecialChar::Latex(ostream & os, bool /*fragile*/,
+                           bool free_space) const
 {
-       string command;
-       signed char dummy = 0;
-       Latex(command, dummy);
-       os << command;
+       switch (kind) {
+       case HYPHENATION:         os << "\\-";  break;
+       case END_OF_SENTENCE:     os << "\\@."; break;
+       case LDOTS:               os << "\\ldots{}";    break;
+       case MENU_SEPARATOR:      os << "\\lyxarrow{}"; break;
+       case PROTECTED_SEPARATOR: os << (free_space ? " " : "~"); break;
+       }
        return 0;
 }
 
-
-int InsetSpecialChar::Latex(string & file, signed char /*fragile*/)
+int InsetSpecialChar::Ascii(ostream & os) 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 HYPHENATION:                       break;
+       case END_OF_SENTENCE:     os << ".";    break;
+       case LDOTS:               os << "...";  break;
+       case MENU_SEPARATOR:      os << "->";   break;
+       case PROTECTED_SEPARATOR: os << " ";   break;
        }
        return 0;
 }
 
 
-int InsetSpecialChar::Linuxdoc(string & file)
+int InsetSpecialChar::Linuxdoc(ostream & os) const
 {
-       switch (kind) {
-       case HYPHENATION:       file += "";     break;
-       case END_OF_SENTENCE:   file += "";     break;
-       case LDOTS:             file += "...";  break;
-       case MENU_SEPARATOR:    file += "->";   break;
-       }
-       return 0;
+       return Ascii(os);
 }
 
 
-int InsetSpecialChar::DocBook(string & file)
+int InsetSpecialChar::DocBook(ostream & os) const
 {
-       switch (kind) {
-       case HYPHENATION:       file += "";     break;
-       case END_OF_SENTENCE:   file += "";     break;
-       case LDOTS:             file += "...";  break;
-       case MENU_SEPARATOR:    file += "->";   break;
-       }
-       return 0;
+       return Ascii(os);
 }