]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetspecialchar.C
Fix several warnings regarding unused variable/arguments.
[lyx.git] / src / insets / insetspecialchar.C
index e1eba4e01a0e1cafcac681b88874416914237387..4e913c1c32afa33e7126681b24f946c57452644f 100644 (file)
 #include "insetspecialchar.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
+#include "BufferView.h"
 #include "Painter.h"
-#ifndef USE_PAINTER
-#include "lyxdraw.h"
-#endif
+#include "font.h"
+#include "lyxlex.h"
+
+using std::ostream;
+using std::max;
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-       : kind(k)
+       : kind_(k)
 {}
 
 
-#ifdef USE_PAINTER
-int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
+InsetSpecialChar::Kind InsetSpecialChar::kind() const
 {
-       return font.maxAscent();
+       return kind_;
 }
-#else
-int InsetSpecialChar::Ascent(LyXFont const & font) const
+
+int InsetSpecialChar::ascent(BufferView *, LyXFont const & font) const
 {
-       return font.maxAscent();
+       return lyxfont::maxAscent(font);
 }
-#endif
 
 
-#ifdef USE_PAINTER
-int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
+int InsetSpecialChar::descent(BufferView *, LyXFont const & font) const
 {
-       return font.maxDescent();
+       return lyxfont::maxDescent(font);
 }
-#else
-int InsetSpecialChar::Descent(LyXFont const & font) const
-{
-       return font.maxDescent();
-}
-#endif
 
 
-#ifdef USE_PAINTER
-int InsetSpecialChar::width(Painter &, LyXFont const & font) const
+int InsetSpecialChar::width(BufferView *, LyXFont const & font) const
 {
-       LyXFont f(font);
-       switch (kind) {
+       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:
+       case LIGATURE_BREAK:
        {
-               return f.textWidth(".", 1);
+               return lyxfont::width('|', font);
        }
-       case LDOTS:
+       case END_OF_SENTENCE:
        {
-               return f.textWidth(". . .", 5);
+               return lyxfont::width('.', font);
        }
-       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) {
-       case HYPHENATION:
+       case LDOTS:
        {
-               int w = f.textWidth("-", 1);
-               if (w > 5) 
-                       w -= 2; // to make it look shorter
-               return w;
+               return lyxfont::width(". . .", font);
        }
-       case END_OF_SENTENCE:
+       case MENU_SEPARATOR:
        {
-               return f.textWidth(".", 1);
+               return lyxfont::width(" x ", font);
        }
-       case LDOTS:
+       case PROTECTED_SEPARATOR:
        {
-               return f.textWidth(". . .", 5);
-       }
-       case MENU_SEPARATOR: {
-               return f.textWidth(" x ", 3);
+               return lyxfont::width('x', font);
        }
+       
        }
        return 1; // To shut up gcc
 }
-#endif
 
 
-#ifdef USE_PAINTER
-void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
-                           int baseline, float & x) const
+void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
+                           int baseline, float & x, bool) const
 {
+       Painter & pain = bv->painter();
        LyXFont font(f);
-       switch (kind) {
+
+       switch (kind_) {
        case HYPHENATION:
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, "-", font);
-               x += width(pain, font);
+               x += width(bv, font);
+               break;
+       }
+       case LIGATURE_BREAK:
+       {
+               font.setColor(LColor::special);
+               pain.text(int(x), baseline, "|", font);
+               x += width(bv, font);
                break;
        }
        case END_OF_SENTENCE:
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, ".", font);
-               x += width(pain, font);
+               x += width(bv, font);
                break;
        }
        case LDOTS:
        {
                font.setColor(LColor::special);
                pain.text(int(x), baseline, ". . .", font);
-               x += width(pain, font);
+               x += width(bv, 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 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;
@@ -148,143 +131,205 @@ void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
                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::BLUE);
-               scr.drawText(font, "-", 1, baseline, int(x));
-               x += Width(font);
+               x += width(bv, font);
                break;
        }
-       case END_OF_SENTENCE:
+       case PROTECTED_SEPARATOR:
        {
-               font.setColor(LyXFont::BLUE);
-               scr.drawText(font, ".", 1, baseline, int(x));
-               x += Width(font);
-               break;
-       }
-       case LDOTS:
-       {
-               font.setColor(LyXFont::BLUE);
-               scr.drawText(font, ". . .", 5, baseline, int(x));
-               x += Width(font);
+               float w = width(bv, 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;
        }
-       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');
-               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);
-       }
        }
 }
-#endif
 
 
 // In lyxf3 this will be just LaTeX
