]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
One third of Andre' no-gui patch.
[lyx.git] / src / lyxfont.C
index 1af5356e390ba81633265c1d41b7e0f9052390fa..e793b80ea23f441071c642938eea558b0e376af1 100644 (file)
@@ -3,8 +3,8 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1999 The LyX Team.
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
-#include "lyxdraw.h"
 #include "FontLoader.h"
 #include "support/lstrings.h"
 
-extern LyXRC * lyxrc;
 
 // The global fontloader
 FontLoader fontloader;
@@ -59,11 +57,7 @@ string const lGUISizeNames[15] =
 string const GUIMiscNames[5] = 
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
-string const GUIColorNames[13] = 
-{ N_("None"), N_("Black"), N_("White"), N_("Red"), N_("Green"), N_("Blue"),
-  N_("Cyan"), N_("Magenta"), 
-  N_("Yellow"), N_("Math"), N_("Inset"), N_("Inherit"), N_("Ignore") };
+
 //
 // Strings used to read and write .lyx format files
 //
@@ -84,10 +78,6 @@ string const LyXSizeNames[14] =
 string const LyXMiscNames[12] = 
 { "off", "on", "toggle", "default", "error" };
 
-string const LyXColorNames[13] = 
-{ "none", "black", "white", "red", "green", "blue", "cyan", "magenta", 
-  "yellow", "matherror", "inseterror", "default", "error" };
-
 //
 // Strings used to write LaTeX files
 //
@@ -104,10 +94,41 @@ string const LaTeXShapeNames[6] =
 string const LaTeXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
-string const LaTeXColorNames[13] = 
-{ "none", "black", "white", "red", "green", "blue", "cyan", "magenta", 
-  "yellow", "error12", "error13", "error14", "error15" };
+
+
+LyXFont::FontBits LyXFont::sane = {
+       ROMAN_FAMILY,
+       MEDIUM_SERIES,
+       UP_SHAPE,
+       SIZE_NORMAL,
+       LColor::none,
+       OFF,
+       OFF,
+       OFF,
+       OFF };
+
+LyXFont::FontBits LyXFont::inherit = {
+       INHERIT_FAMILY,
+       INHERIT_SERIES,
+       INHERIT_SHAPE,
+       INHERIT_SIZE,
+       LColor::inherit,
+       INHERIT,
+       INHERIT,
+       INHERIT,
+       INHERIT };
+
+LyXFont::FontBits LyXFont::ignore = {
+       IGNORE_FAMILY,
+       IGNORE_SERIES,
+       IGNORE_SHAPE,
+       IGNORE_SIZE,
+       LColor::ignore,
+       IGNORE,
+       IGNORE,
+       IGNORE,
+       IGNORE };
+
 
 /// Decreases font size by one
 LyXFont & LyXFont::decSize() 
@@ -136,7 +157,7 @@ LyXFont & LyXFont::decSize()
                lyxerr <<"Can't LyXFont::decSize on IGNORE_SIZE" << endl;
                break;
        }
-       return (*this);
+       return *this;
 }
 
 
@@ -167,7 +188,7 @@ LyXFont & LyXFont::incSize()
                lyxerr <<"Can't LyXFont::incSize on IGNORE_SIZE" << endl;
                break;
        }
-       return (*this);
+       return *this;
 }
 
 
@@ -193,7 +214,8 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 
 
 /// Updates font settings according to request
-void LyXFont::update(LyXFont const & newfont, bool toggleall)
+void LyXFont::update(LyXFont const & newfont,
+                    Language const * document_language, bool toggleall)
 {
        if(newfont.family() == family() && toggleall)
                setFamily(INHERIT_FAMILY); // toggle 'back'
@@ -240,9 +262,18 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall)
        setNoun(setMisc(newfont.noun(), noun()));
        setLatex(setMisc(newfont.latex(), latex()));
 
