write \mathrm{x}\mathrm{y} as \mathrm{xy} again

[lyx.git] / src / FontInfo.C

diff --git a/src/FontInfo.C b/src/FontInfo.C
index f9a10c2a9aaecbbdfae6d05938f1b38a98fee504..e7eb8117c0b70570e380daa8d303e9912a7b7e53 100644 (file)
--- a/src/FontInfo.C
+++ b/src/FontInfo.C
@@ -1,17 +1,15 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1997 Asger Alstrup
+ *         Copyright 1997 Asger Alstrup
  *           and the LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 #include <cmath>       // fabs()
-#include <cstdlib>     // atoi()
 
 #ifdef __GNUG__
 #pragma implementation "FontInfo.h"
@@ -21,17 +19,23 @@
 #include "debug.h"
 #include "lyxrc.h"     // lyxrc.use_scalable_fonts
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "frontends/GUIRunTime.h"
 
-extern LyXRC * lyxrc;
+using std::endl;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::fabs;
+#endif
 
 /// Load font close to this size
-string FontInfo::getFontname(int size)
+string const FontInfo::getFontname(int size)
 {
        if (!exist())
                return string();
 
        int closestind = -1;
-       double error = 100000;
+       double error = 100000.0;
 
        for (int i = 0; i < matches; ++i) {
                if (sizes[i] == 0) {
@@ -46,9 +50,9 @@ string FontInfo::getFontname(int size)
                }
        }
 
-       if (scalable && lyxrc->use_scalable_fonts) {
+       if (scalable && (lyxrc.use_scalable_fonts || closestind == -1)) {
                // We can use scalable
-               string font = resize(strings[scaleindex], size);
+               string const font = resize(strings[scaleindex], size);
                lyxerr[Debug::FONT] << "Using scalable font to get\n"
                                    << font << endl;
                return font;
@@ -56,7 +60,7 @@ string FontInfo::getFontname(int size)
 
        // Did any fonts get close?
        if (closestind == -1) {
-               // No, and we are not allowed to use scalables, so...
+               // No, so...
                return string();
        }
 
@@ -67,32 +71,30 @@ string FontInfo::getFontname(int size)
        return strings[closestind];
 }
 
+
 /// Build newly sized font string 
-string FontInfo::resize(string const & font, int size) const {
+string const FontInfo::resize(string const & font, int size) const
+{
+       string ret(font);
        // Find the position of the size spec
-#ifdef WITH_WARNINGS
-#warning rewrite to use std::string constructs
-#endif
-       int cut = 0, before = 0, after = 0;
-       for (string::size_type i = 0; i < font.length(); ++i) {
-               if (font[i] == '-') {
+       int cut = 0;
+       string::iterator before = string::iterator(0);
+       string::iterator after = string::iterator(0);
+       for (string::iterator sit = ret.begin();
+            sit != ret.end(); ++sit)
+               if ((*sit) == '-') {
                        ++cut;
-                       if (cut == 7) {
-                               before = i;
-                       } else if (cut == 8) {
-                               after = i;
+                       if (cut == 7) before = sit + 1;
+                       else if (cut == 8) {
+                               after = sit;
                                break;
                        }
                }
-       }
-
-       string head = font;
-       head.erase(before + 1, string::npos);
-       string tail = font;
-       tail.erase(0, after);
-       return head + tostr(size) + tail;
+       ret.replace(before, after, tostr(size));
+       return ret;
 }
 
+
 /// Set new pattern
 void FontInfo::setPattern(string const & pat)
 {
@@ -101,6 +103,7 @@ void FontInfo::setPattern(string const & pat)
        pattern = pat;
 }
 
+
 /// Query font in X11
 void FontInfo::query()
 {
@@ -108,12 +111,16 @@ void FontInfo::query()
                return;
 
        if (pattern.empty()) {
-               lyxerr << "Can not use empty font name for font query." << endl;
+               lyxerr << "Cannot use empty font name for font query."
+                      << endl;
                queried = true;
                return;
        }
 
-       char ** list = XListFonts(fl_display, pattern.c_str(), 100, &matches);
+       char ** list = 0;
+       if (lyxrc.use_gui)
+               list = XListFonts(GUIRunTime::x11Display(), pattern.c_str(),
+                                 100, &matches);
 
        if (list == 0) {
                // No fonts matched
@@ -125,9 +132,11 @@ void FontInfo::query()
                strings = new string[matches];
 
                // We have matches. Run them through
-               for(int i = 0; i < matches; ++i) {
+               for (int i = 0; i < matches; ++i) {
                        string name(list[i]);
-                       sizes[i] = atoi(token(name, '-', 7).c_str());
+                       lyxerr[Debug::FONT] << "match #" << i << " "
+                                           << name << endl; 
+                       sizes[i] = lyx::atoi(token(name, '-', 7));
                        strings[i] = name;
                        if (sizes[i] == 0) {
                                if (scaleindex == -1) {
@@ -141,6 +150,18 @@ void FontInfo::query()
        queried = true;
 }
 
+
+void FontInfo::init()
+{
+       sizes = 0;
+       strings = 0;
+       matches = 0;
+       queried = false;
+       scalable = false;
+       scaleindex = -1;
+}
+
+
 /// Release allocated stuff
 void FontInfo::release()
 {