insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 6f46127c858cb3c8f3567c8ceb5354ea60f56202..95a3ffc3de8ebb5ad4bb5773c54125aa1aed69eb 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -68,7 +68,7 @@ void InsetLatexAccent::checkContents()
        // REMOVE IN 0.13
        // Dirty Hack for backward compability. remove in 0.13 (Lgb)
        contents = trim(contents);
-       if (!contains(contents, "{") && !contains(contents, "}")) {
+       if (!contains(contents, '{') && !contains(contents, '}')) {
                if (contents.length() == 2) {
                        string tmp;
                        tmp += contents[0];
@@ -433,7 +433,9 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
                        // closer to the top of the dot-less 'i' or 'j'.
                        char tmpic = ic; // store the ic when we
                        ic = 'x';        // calculates the ascent of
+#ifdef WITH_WARNINGS
 #warning metrics?
+#endif
                        int asc = ascent(); // the dot-less version (here: 'x')
                        ic = tmpic;      // set the orig ic back
                        y = baseline - asc; // update to new y coord.
@@ -444,8 +446,8 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
                case ACUTE:
                        drawAccent(pi, x2, baseline, char(0xB4));
                        break;
-               
-               case GRAVE: 
+
+               case GRAVE:
                        drawAccent(pi, x2, baseline, char(0x60));
                        break;
 
@@ -477,7 +479,7 @@ void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const
                        drawAccent(pi, x2, baseline, '.');
                        break;
 
-               case CIRCLE: 
+               case CIRCLE:
                        drawAccent(pi, x2, baseline, char(0xB0));
                        break;
 
@@ -601,28 +603,31 @@ void InsetLatexAccent::read(Buffer const &, LyXLex & lex)
 
 
 int InsetLatexAccent::latex(Buffer const &, ostream & os,
-                           LatexRunParams const &) const
+                           OutputParams const &) const
 {
        os << contents;
        return 0;
 }
 
 
-int InsetLatexAccent::ascii(Buffer const &, ostream & os, int) const
+int InsetLatexAccent::plaintext(Buffer const &, ostream & os,
+                           OutputParams const &) const
 {
        os << contents;
        return 0;
 }
 
 
-int InsetLatexAccent::linuxdoc(Buffer const &, ostream & os) const
+int InsetLatexAccent::linuxdoc(Buffer const &, ostream & os,
+                              OutputParams const &) const
 {
        os << contents;
        return 0;
 }
 
 
-int InsetLatexAccent::docbook(Buffer const &, ostream & os, bool) const
+int InsetLatexAccent::docbook(Buffer const &, ostream & os,
+                             OutputParams const &) const
 {
        os << contents;
        return 0;