-       if(newfont.color() == color() && toggleall)
-               setColor(INHERIT_COLOR); // toggle 'back'
-       else if (newfont.color() != IGNORE_COLOR)
+       if (newfont.language() != ignore_language)
+               if (language() == newfont.language())
+                       if (language() == document_language)
+                               setLanguage(default_language);
+                       else
+                               setLanguage(document_language);
+               else
+                       setLanguage(newfont.language());
+
+       if (newfont.color() == color() && toggleall)
+               setColor(LColor::inherit); // toggle 'back'
+       else if (newfont.color() != LColor::ignore)
                setColor(newfont.color());
 }
 
@@ -267,64 +298,46 @@ void LyXFont::reduce(LyXFont const & tmplt)
        if (latex() == tmplt.latex())
                setLatex(INHERIT);
        if (color() == tmplt.color())
-               setColor(INHERIT_COLOR);
+               setColor(LColor::inherit);
 }
 
 
 /// Realize font from a template
-// This one is not pretty, but it's extremely fast (Asger)
 LyXFont & LyXFont::realize(LyXFont const & tmplt)
 {
        if (bits == inherit) {
                bits = tmplt.bits;
                return *this;
        }
+       
+       if (bits.family == INHERIT_FAMILY) {
+               bits.family = tmplt.bits.family;
+       }
+       if (bits.series == INHERIT_SERIES) {
+               bits.series = tmplt.bits.series;
+       }
+       if (bits.shape == INHERIT_SHAPE) {
+               bits.shape = tmplt.bits.shape;
+       }
+       if (bits.size == INHERIT_SIZE) {
+               bits.size = tmplt.bits.size;
+       }
+       if (bits.emph == INHERIT) {
+               bits.emph = tmplt.bits.emph;
+       }
+       if (bits.underbar == INHERIT) {
+               bits.underbar = tmplt.bits.underbar;
+       }
+       if (bits.noun == INHERIT) {
+               bits.noun = tmplt.bits.noun;
+       }
+       if (bits.latex == INHERIT) {
+               bits.latex = tmplt.bits.latex;
+       }
+       if (bits.color == LColor::inherit) {
+               bits.color = tmplt.bits.color;
+       }
 
-       if ((bits & (Fam_Mask<<Fam_Pos)) == (ui32(INHERIT_FAMILY)<<Fam_Pos))
-               {
-                       bits &= ~(Fam_Mask << Fam_Pos);
-                       bits |= (tmplt.bits & Fam_Mask << Fam_Pos);
-               }
-       if ((bits & (Ser_Mask<<Ser_Pos)) == (ui32(INHERIT_SERIES)<<Ser_Pos))
-               {
-                       bits &= ~(Ser_Mask << Ser_Pos);
-                       bits |= (tmplt.bits & Ser_Mask << Ser_Pos);
-               }
-       if ((bits & (Sha_Mask << Sha_Pos)) == ui32(INHERIT_SHAPE) << Sha_Pos)
-               {
-                       bits &= ~(Sha_Mask << Sha_Pos);
-                       bits |= (tmplt.bits & Sha_Mask << Sha_Pos);
-               }
-       if ((bits & (Siz_Mask << Siz_Pos)) == ui32(INHERIT_SIZE) << Siz_Pos)
-               {
-                       bits &= ~(Siz_Mask << Siz_Pos);
-                       bits |= (tmplt.bits & Siz_Mask << Siz_Pos);
-               }
-       if ((bits & (Misc_Mask << Emp_Pos)) == ui32(INHERIT) << Emp_Pos)
-               {
-                       bits &= ~(Misc_Mask << Emp_Pos);
-                       bits |= (tmplt.bits & Misc_Mask << Emp_Pos);
-               }
-       if ((bits & (Misc_Mask << Und_Pos)) == ui32(INHERIT) << Und_Pos)
-               {
-                       bits &= ~(Misc_Mask << Und_Pos);
-                       bits |= (tmplt.bits & Misc_Mask << Und_Pos);
-               }
-       if ((bits & (Misc_Mask << Nou_Pos)) == ui32(INHERIT) << Nou_Pos)
-               {
-                       bits &= ~(Misc_Mask << Nou_Pos);
-                       bits |= (tmplt.bits & Misc_Mask << Nou_Pos);
-               }
-       if ((bits & (Misc_Mask << Lat_Pos)) == ui32(INHERIT) << Lat_Pos)
-               {
-                       bits &= ~(Misc_Mask << Lat_Pos);
-                       bits |= (tmplt.bits & Misc_Mask << Lat_Pos);
-               }
-       if ((bits & (Col_Mask << Col_Pos)) == ui32(INHERIT_COLOR) << Col_Pos)
-               {
-                       bits &= ~(Col_Mask << Col_Pos);
-                       bits |= (tmplt.bits & Col_Mask << Col_Pos);
-               }
        return *this;
 }
 
