X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=9d0d7c911cb9d6f8edda686b9bcbf55b52af8a60;hb=35cf7dcb2bdfdcda465b69c58465f657c77fd9d7;hp=581643e4bf004d685d9e792bd679bb539722b37e;hpb=a0cf758d5a79140045c2a90e2ff5878e0b391bcc;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index 581643e4bf..9d0d7c911c 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. * * ====================================================== */ @@ -24,115 +24,139 @@ #include "lyxlex.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 GUIDirectionNames[5] = -{ N_("LTR"), N_("RTL"), N_("Toggle"), 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" }; // // 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" }; -#ifdef NEW_BITS -LyXFont::FontBits LyXFont::sane = { ROMAN_FAMILY, - MEDIUM_SERIES, - UP_SHAPE, - SIZE_NORMAL, - LColor::none, - OFF, - OFF, - OFF, - OFF, - LTR_DIR }; - -LyXFont::FontBits LyXFont::inherit = { INHERIT_FAMILY, - INHERIT_SERIES, - INHERIT_SHAPE, - INHERIT_SIZE, - LColor::inherit, - INHERIT, - INHERIT, - INHERIT, - INHERIT, - INHERIT_DIR }; - -LyXFont::FontBits LyXFont::ignore = { IGNORE_FAMILY, - IGNORE_SERIES, - IGNORE_SHAPE, - IGNORE_SIZE, - LColor::ignore, - IGNORE, - IGNORE, - IGNORE, - IGNORE, - IGNORE_DIR }; -#endif + +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() @@ -218,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' @@ -265,20 +290,15 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) setNoun(setMisc(newfont.noun(), noun())); setLatex(setMisc(newfont.latex(), latex())); - switch(newfont.direction()) { - case TOGGLE_DIR: - if (direction() == LTR_DIR) - setDirection(RTL_DIR); + if (newfont.language() == language() && toggleall) + if (language() == document_language) + setLanguage(default_language); else - setDirection(LTR_DIR); - break; - case IGNORE_DIR: - break; - default: - setDirection(newfont.direction()); - } + setLanguage(document_language); + else if (newfont.language() != ignore_language) + setLanguage(newfont.language()); - if(newfont.color() == color() && toggleall) + if (newfont.color() == color() && toggleall) setColor(LColor::inherit); // toggle 'back' else if (newfont.color() != LColor::ignore) setColor(newfont.color()); @@ -306,14 +326,10 @@ void LyXFont::reduce(LyXFont const & tmplt) setLatex(INHERIT); if (color() == tmplt.color()) setColor(LColor::inherit); - if (direction() == tmplt.direction()) - setDirection(INHERIT_DIR); } /// Realize font from a template -// This one is not pretty, but it's extremely fast (Asger) -#ifdef NEW_BITS LyXFont & LyXFont::realize(LyXFont const & tmplt) { if (bits == inherit) { @@ -348,74 +364,9 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt) if (bits.color == LColor::inherit) { bits.color = tmplt.bits.color; } - if (bits.direction == INHERIT_DIR) { - bits.direction = tmplt.bits.direction; - } - - return *this; -} -#else -LyXFont & LyXFont::realize(LyXFont const & tmplt) -{ - if (bits == inherit) { - bits = tmplt.bits; - return *this; - } - - if ((bits & (Fam_Mask<language_info) + ost << _("Language: ") << _(language()->display().c_str()); +#ifdef HAVE_SSTREAM + string buf(ost.str().c_str()); +#else + ost << '\0'; + string buf(ost.str()); +#endif buf = strip(buf, ' '); buf = strip(buf, ','); return buf; @@ -524,11 +487,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); @@ -537,6 +501,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) return OFF; } + /// Sets color after LyX text format LyXFont & LyXFont::setLyXColor(string const & col) { @@ -548,7 +513,7 @@ LyXFont & LyXFont::setLyXColor(string const & col) /// Sets size after GUI name LyXFont & LyXFont::setGUISize(string const & siz) { -#warning this might be wrong. + // CHECK this might be wrong. /// ?????? // this is how it was how it was done in the lyx repository... // but this does not make sense. @@ -628,17 +593,6 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) lex.next(); string tok = lex.GetString(); setLyXColor(tok); - } else if (tok == "direction") { - lex.next(); - string tok = lowercase(lex.GetString()); - - if (tok == "ltr") { - setDirection(LTR_DIR); - } else if (tok == "rtl") { - setDirection(RTL_DIR); - } else { - lex.printError("Illegal type`$$Token'"); - } } else { lex.printError("Unknown tag `$$Token'"); error = true; @@ -703,107 +657,108 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const } } if (orgfont.color() != color()) { - os << "\\color " << lcolor.getLyXName(color()) << "\n"; - } - if (orgfont.direction() != direction()) { - switch (direction()) { - case RTL_DIR: os << "\\direction rtl \n"; break; - case LTR_DIR: os << "\\direction ltr\n"; break; - case TOGGLE_DIR: lyxerr << "LyXFont::lyxWriteFontChanges: " - "TOGGLE should not appear here!" - << endl; - case INHERIT_DIR: os << "\\direction default \n"; break; - case IGNORE_DIR: lyxerr << "LyXFont::lyxWriteFontChanges: " - "IGNORE should not appear here!" - << endl; - break; - } + // 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, +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; - FONT_DIRECTION direction = f.direction(); - if (direction != prev.direction()) { - if (direction == LTR_DIR) { - file += "\\L{"; - count += 3; - env = true; //We have opened a new environment - } - if (direction == RTL_DIR) { - file += "\\R{"; - count += 3; + if (language() != base.language() && 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 += '{'; - 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() != LColor::inherit) { - file += "\\textcolor{"; - file += lcolor.getLaTeXName(f.color()); - file += "}{"; + 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 += '{'; + 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; } @@ -812,72 +767,67 @@ int LyXFont::latexWriteStartChanges(string & file, LyXFont const & base, /// 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, +int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, LyXFont const & next) const { - 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; - FONT_DIRECTION direction = f.direction(); - if ( direction != next.direction() - && (direction == RTL_DIR || direction == LTR_DIR) ) { - file += '}'; + if (language() != base.language() && 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.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() != LColor::inherit) { - file += '}'; + 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; } @@ -909,184 +859,6 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const } -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; - LyXFont smallfont = *this; - smallfont.decSize(); - smallfont.decSize(); - smallfont.setShape(LyXFont::UP_SHAPE); - for (int i = 0; i < n; ++i) { - c = s[i]; - // when islower is a macro, the cast is needed (JMarc) - if (islower(static_cast(c))){ - c = toupper(c); - 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, - int, 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(static_cast(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;