More fixes to the autocollapsing of paragraphs.

[lyx.git] / src / font.C

diff --git a/src/font.C b/src/font.C
index ef93daa5f91e623baba57cf6d243ff588e5ba143..17e589a6ba9566fc26c434532437057283c7e2a7 100644 (file)
--- a/src/font.C
+++ b/src/font.C
@@ -14,14 +14,16 @@
 #pragma implementation
 #endif
 
-#include <cctype>
-
 #include "font.h"
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
 #include "language.h"
 
+#include <boost/smart_ptr.hpp>
+
+#include <cctype>
+
 namespace {
 
 inline
@@ -110,16 +112,13 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
                return n;
 
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
-               XChar2b * xs = new XChar2b[n];
+               boost::scoped_array<XChar2b> xs(new XChar2b[n]);
                Encoding const * encoding = f.language()->encoding();
-               //LyXFont const * font = &f;
                LyXFont font(f);
-               if (f.family() == LyXFont::SYMBOL_FAMILY) {
+               if (f.isSymbolFont()) {
 #ifdef USE_UNICODE_FOR_SYMBOLS
-                       //LyXFont font2 = f;
                        font.setFamily(LyXFont::ROMAN_FAMILY);
                        font.setShape(LyXFont::UP_SHAPE);
-                       //font = &font2;
 #endif
                        encoding = encodings.symbol_encoding();
                }
@@ -128,8 +127,7 @@ int lyxfont::width(char const * s, size_t n, LyXFont const & f)
                        xs[i].byte1 = c >> 8;
                        xs[i].byte2 = c & 0xff;
                 }
-               int result = width(xs, n, font);
-               delete[] xs;
+               int result = width(xs.get(), n, font);
                return result;
        }