@@ -336,7 +349,7 @@ bool LyXFont::resolved() const
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT && 
                noun() != INHERIT && latex() != INHERIT && 
-               color() != INHERIT_COLOR);
+               color() != LColor::inherit);
 }
 
 
@@ -352,9 +365,8 @@ string LyXFont::stateText() const
                buf += string(_(GUIShapeNames[shape()].c_str())) + ", ";
        if (size() != INHERIT_SIZE)
                buf += string(_(GUISizeNames[size()].c_str())) + ", ";
-       if (color() != INHERIT_COLOR)
-               buf += string(_(GUIColorNames[color()].c_str())) + ", ";
+       if (color() != LColor::inherit)
+               buf += lcolor.getGUIName(color()) + ", ";
        if (emph() != INHERIT)
                buf += string(_("Emphasis ")) + _(GUIMiscNames[emph()].c_str()) + ", ";
        if (underbar() != INHERIT)
@@ -367,6 +379,7 @@ string LyXFont::stateText() const
                buf = _("Default");
        buf = strip(buf, ' ');
        buf = strip(buf, ',');
+       buf += "  " + string(_("Language: ")) + _(language()->display.c_str());
        return buf;
 }
 
@@ -376,14 +389,14 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 {
        string s = lowercase(fam);
 
-       int i= 0;
-       while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") i++;
+       int i = 0;
+       while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
        if (s == LyXFamilyNames[i]) {
                setFamily(LyXFont::FONT_FAMILY(i));
        } else
                lyxerr << "LyXFont::setLyXFamily: Unknown family `"
                       << s << '\'' << endl;
-       return (*this);
+       return *this;
 }
 
 
@@ -392,14 +405,14 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 {
        string s = lowercase(ser);
 
-       int i= 0;
-       while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") i++;
+       int i = 0;
+       while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
        if (s == LyXSeriesNames[i]) {
                setSeries(LyXFont::FONT_SERIES(i));
        } else
                lyxerr << "LyXFont::setLyXSeries: Unknown series `"
                       << s << '\'' << endl;
-       return (*this);
+       return *this;
 }
 
 
@@ -408,14 +421,14 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 {
        string s = lowercase(sha);
 
-       int i= 0;
-       while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") i++;
+       int i = 0;
+       while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
        if (s == LyXShapeNames[i]) {
                setShape(LyXFont::FONT_SHAPE(i));
        } else
                lyxerr << "LyXFont::setLyXShape: Unknown shape `"
                       << s << '\'' << endl;
-       return (*this);
+       return *this;
 }
 
 
@@ -423,14 +436,14 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 LyXFont & LyXFont::setLyXSize(string const & siz)
 {
        string s = lowercase(siz);
-       int i= 0;
-       while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") i++;
+       int i = 0;
+       while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
        if (s == LyXSizeNames[i]) {
                setSize(LyXFont::FONT_SIZE(i));
        } else
                lyxerr << "LyXFont::setLyXSize: Unknown size `"
                       << s << '\'' << endl;
-       return (*this);
+       return *this;
 }
 
 // Set size according to lyx format string
@@ -438,7 +451,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
        string s = lowercase(siz);
        int i= 0;
