Don't remove cell selections after fontchange.

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

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index a94e33e42503264fdefcf870e1b3ae611b7f07cd..0c03dde33cea8adad5b0a3fd02d71bdd545a99de 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -19,15 +19,22 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "font.h"
+#include "lyxlex.h"
+#include "lyxfont.h"
 
 using std::ostream;
 using std::max;
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
-       : kind(k)
+       : kind_(k)
 {}
 
 
+InsetSpecialChar::Kind InsetSpecialChar::kind() const
+{
+       return kind_;
+}
+
 int InsetSpecialChar::ascent(BufferView *, LyXFont const & font) const
 {
        return lyxfont::maxAscent(font);
@@ -42,7 +49,7 @@ int InsetSpecialChar::descent(BufferView *, LyXFont const & font) const
 
 int InsetSpecialChar::width(BufferView *, LyXFont const & font) const
 {
-       switch (kind) {
+       switch (kind_) {
        case HYPHENATION:
        {
                int w = lyxfont::width('-', font);
@@ -50,6 +57,10 @@ int InsetSpecialChar::width(BufferView *, LyXFont const & font) const
                        w -= 2; // to make it look shorter
                return w;
        }
+       case LIGATURE_BREAK:
+       {
+               return lyxfont::width('|', font);
+       }
        case END_OF_SENTENCE:
        {
                return lyxfont::width('.', font);
@@ -78,7 +89,7 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
        Painter & pain = bv->painter();
        LyXFont font(f);
 
-       switch (kind) {
+       switch (kind_) {
        case HYPHENATION:
        {
                font.setColor(LColor::special);
@@ -86,6 +97,13 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
                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);
@@ -147,11 +165,22 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
 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 = "~";
@@ -165,19 +194,21 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const
 void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
 {    
        lex.nextToken();
-       string const 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;
+               kind_ = PROTECTED_SEPARATOR;
        else
                lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
 }
@@ -186,12 +217,25 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
 int InsetSpecialChar::latex(Buffer const *, ostream & os, bool /*fragile*/,
                            bool free_space) const
 {
-       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;
+       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;
 }
@@ -199,38 +243,106 @@ int InsetSpecialChar::latex(Buffer const *, ostream & os, bool /*fragile*/,
 
 int InsetSpecialChar::ascii(Buffer const *, ostream & os, int) const
 {
-       switch (kind) {
-       case HYPHENATION:                       break;
-       case END_OF_SENTENCE:     os << ".";    break;
-       case LDOTS:               os << "...";  break;
-       case MENU_SEPARATOR:      os << "->";   break;
-       case PROTECTED_SEPARATOR: os << " ";   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(Buffer const * buf, ostream & os) const
+int InsetSpecialChar::linuxdoc(Buffer const *, ostream & os) const
 {
-       return ascii(buf, os, 0);
+       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(Buffer const * buf, ostream & os) const
+int InsetSpecialChar::docbook(Buffer const *, ostream & os) const
 {
-       return ascii(buf, os, 0);
+       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(Buffer const &) const
+Inset * InsetSpecialChar::clone(Buffer const &, bool) const
 {
-       return new InsetSpecialChar(kind);
+       return new InsetSpecialChar(kind_);
 }
 
 
 void InsetSpecialChar::validate(LaTeXFeatures & features) const
 {
-       if (kind == MENU_SEPARATOR) {
-               features.lyxarrow = true;
+       if (kind_ == MENU_SEPARATOR) {
+               features.require("lyxarrow");
        }
 }
+
+
+bool InsetSpecialChar::isChar() const
+{
+       return true;
+}
+
+
+bool InsetSpecialChar::isLetter() const
+{
+       return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK;
+}
+
+
+bool InsetSpecialChar::isSpace() const
+{
+       return kind_ == PROTECTED_SEPARATOR;
+}
+
+
+bool InsetSpecialChar::isLineSeparator() const
+{
+       return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR;
+}