X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=0c783cb148bad8df1807953eb39bfb8ba778e03a;hb=bd659b25fb6e2df5d02273ee1ce4699aa5723e2e;hp=aebdd0756f5d4e9840eccde94065924fb74c8bd7;hpb=0088121bd8c3fc7f2109e8dc9b22b73ca193f20e;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index aebdd0756f..0c783cb148 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -24,77 +24,82 @@ #include "lyxlex.h" #include "FontLoader.h" #include "support/lstrings.h" +#include "bufferparams.h" // stateText - -// 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" }; @@ -108,8 +113,7 @@ LyXFont::FontBits LyXFont::sane = { OFF, OFF, OFF, - OFF, - LTR_DIR }; + OFF }; LyXFont::FontBits LyXFont::inherit = { INHERIT_FAMILY, @@ -120,8 +124,7 @@ LyXFont::FontBits LyXFont::inherit = { INHERIT, INHERIT, INHERIT, - INHERIT, - INHERIT_DIR }; + INHERIT }; LyXFont::FontBits LyXFont::ignore = { IGNORE_FAMILY, @@ -132,8 +135,27 @@ LyXFont::FontBits LyXFont::ignore = { IGNORE, IGNORE, IGNORE, - IGNORE, - IGNORE_DIR }; + 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 @@ -220,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' @@ -267,20 +290,16 @@ 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); + setNumber(setMisc(newfont.number(), number())); + 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()); @@ -308,8 +327,6 @@ void LyXFont::reduce(LyXFont const & tmplt) setLatex(INHERIT); if (color() == tmplt.color()) setColor(LColor::inherit); - if (direction() == tmplt.direction()) - setDirection(INHERIT_DIR); } @@ -348,9 +365,6 @@ 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; } @@ -363,37 +377,42 @@ bool LyXFont::resolved() const shape() != INHERIT_SHAPE && size() != INHERIT_SIZE && emph() != INHERIT && underbar() != INHERIT && noun() != INHERIT && latex() != INHERIT && - color() != LColor::inherit && - direction() != INHERIT_DIR); + color() != LColor::inherit); } /// Build GUI description of font state -string LyXFont::stateText() const +string const LyXFont::stateText(BufferParams * params) const { - string buf; + std::ostringstream ost; if (family() != INHERIT_FAMILY) - buf += string(_(GUIFamilyNames[family()].c_str())) + ", "; + ost << _(GUIFamilyNames[family()]) << ", "; if (series() != INHERIT_SERIES) - buf += string(_(GUISeriesNames[series()].c_str())) + ", "; + ost << _(GUISeriesNames[series()]) << ", "; if (shape() != INHERIT_SHAPE) - buf += string(_(GUIShapeNames[shape()].c_str())) + ", "; + ost << _(GUIShapeNames[shape()]) << ", "; if (size() != INHERIT_SIZE) - buf += string(_(GUISizeNames[size()].c_str())) + ", "; + ost << _(GUISizeNames[size()]) << ", "; if (color() != LColor::inherit) - buf += lcolor.getGUIName(color()) + ", "; + ost << lcolor.getGUIName(color()) << ", "; if (emph() != INHERIT) - buf += string(_("Emphasis ")) + _(GUIMiscNames[emph()].c_str()) + ", "; + ost << _("Emphasis ") + << _(GUIMiscNames[emph()]) << ", "; if (underbar() != INHERIT) - buf += string(_("Underline ")) + _(GUIMiscNames[underbar()].c_str()) + ", "; + ost << _("Underline ") + << _(GUIMiscNames[underbar()]) << ", "; if (noun() != INHERIT) - buf += string(_("Noun ")) + _(GUIMiscNames[noun()].c_str()) + ", "; + ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", "; if (latex() != INHERIT) - buf += string(_("Latex ")) + _(GUIMiscNames[latex()].c_str()) + ", "; - if (direction() != INHERIT_DIR) - buf += string(_("Direction ")) + _(GUIDirectionNames[direction()].c_str()) + ", "; - if (buf.empty()) - buf = _("Default"); + ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", "; + if (bits == inherit) + ost << _("Default") << ", "; + if (!params || (language() != params->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; @@ -462,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); @@ -475,6 +495,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) return OFF; } + /// Sets color after LyX text format LyXFont & LyXFont::setLyXColor(string const & col) { @@ -486,7 +507,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. @@ -496,7 +517,7 @@ LyXFont & LyXFont::setGUISize(string const & siz) // Returns size in latex format -string LyXFont::latexSize() const +string const LyXFont::latexSize() const { return LaTeXSizeNames[size()]; } @@ -566,17 +587,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; @@ -605,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()) { @@ -641,21 +654,18 @@ 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"; } } @@ -665,51 +675,59 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) 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; - FONT_DIRECTION direction = f.direction(); - if (direction != prev.direction()) { - if (direction == LTR_DIR) { - os << "\\L{"; - count += 3; - env = true; //We have opened a new environment - } - if (direction == RTL_DIR) { - os << "\\R{"; - count += 3; - env = true; //We have opened a new environment + 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) { os << '\\' << LaTeXFamilyNames[f.family()] << '{'; - count += LaTeXFamilyNames[f.family()].length() + 2; + count += strlen(LaTeXFamilyNames[f.family()]) + 2; env = true; //We have opened a new environment } if (f.series() != INHERIT_SERIES) { os << '\\' << LaTeXSeriesNames[f.series()] << '{'; - count += LaTeXSeriesNames[f.series()].length() + 2; + count += strlen(LaTeXSeriesNames[f.series()]) + 2; env = true; //We have opened a new environment } if (f.shape() != INHERIT_SHAPE) { os << '\\' << LaTeXShapeNames[f.shape()] << '{'; - count += LaTeXShapeNames[f.shape()].length() + 2; + count += strlen(LaTeXShapeNames[f.shape()]) + 2; env = true; //We have opened a new environment } - if (f.color() != LColor::inherit) { + if (f.color() != LColor::inherit && f.color() != LColor::ignore) { os << "\\textcolor{" << lcolor.getLaTeXName(f.color()) << "}{"; @@ -741,7 +759,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, os << '\\' << LaTeXSizeNames[f.size()] << ' '; - count += LaTeXSizeNames[f.size()].length() + 2; + count += strlen(LaTeXSizeNames[f.size()]) + 2; } return count; } @@ -753,25 +771,15 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, 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; - - FONT_DIRECTION direction = f.direction(); - if ( direction != next.direction() - && (direction == RTL_DIR || direction == LTR_DIR) ) { - os << '}'; - ++count; - env = true; // Size change need not bother about closing env. - } if (f.family() != INHERIT_FAMILY) { os << '}'; @@ -788,7 +796,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, ++count; env = true; // Size change need not bother about closing env. } - if (f.color() != LColor::inherit) { + if (f.color() != LColor::inherit && f.color() != LColor::ignore) { os << '}'; ++count; env = true; // Size change need not bother about closing env. @@ -815,6 +823,18 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, ++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; } @@ -846,184 +866,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; @@ -1032,17 +874,6 @@ bool LyXFont::equalExceptLatex(LyXFont const & f) const } -LyXDirection LyXFont::getFontDirection() const -{ - if (lyxrc.rtl_support - && direction() == LyXFont::RTL_DIR - && latex() != LyXFont::ON) - return LYX_DIR_RIGHT_TO_LEFT; - else - return LYX_DIR_LEFT_TO_RIGHT; -} - - ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms) { return o << int(fms);