-void InsetSpecialChar::Write(ostream & os)
+void InsetSpecialChar::write(Buffer const *, ostream & os) const
 {
        string command;
-       switch (kind) {
-       case HYPHENATION:       command = "\\-";        break;
-       case END_OF_SENTENCE:   command = "\\@.";       break;
-       case LDOTS:             command = "\\ldots{}";  break;
-       case MENU_SEPARATOR:    command = "\\menuseparator"; break;
+       switch (kind_) {
+       case HYPHENATION:       
+               command = "\\-";        
+               break;
+       case LIGATURE_BREAK: 
+               command = "\\textcompwordmark{}"; 
+               break;
+       case END_OF_SENTENCE:   
+               command = "\\@.";
+               break;
+       case LDOTS:
+               command = "\\ldots{}";  
+               break;
+       case MENU_SEPARATOR:
+               command = "\\menuseparator"; 
+               break;
+       case PROTECTED_SEPARATOR:
+               //command = "\\protected_separator";
+               command = "~";
+               break;
        }
        os << "\\SpecialChar " << command << "\n";
 }
 
 
 // This function will not be necessary when lyx3
-void InsetSpecialChar::Read(LyXLex & lex)
+void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
 {    
        lex.nextToken();
-       string command = lex.GetString();
+       string const command = lex.getString();
 
        if (command == "\\-")
-               kind = HYPHENATION;
+               kind_ = HYPHENATION;
+       else if (command == "\\textcompwordmark{}")
+               kind_ = LIGATURE_BREAK;
        else if (command == "\\@.")
-               kind = END_OF_SENTENCE;
+               kind_ = END_OF_SENTENCE;
        else if (command == "\\ldots{}")
-               kind = LDOTS;
+               kind_ = LDOTS;
        else if (command == "\\menuseparator")
-               kind = MENU_SEPARATOR;
+               kind_ = MENU_SEPARATOR;
+       else if (command == "\\protected_separator"
+                || command == "~")
+               kind_ = PROTECTED_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
 }
 
 
-int InsetSpecialChar::Latex(ostream & os, signed char /*fragile*/)
+int InsetSpecialChar::latex(Buffer const *, 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 LIGATURE_BREAK:
+               os << "\\textcompwordmark{}";
+               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(Buffer const *, ostream & os, int) const
 {
-       switch (kind) {
-       case HYPHENATION:       file += "\\-";  break;
-       case END_OF_SENTENCE:   file += "\\@."; break;
-       case LDOTS:             file += "\\ldots{}";    break;
-       case MENU_SEPARATOR:    file += "\\lyxarrow{}"; break;
+       switch (kind_) {
+       case HYPHENATION:
+       case LIGATURE_BREAK:
+               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(Buffer const *, ostream & os) const
 {
-       switch (kind) {
-       case HYPHENATION:       file += "";     break;
-       case END_OF_SENTENCE:   file += "";     break;
-       case LDOTS:             file += "...";  break;
-       case MENU_SEPARATOR:    file += "->";   break;
+       switch (kind_) {
+       case HYPHENATION:
+       case LIGATURE_BREAK:
+               break;
+       case END_OF_SENTENCE:
+               os << ".";
+               break;
+       case LDOTS:
+               os << "...";    
+               break;
+       case MENU_SEPARATOR:      
+               os << "&lyxarrow;"; 
+               break;
+       case PROTECTED_SEPARATOR:
+               os << "&nbsp;";
+               break;
        }
        return 0;
 }
 
 
-int InsetSpecialChar::DocBook(string & file)
+int InsetSpecialChar::docbook(Buffer const *, ostream & os) const
 {
-       switch (kind) {
-       case HYPHENATION:       file += "";     break;
-       case END_OF_SENTENCE:   file += "";     break;
-       case LDOTS:             file += "...";  break;
-       case MENU_SEPARATOR:    file += "->";   break;
+       switch (kind_) {
+       case HYPHENATION:
+       case LIGATURE_BREAK:
+               break;
+       case END_OF_SENTENCE:
+               os << ".";
+               break;
+       case LDOTS:
+               os << "...";    
+               break;
+       case MENU_SEPARATOR:
+               os << "&lyxarrow;";
+               break;
+       case PROTECTED_SEPARATOR:
+               os << "&nbsp;";
+               break;
        }
        return 0;
 }
 
 
-Inset * InsetSpecialChar::Clone() const
+Inset * InsetSpecialChar::clone(Buffer const &, bool) const
 {
-       return new InsetSpecialChar(kind);
+       return new InsetSpecialChar(kind_);
 }
 
 
-void InsetSpecialChar::Validate(LaTeXFeatures & features) const
+void InsetSpecialChar::validate(LaTeXFeatures & features) const
 {
-       if (kind == MENU_SEPARATOR) {
+       if (kind_ == MENU_SEPARATOR) {
                features.lyxarrow = true;
        }
 }
+
+
+bool InsetSpecialChar::isLetter() const
+{
+       return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK;
+}
+
+
+bool InsetSpecialChar::isSpace() const
+{
+       return kind_ == PROTECTED_SEPARATOR;
+}