X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=0c783cb148bad8df1807953eb39bfb8ba778e03a;hb=bd659b25fb6e2df5d02273ee1ce4699aa5723e2e;hp=be2be84f2b47023817797bc1b0a755b205ae3312;hpb=1bc4b735755ab8addc9e7bca305889e4784e7ceb;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index be2be84f2b..0c783cb148 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -4,7 +4,7 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2000 The LyX Team. * * ====================================================== */ @@ -22,92 +22,141 @@ #include "debug.h" #include "lyxrc.h" #include "lyxlex.h" -#include "lyxdraw.h" #include "FontLoader.h" #include "support/lstrings.h" +#include "bufferparams.h" // stateText -extern LyXRC * lyxrc; - -// The global fontloader -FontLoader fontloader; +using std::ostream; +using std::endl; // // Names for the GUI // -string const GUIFamilyNames[6] = +static +char const * GUIFamilyNames[6] = { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"), N_("Ignore") }; - -string const GUISeriesNames[4] = + +static +char const * GUISeriesNames[4] = { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") }; -string const GUIShapeNames[6] = +static +char const * GUIShapeNames[6] = { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"), N_("Ignore") }; -string const GUISizeNames[14] = +static +char const * GUISizeNames[14] = { N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"), N_("Inherit"), N_("Ignore") }; -string const lGUISizeNames[15] = -{ N_("tiny"), N_("smallest"), N_("smaller"), N_("small"), N_("normal"), N_("large"), - N_("larger"), N_("largest"), N_("huge"), N_("huger"), N_("increase"), N_("decrease"), - N_("inherit"), N_("ignore"), string() }; - -string const GUIMiscNames[5] = +static +char 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 // -string const LyXFamilyNames[6] = +static +char const * LyXFamilyNames[6] = { "roman", "sans", "typewriter", "symbol", "default", "error" }; - -string const LyXSeriesNames[4] = + +static +char const * LyXSeriesNames[4] = { "medium", "bold", "default", "error" }; - -string const LyXShapeNames[6] = + +static +char const * LyXShapeNames[6] = { "up", "italic", "slanted", "smallcaps", "default", "error" }; - -string const LyXSizeNames[14] = + +static +char const * LyXSizeNames[14] = { "tiny", "scriptsize", "footnotesize", "small", "normal", "large", "larger", "largest", "huge", "giant", "increase-error", "decrease-error", "default", "error" }; -string const LyXMiscNames[12] = +static +char const * LyXMiscNames[5] = { "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 // - -string const LaTeXFamilyNames[6] = +static +char const * LaTeXFamilyNames[6] = { "textrm", "textsf", "texttt", "error1", "error2", "error3" }; - -string const LaTeXSeriesNames[4] = + +static +char const * LaTeXSeriesNames[4] = { "textmd", "textbf", "error4", "error5" }; - -string const LaTeXShapeNames[6] = + +static +char const * LaTeXShapeNames[6] = { "textup", "textit", "textsl", "textsc", "error6", "error7" }; - -string const LaTeXSizeNames[14] = + +static +char 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 }; + + +bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const +{ + return fb1.family == family && + fb1.series == series && + fb1.shape == shape && + fb1.size == size && + fb1.color == color && + fb1.emph == emph && + fb1.underbar == underbar && + fb1.noun == noun && + fb1.latex == latex; +} + + +bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const +{ + return !(fb1 == *this); +} + /// Decreases font size by one LyXFont & LyXFont::decSize() @@ -136,7 +185,7 @@ LyXFont & LyXFont::decSize() lyxerr <<"Can't LyXFont::decSize on IGNORE_SIZE" << endl; break; } - return (*this); + return *this; } @@ -167,7 +216,7 @@ LyXFont & LyXFont::incSize() lyxerr <<"Can't LyXFont::incSize on IGNORE_SIZE" << endl; break; } - return (*this); + return *this; } @@ -193,7 +242,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 +290,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) + setNumber(setMisc(newfont.number(), number())); + if (newfont.language() == language() && toggleall) + if (language() == document_language) + setLanguage(default_language); + else + setLanguage(document_language); + else if (newfont.language() != ignore_language) + setLanguage(newfont.language()); + + if (newfont.color() == color() && toggleall) + setColor(LColor::inherit); // toggle 'back' + else if (newfont.color() != LColor::ignore) setColor(newfont.color()); } @@ -267,64 +326,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<language)) + ost << _("Language: ") << _(language()->display().c_str()) << ", "; + if (number() != OFF) + ost << _(" Number ") << _(GUIMiscNames[number()]); + + string buf(ost.str().c_str()); buf = strip(buf, ' '); buf = strip(buf, ','); return buf; @@ -433,11 +481,12 @@ LyXFont & LyXFont::setLyXSize(string const & siz) return *this; } + // Set size according to lyx format string LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) { string s = lowercase(siz); - int i= 0; + int i = 0; while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i; if (s == LyXMiscNames[i]) return FONT_MISC_STATE(i); @@ -446,17 +495,11 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) return OFF; } + /// 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; + setColor(lcolor.getFromLyXName(col)); return *this; } @@ -464,22 +507,17 @@ LyXFont & LyXFont::setLyXColor(string const & col) /// 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; + // CHECK 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; } // Returns size in latex format -string LyXFont::latexSize() const +string const LyXFont::latexSize() const { return LaTeXSizeNames[size()]; } @@ -554,7 +592,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) error = true; } } - return * this; + return *this; } @@ -577,6 +615,9 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const if (orgfont.emph() != emph()) { os << "\\emph " << LyXMiscNames[emph()] << " \n"; } + if (orgfont.number() != number()) { + os << "\\numeric " << LyXMiscNames[number()] << " \n"; + } if (orgfont.underbar() != underbar()) { // This is only for backwards compatibility switch (underbar()) { @@ -613,78 +654,112 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const } } if (orgfont.color() != color()) { - os << "\\color " << LyXColorNames[color()] << "\n"; + // To make us file compatible with older + // lyx versions we emit "default" instead + // of "inherit" + string col_str(lcolor.getLyXName(color())); + if (col_str == "inherit") col_str = "default"; + os << "\\color " << col_str << "\n"; + } + if (orgfont.language() != language()) { + if (language()) + os << "\\lang " << language()->lang() << "\n"; + 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()->babel() != base.language()->babel() && + language()->babel() != prev.language()->babel()) { + if (isRightToLeft() != prev.isRightToLeft()) { + if (isRightToLeft()) { + os << "\\R{"; + count += 3; + } else { + os << "\\L{"; + count += 3; + } + } else { + string tmp = '{' + + subst(lyxrc.language_command_begin, + "$$lang", language()->babel()); + os << tmp; + count += tmp.length(); + } + } + + if (number() == ON && prev.number() != ON && + language()->lang() == "hebrew") { + os << "{\\beginL "; + count += 9; + } + + LyXFont f = *this; + f.reduce(base); if (f.family() != INHERIT_FAMILY) { - file += '\\'; - file += LaTeXFamilyNames[f.family()]; - file += '{'; - count += LaTeXFamilyNames[f.family()].length() + 2; + os << '\\' + << LaTeXFamilyNames[f.family()] + << '{'; + count += strlen(LaTeXFamilyNames[f.family()]) + 2; env = true; //We have opened a new environment } if (f.series() != INHERIT_SERIES) { - file += '\\'; - file += LaTeXSeriesNames[f.series()]; - file += '{'; - count += LaTeXSeriesNames[f.series()].length() + 2; + os << '\\' + << LaTeXSeriesNames[f.series()] + << '{'; + count += strlen(LaTeXSeriesNames[f.series()]) + 2; env = true; //We have opened a new environment } if (f.shape() != INHERIT_SHAPE) { - file += '\\'; - file += LaTeXShapeNames[f.shape()]; - file += '{'; - count += LaTeXShapeNames[f.shape()].length() + 2; + os << '\\' + << LaTeXShapeNames[f.shape()] + << '{'; + count += strlen(LaTeXShapeNames[f.shape()]) + 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 && f.color() != LColor::ignore) { + 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 += ' '; - count += LaTeXSizeNames[f.size()].length() + 2; + os << '\\' + << LaTeXSizeNames[f.size()] + << ' '; + count += strlen(LaTeXSizeNames[f.size()]) + 2; } return count; } @@ -693,66 +768,87 @@ 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; + 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 && f.color() != LColor::ignore) { + 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; } } - + + if (number() == ON && next.number() != ON && + language()->lang() == "hebrew") { + os << "\\endL}"; + count += 6; + } + + if (language() != base.language() && language() != next.language()) { + 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,204 +866,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()); -} - - -int LyXFont::maxAscent() const -{ - return getXFontstruct()->ascent; -} - - -int LyXFont::maxDescent() const -{ - return getXFontstruct()->descent; -} - - -int LyXFont::ascent(char c) const -{ - XFontStruct * finfo = getXFontstruct(); - unsigned int uc = static_cast(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].ascent; - else - return finfo->ascent; -} - - -int LyXFont::descent(char c) const -{ - XFontStruct * finfo = getXFontstruct(); - unsigned int uc = static_cast(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].descent; - else - return finfo->descent; -} - - -// Specialized after profiling. (Asger) -int LyXFont::width(char c) const -{ - if (realShape() != LyXFont::SMALLCAPS_SHAPE){ - return XTextWidth(getXFontstruct(), &c, 1); - } else { - return textWidth(&c, 1); - } -} - - -int LyXFont::lbearing(char c) const -{ - XFontStruct * finfo = getXFontstruct(); - unsigned int uc = static_cast(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(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); -} - - -int LyXFont::textWidth(char const * s, int n) const -{ - if (realShape() != LyXFont::SMALLCAPS_SHAPE){ - return XTextWidth(getXFontstruct(), s, n); - } else { - // emulate smallcaps since X doesn't support this - unsigned int result = 0; - char c[2]; c[1] = '\0'; - LyXFont smallfont = *this; - smallfont.decSize(); - smallfont.decSize(); - smallfont.setShape(LyXFont::UP_SHAPE); - for (int i = 0; i < n; ++i) { - c[0] = s[i]; - if (islower(c[0])){ - c[0] = toupper(c[0]); - result += XTextWidth(smallfont.getXFontstruct(), c, 1); - } else { - result += XTextWidth(getXFontstruct(), c, 1); - } - } - return result; - } -} - - -int LyXFont::stringWidth(string const & s) const -{ - if (s.empty()) return 0; - return textWidth(s.c_str(), s.length()); -} - - -int LyXFont::signedStringWidth(string const & s) const -{ - if (s.empty()) return 0; - if (s.c_str()[0] == '-') - return -textWidth(s.c_str()+1, s.length()-1); - else - return textWidth(s.c_str(), s.length()); -} - - -int LyXFont::drawText(char const * s, int n, Pixmap pm, - int baseline, int x) const -{ - if (realShape() != LyXFont::SMALLCAPS_SHAPE) { - 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 - char c; - int sx = x; - LyXFont smallfont = *this; - smallfont.decSize(); - smallfont.decSize(); - smallfont.setShape(LyXFont::UP_SHAPE); - for (int i = 0; i < n; ++i) { - c = s[i]; - if (islower(c)){ - c = toupper(c); - XDrawString(fl_display, - pm, - smallfont.getGC(), - x, baseline, - &c, 1); - x += XTextWidth(smallfont.getXFontstruct(), - &c, 1); - XFlush(fl_display); - } else { - XDrawString(fl_display, - pm, - getGC(), - x, baseline, - &c, 1); - x += XTextWidth(getXFontstruct(), &c, 1); - XFlush(fl_display); - } - } - return x - sx; - } -} - - -int LyXFont::drawString(string const & s, Pixmap pm, int baseline, int x) const -{ - return drawText(s.c_str(), s.length(), pm, baseline, x); -} - - bool LyXFont::equalExceptLatex(LyXFont const & f) const { LyXFont f1 = *this;