Don't remove cell selections after fontchange.

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

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index ccd8401ebf742bf3a83ec07e1fae42676881fe40..a7cc82eb0a2061db79a51636950434e99e42336f 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -47,7 +47,10 @@ void InsetLatexAccent::checkContents()
 {
         candisp = false;
 
-       if (contents.empty() || contents.length() < 2) return;
+       if (contents.empty() || contents.length() < 2) {
+               lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+               return;
+       }
 
        // REMOVE IN 0.13
        // Dirty Hack for backward compability. remove in 0.13 (Lgb)
@@ -87,7 +90,10 @@ void InsetLatexAccent::checkContents()
                        contents = tmp;
                }
        }
-        if (contents[0] != '\\') return; // demand that first char is a '\\'
+        if (contents[0] != '\\') { // demand that first char is a '\\'
+               lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+               return;
+       }
 
        lyxerr[Debug::KEY] << "Decode: " << contents << endl;
 
@@ -409,7 +415,7 @@ void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0,
                        pain.fillRectangle(int(x + tmpx), tmpvar, wid,
                                           lyxfont::ascent('i', font) -
                                           lyxfont::ascent('x', font) - 1,
-                                          LColor::background);
+                                          backgroundColor());
                        // the five lines below is a simple hack to
                        // make the display of accent 'i' and 'j'
                        // better. It makes the accent be written
@@ -542,7 +548,7 @@ void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0,
                case UMLAUT:    // umlaut
                {
                        pain.text(int(x2 - (lyxfont::rbearing('¨', font) - lyxfont::lbearing('¨', font)) / 2),
-                                 baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - ( lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2,
+                                 baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - (lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2,
                                  '¨', font);
                        break;
                }
@@ -602,7 +608,8 @@ void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0,
                                   baseline - ascent(bv, font) + 1,
                                   width(bv, font) - 2,
                                   ascent(bv, font)
-                                  + descent(bv, font) - 2);
+                                  + descent(bv, font) - 2,
+                                  backgroundColor());
                pain.rectangle(int(x + 1), baseline - ascent(bv, font) + 1,
                               width(bv, font) - 2,
                               ascent(bv, font) + descent(bv, font) - 2);
@@ -620,8 +627,8 @@ void InsetLatexAccent::write(Buffer const *, ostream & os) const
 
 void InsetLatexAccent::read(Buffer const *, LyXLex & lex)
 {
-       lex.EatLine();
-       contents = lex.GetString();
+       lex.eatLine();
+       contents = lex.getString();
        checkContents();
 }
 
@@ -648,7 +655,7 @@ int InsetLatexAccent::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetLatexAccent::docBook(Buffer const *, ostream & os) const
+int InsetLatexAccent::docbook(Buffer const *, ostream & os) const
 {
        os << contents;
        return 0;