-       while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") i++;
+       while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
        if (s == LyXMiscNames[i])
                return FONT_MISC_STATE(i);
        lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `"
@@ -449,32 +462,20 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 /// Sets color after LyX text format
 LyXFont & LyXFont::setLyXColor(string const & col)
 {
-       string s = lowercase(col);
-       int i= 0;
-       while (s != LyXColorNames[i] && LyXColorNames[i] != "error") i++;
-       if (s == LyXColorNames[i]) {
-               setColor(LyXFont::FONT_COLOR(i));
-       } else
-               lyxerr << "LyXFont::setLyXColor: Unknown Color `"
-                      << s << '\'' << endl;
-       return (*this);
+       setColor(lcolor.getFromLyXName(col));
+       return *this;
 }
 
 
 /// Sets size after GUI name
 LyXFont & LyXFont::setGUISize(string const & siz)
 {
-       string s = lowercase(siz);
-       int i= 0;
-       while (!lGUISizeNames[i].empty() &&
-              s != _(lGUISizeNames[i].c_str()))
-               i++;
-       if (s == _(lGUISizeNames[i].c_str())) {
-               setSize(LyXFont::FONT_SIZE(i));
-       } else
-               lyxerr << "LyXFont::setGUISize: Unknown Size `"
-                      << s << '\'' << endl;
-       return (*this);
+#warning this might be wrong.
+       /// ??????
+       // this is how it was how it was done in the lyx repository...
+       // but this does not make sense.
+       setColor(lcolor.getFromGUIName(siz));
+       return *this;
 }
 
 
@@ -554,7 +555,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        error = true;
                }
        }
-       return * this;
+       return *this;
 }
 
 
@@ -613,77 +614,102 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
                }
        }
        if (orgfont.color() != color()) {
-               os << "\\color " << LyXColorNames[color()] << "\n";
+               os << "\\color " << lcolor.getLyXName(color()) << "\n";
+       }
+       if (orgfont.language() != language()) {
+               if (language())
+                       os << "\\lang " << language()->lang << endl;
+               else
+                       os << "\\lang unknown\n";
        }
 }
 
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int LyXFont::latexWriteStartChanges(string & file, LyXFont const & base) const
+int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
+                                   LyXFont const & prev) const
 {
-       LyXFont f = *this;
-       f.reduce(base);
-       
-       if (f.bits == inherit)
-               return 0;
-       
        int count = 0;
        bool env = false;
+
+       if (language() != prev.language()) {
+               if (isRightToLeft() != prev.isRightToLeft()) {
+                       if (isRightToLeft()) {
+                               os << "\\R{";
+                               count += 3;
+                               env = true; //We have opened a new environment
+                       } else {
+                               os << "\\L{";
+                               count += 3;
+                               env = true; //We have opened a new environment
+                       }
+               } else {
+                       string tmp = '{' + 
+                               subst(lyxrc.language_command_begin,
+                                     "$$lang", language()->lang);
+                       os << tmp;
+                       count += tmp.length();
+                       env = true; //We have opened a new environment
+               }
+       }
+
+       LyXFont f = *this;
+       f.reduce(base);
        
        if (f.family() != INHERIT_FAMILY) {
-               file += '\\';
-               file += LaTeXFamilyNames[f.family()];
-               file += '{';
+               os << '\\'
+                  << LaTeXFamilyNames[f.family()]
+                  << '{';
                count += LaTeXFamilyNames[f.family()].length() + 2;
                env = true; //We have opened a new environment
        }
        if (f.series() != INHERIT_SERIES) {
-               file += '\\';
-               file += LaTeXSeriesNames[f.series()];
-               file += '{';
+               os << '\\'
+                  << LaTeXSeriesNames[f.series()]
+                  << '{';
                count += LaTeXSeriesNames[f.series()].length() + 2;
                env = true; //We have opened a new environment
        }
        if (f.shape() != INHERIT_SHAPE) {
-               file += '\\';
-               file += LaTeXShapeNames[f.shape()];
-               file += '{';
+               os << '\\'
+                  << LaTeXShapeNames[f.shape()]
+                  << '{';
                count += LaTeXShapeNames[f.shape()].length() + 2;
                env = true; //We have opened a new environment
        }
-       if (f.color() != INHERIT_COLOR) {
-               file += "\\textcolor{";
-               file += LaTeXColorNames[f.color()];
-               file += "}{";
-               count += LaTeXColorNames[f.color()].length() + 13;
+       if (f.color() != LColor::inherit) {
+               os << "\\textcolor{"
+                  << lcolor.getLaTeXName(f.color())
+                  << "}{";
+               count += lcolor.getLaTeXName(f.color()).length() + 13;
                env = true; //We have opened a new environment
        }
        if (f.emph() == ON) {
-               file += "\\emph{";
+               os << "\\emph{";
                count += 6;
                env = true; //We have opened a new environment
        }
        if (f.underbar() == ON) {
-               file += "\\underbar{";
+               os << "\\underbar{";
                count += 10;
                env = true; //We have opened a new environment
        }
        // \noun{} is a LyX special macro
        if (f.noun() == ON) {
-               file += "\\noun{";
+               os << "\\noun{";
                count += 8;
                env = true; //We have opened a new environment
        }
        if (f.size() != INHERIT_SIZE) {
                // If we didn't open an environment above, we open one here
                if (!env) {
-                       file += '{';
-                       count++;
+                       os << '{';
+                       ++count;
                }
-               file += '\\';
-               file += LaTeXSizeNames[f.size()];
-               file += ' ';
+               os << '\\'
+                  << LaTeXSizeNames[f.size()]
+                  << ' ';
                count += LaTeXSizeNames[f.size()].length() + 2;
        }
        return count;
@@ -693,66 +719,81 @@ int LyXFont::latexWriteStartChanges(string & file, LyXFont const & base) const
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int LyXFont::latexWriteEndChanges(string & file, LyXFont const & base) const
+int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
+                                 LyXFont const & next) const
 {
+       int count = 0;
+       bool env = false;
+
+       if (language() != next.language()) {
+               os << "}";
+               ++count;
+               env = true; // Size change need not bother about closing env.
+       }
+
        LyXFont f = *this; // why do you need this?
        f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
        // Because this function is const. Everything breaks if this
        // method changes the font it represents. There is no speed penalty
        // by using the temporary. (Asger)
 
-       if (f.bits == inherit)
-               return 0;
-       
-       int count = 0;
-       bool env = false;
        if (f.family() != INHERIT_FAMILY) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.series() != INHERIT_SERIES) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.shape() != INHERIT_SHAPE) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
-       if (f.color() != INHERIT_COLOR) {
-               file += '}';
+       if (f.color() != LColor::inherit) {
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.emph() == ON) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.underbar() == ON) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.noun() == ON) {
-               file += '}';
+               os << '}';
                ++count;
                env = true; // Size change need not bother about closing env.
        }
        if (f.size() != INHERIT_SIZE) {
                // We only have to close if only size changed
                if (!env) {
-                       file += '}';
+                       os << '}';
                        ++count;
                }
        }
-       
+
        return count;
 }
 
 
+LColor::color LyXFont::realColor() const
+{
+       if (latex() == ON)
+               return LColor::latex;
+       if (color() == LColor::none)
+               return LColor::foreground;
+       return color();
+}
+
+
 // Convert logical attributes to concrete shape attribute
 LyXFont::FONT_SHAPE LyXFont::realShape() const
 {
@@ -770,27 +811,6 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const
 }
 
 
-GC LyXFont::getGC() const
-{
-       GC gc;
-       if (latex() == ON)
-               gc = ::getGC(gc_latex);
-       else {
-               if (color() == NONE)
-                       gc = ::getGC(gc_copy);
-               else if (color() == MATH)
-                       gc = ::getGC(gc_math);
-               else if (color() == INSET)
-                       gc = ::getGC(gc_foot);
-               else
-                       gc = ::GetColorGC(color());
-       }
-
-       XSetFont(fl_display, gc, getXFontstruct()->fid);
-       return gc;
-}
-
-
 XFontStruct * LyXFont::getXFontstruct() const
 {
        return fontloader.load(family(), series(), realShape(), size());
@@ -812,12 +832,12 @@ int LyXFont::maxDescent() const
 int LyXFont::ascent(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && c >= static_cast<char>(finfo->min_char_or_byte2)
-           && c <= static_cast<char>(finfo->max_char_or_byte2)) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].ascent;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].ascent;
+       else
                return finfo->ascent;
 }
 
@@ -825,21 +845,47 @@ int LyXFont::ascent(char c) const
 int LyXFont::descent(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && c >= static_cast<char>(finfo->min_char_or_byte2)
-           && c <= static_cast<char>(finfo->max_char_or_byte2)) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].descent;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].descent;
+       else
                return finfo->descent;
 }
 
 
+int LyXFont::lbearing(char c) const
+{
+       XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
+       if (finfo->per_char
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].lbearing;
+       else
+               return 0;
+}
+
+
+int LyXFont::rbearing(char c) const
+{
+       XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
+       if (finfo->per_char
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].rbearing;
+       else
+               return width(c);
+}
+
+
 // Specialized after profiling. (Asger)
 int LyXFont::width(char c) const
 {
        if (realShape() != LyXFont::SMALLCAPS_SHAPE){
-               return XTextWidth(getXFontstruct(), &c, 1);
+               return lyxrc.use_gui ? XTextWidth(getXFontstruct(), &c, 1) : 1;
        } else {
                return textWidth(&c, 1);
        }
@@ -848,6 +894,9 @@ int LyXFont::width(char c) const
 
 int LyXFont::textWidth(char const * s, int n) const
 {
+       if (!lyxrc.use_gui)
+               return n;
+
        if (realShape() != LyXFont::SMALLCAPS_SHAPE){
                return XTextWidth(getXFontstruct(), s, n);
        } else {
@@ -858,9 +907,10 @@ int LyXFont::textWidth(char const * s, int n) const
                smallfont.decSize();
                smallfont.decSize();
                smallfont.setShape(LyXFont::UP_SHAPE);
-               for (int i= 0; i < n; i++){
+               for (int i = 0; i < n; ++i) {
                        c = s[i];
-                       if (islower(c)){
+                       // when islower is a macro, the cast is needed (JMarc)
+                       if (islower(static_cast<unsigned char>(c))){
                                c = toupper(c);
                                result += XTextWidth(smallfont.getXFontstruct(), &c, 1);
                        } else {
@@ -889,47 +939,46 @@ int LyXFont::signedStringWidth(string const & s) const
 }
 
 
-int LyXFont::drawText(char const * s, int n, Pixmap pm
-                     int baseline, int x) const
+int LyXFont::drawText(char const * s, int n, Pixmap, 
+                     int, int x) const
 {
        if (realShape() != LyXFont::SMALLCAPS_SHAPE) {
-               XDrawString(fl_display,
-                           pm,
-                           getGC(),
-                           x, baseline,
-                           s, n);
-               XFlush(fl_display);
+               /* XDrawString(fl_display,
+                  pm,
+                  getGC(),
+                  x, baseline,
+                  s, n);
+                  XFlush(fl_display); */
                return XTextWidth(getXFontstruct(), s, n);
 
        } else {
                // emulate smallcaps since X doesn't support this
-               int i;
                char c;
                int sx = x;
                LyXFont smallfont = *this;
                smallfont.decSize();
                smallfont.decSize();
                smallfont.setShape(LyXFont::UP_SHAPE);
-               for (i= 0; i < n; i++){
+               for (int i = 0; i < n; ++i) {
                        c = s[i];
-                       if (islower(c)){
+                       if (islower(static_cast<unsigned char>(c))){
                                c = toupper(c);
-                               XDrawString(fl_display,
-                                           pm,
-                                           smallfont.getGC(),
-                                           x, baseline,
-                                           &c, 1);
+                               /* XDrawString(fl_display,
+                                  pm,
+                                  smallfont.getGC(),
+                                  x, baseline,
+                                  &c, 1); */
                                x += XTextWidth(smallfont.getXFontstruct(),
                                                &c, 1);
-                               XFlush(fl_display);
+                               //XFlush(fl_display);
                        } else {
-                               XDrawString(fl_display,
-                                           pm,
-                                           getGC(),
-                                           x, baseline,
-                                           &c, 1);
+                               /* XDrawString(fl_display,
+                                  pm,
+                                  getGC(),
+                                  x, baseline,
+                                  &c, 1);*/
                                x += XTextWidth(getXFontstruct(), &c, 1);
-                               XFlush(fl_display);
+                               //XFlush(fl_display);
                        }
                }
                return x - sx;
@@ -950,7 +999,6 @@ bool LyXFont::equalExceptLatex(LyXFont const & f) const
        return f1 == f;
 }
 
-
 ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
 {
        return o << int(fms);