X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=5a11937436819b30783bbafc5945b5078e765239;hb=0ba59ef037642f4de07669128355fac762b04746;hp=7e67c81f0028e0de912629d0e343455b70938b7a;hpb=c52895023e231587208b5c9257ae7825dc493ef0;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index 7e67c81f00..5a11937436 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -1,141 +1,302 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include #include +#include #ifdef __GNUG__ -#pragma implementation "lyxfont.h" +#pragma implementation #endif -#include #include "gettext.h" #include "lyxfont.h" #include "debug.h" #include "lyxrc.h" #include "lyxlex.h" -#include "FontLoader.h" +#include "language.h" #include "support/lstrings.h" +#include "bufferparams.h" // stateText -extern LyXRC * lyxrc; +using std::ostream; +using std::endl; -// The global fontloader -FontLoader fontloader; +#ifndef CXX_GLOBAL_CSTD +using std::strlen; +#endif // // Names for the GUI // -string const GUIFamilyNames[6] = -{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"), - N_("Ignore") }; - -string const GUISeriesNames[4] = +namespace { + +char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = +{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", + N_("Inherit"), N_("Ignore") }; + +char const * GUISeriesNames[4] = { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") }; -string const GUIShapeNames[6] = +char const * GUIShapeNames[6] = { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"), N_("Ignore") }; -string const GUISizeNames[14] = +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_("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] = -{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") }; -string const GUIDirectionNames[5] = -{ N_("LTR"), N_("RTL"), N_("Toggle"), N_("Inherit"), N_("Ignore") }; +char const * GUIMiscNames[5] = +{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") }; // // Strings used to read and write .lyx format files // -string const LyXFamilyNames[6] = -{ "roman", "sans", "typewriter", "symbol", "default", "error" }; - -string const LyXSeriesNames[4] = +char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = +{ "roman", "sans", "typewriter", "symbol", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", + "default", "error" }; + +char const * LyXSeriesNames[4] = { "medium", "bold", "default", "error" }; - -string const LyXShapeNames[6] = + +char const * LyXShapeNames[6] = { "up", "italic", "slanted", "smallcaps", "default", "error" }; - -string const LyXSizeNames[14] = + +char const * LyXSizeNames[14] = { "tiny", "scriptsize", "footnotesize", "small", "normal", "large", - "larger", "largest", "huge", "giant", - "increase-error", "decrease-error", "default", "error" }; + "larger", "largest", "huge", "giant", + "increase", "decrease", "default", "error" }; -string const LyXMiscNames[12] = +char const * LyXMiscNames[5] = { "off", "on", "toggle", "default", "error" }; // // Strings used to write LaTeX files // - -string const LaTeXFamilyNames[6] = +char const * LaTeXFamilyNames[6] = { "textrm", "textsf", "texttt", "error1", "error2", "error3" }; - -string const LaTeXSeriesNames[4] = + +char const * LaTeXSeriesNames[4] = { "textmd", "textbf", "error4", "error5" }; - -string const LaTeXShapeNames[6] = + +char const * LaTeXShapeNames[6] = { "textup", "textit", "textsl", "textsc", "error6", "error7" }; - -string const LaTeXSizeNames[14] = + +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 +} // namespace anon + + +// Initialize static member +LyXFont::FontBits LyXFont::sane = { + ROMAN_FAMILY, + MEDIUM_SERIES, + UP_SHAPE, + SIZE_NORMAL, + LColor::none, + OFF, + OFF, + OFF, + OFF }; + +// Initialize static member +LyXFont::FontBits LyXFont::inherit = { + INHERIT_FAMILY, + INHERIT_SERIES, + INHERIT_SHAPE, + INHERIT_SIZE, + LColor::inherit, + INHERIT, + INHERIT, + INHERIT, + OFF }; + +// Initialize static member +LyXFont::FontBits LyXFont::ignore = { + IGNORE_FAMILY, + IGNORE_SERIES, + IGNORE_SHAPE, + IGNORE_SIZE, + LColor::ignore, + IGNORE, + IGNORE, + IGNORE, + IGNORE }; + + +bool operator==(LyXFont::FontBits const & lhs, + LyXFont::FontBits const & rhs) +{ + return lhs.family == rhs.family && + lhs.series == rhs.series && + lhs.shape == rhs.shape && + lhs.size == rhs.size && + lhs.color == rhs.color && + lhs.emph == rhs.emph && + lhs.underbar == rhs.underbar && + lhs.noun == rhs.noun && + lhs.number == rhs.number; +} + + +LyXFont::LyXFont() + : bits(sane), lang(default_language) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT1) + : bits(inherit), lang(default_language) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT2) + : bits(ignore), lang(ignore_language) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT3) + : bits(sane), lang(default_language) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l) + : bits(inherit), lang(l) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l) + : bits(ignore), lang(l) +{} + + +LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l) + : bits(sane), lang(l) +{} + + +LyXFont::FONT_MISC_STATE LyXFont::underbar() const +{ + return bits.underbar; +} + + +LColor::color LyXFont::color() const +{ + return bits.color; +} + + +Language const * LyXFont::language() const +{ + return lang; +} + + +LyXFont::FONT_MISC_STATE LyXFont::number() const +{ + return bits.number; +} + + +bool LyXFont::isRightToLeft() const +{ + return lang->RightToLeft(); +} + + +bool LyXFont::isVisibleRightToLeft() const +{ + return (lang->RightToLeft() && + number() != ON); +} + + +LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f) +{ + bits.family = f; + return *this; +} + + +LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s) +{ + bits.series = s; + return *this; +} + + +LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s) +{ + bits.shape = s; + return *this; +} + + +LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s) +{ + bits.size = s; + return *this; +} + + +LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e) +{ + bits.emph = e; + return *this; +} + + +LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u) +{ + bits.underbar = u; + return *this; +} + + +LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n) +{ + bits.noun = n; + return *this; +} + + +LyXFont & LyXFont::setColor(LColor::color c) +{ + bits.color = c; + return *this; +} + + +LyXFont & LyXFont::setLanguage(Language const * l) +{ + lang = l; + return *this; +} + + +LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n) +{ + bits.number = n; + return *this; +} + /// Decreases font size by one -LyXFont & LyXFont::decSize() +LyXFont & LyXFont::decSize() { switch (size()) { case SIZE_HUGER: setSize(SIZE_HUGE); break; @@ -166,9 +327,9 @@ LyXFont & LyXFont::decSize() /// Increases font size by one -LyXFont & LyXFont::incSize() +LyXFont & LyXFont::incSize() { - switch(size()) { + switch (size()) { case SIZE_HUGER: break; case SIZE_HUGE: setSize(SIZE_HUGER); break; case SIZE_LARGEST: setSize(SIZE_HUGE); break; @@ -197,7 +358,7 @@ LyXFont & LyXFont::incSize() /// Updates a misc setting according to request -LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, +LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, FONT_MISC_STATE org) { if (newfont == TOGGLE) { @@ -212,15 +373,17 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, } } else if (newfont == IGNORE) return org; - else + else return 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) + if (newfont.family() == family() && toggleall) setFamily(INHERIT_FAMILY); // toggle 'back' else if (newfont.family() != IGNORE_FAMILY) setFamily(newfont.family()); @@ -239,11 +402,11 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) case INHERIT_SERIES: setSeries(newfont.series()); break; - case IGNORE_SERIES: + case IGNORE_SERIES: break; } - if(newfont.shape() == shape() && toggleall) + if (newfont.shape() == shape() && toggleall) setShape(INHERIT_SHAPE); // toggle 'back' else if (newfont.shape() != IGNORE_SHAPE) setShape(newfont.shape()); @@ -254,8 +417,6 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) incSize(); else if (newfont.size() == DECREASE_SIZE) decSize(); - else if (newfont.size() == size() && toggleall) - setSize(INHERIT_SIZE); // toggle 'back' else setSize(newfont.size()); } @@ -263,22 +424,17 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) setEmph(setMisc(newfont.emph(), emph())); setUnderbar(setMisc(newfont.underbar(), underbar())); 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()); @@ -302,25 +458,19 @@ void LyXFont::reduce(LyXFont const & tmplt) setUnderbar(INHERIT); if (noun() == tmplt.noun()) setNoun(INHERIT); - if (latex() == tmplt.latex()) - 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) { bits = tmplt.bits; return *this; } - + if (bits.family == INHERIT_FAMILY) { bits.family = tmplt.bits.family; } @@ -342,80 +492,11 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt) 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.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)) + ost << _("Language: ") << _(language()->display()) << ", "; + if (number() != OFF) + ost << _(" Number ") << _(GUIMiscNames[number()]); + + string buf(STRCONV(ost.str())); + buf = rtrim(buf, ", "); return buf; } @@ -465,7 +548,7 @@ string LyXFont::stateText() const // Set family according to lyx format string LyXFont & LyXFont::setLyXFamily(string const & fam) { - string s = lowercase(fam); + string const s = ascii_lowercase(fam); int i = 0; while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i; @@ -481,7 +564,7 @@ LyXFont & LyXFont::setLyXFamily(string const & fam) // Set series according to lyx format string LyXFont & LyXFont::setLyXSeries(string const & ser) { - string s = lowercase(ser); + string const s = ascii_lowercase(ser); int i = 0; while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i; @@ -497,7 +580,7 @@ LyXFont & LyXFont::setLyXSeries(string const & ser) // Set shape according to lyx format string LyXFont & LyXFont::setLyXShape(string const & sha) { - string s = lowercase(sha); + string const s = ascii_lowercase(sha); int i = 0; while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i; @@ -513,7 +596,7 @@ LyXFont & LyXFont::setLyXShape(string const & sha) // Set size according to lyx format string LyXFont & LyXFont::setLyXSize(string const & siz) { - string s = lowercase(siz); + string const s = ascii_lowercase(siz); int i = 0; while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i; if (s == LyXSizeNames[i]) { @@ -524,11 +607,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; + string const s = ascii_lowercase(siz); + int i = 0; while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i; if (s == LyXMiscNames[i]) return FONT_MISC_STATE(i); @@ -537,6 +621,7 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) return OFF; } + /// Sets color after LyX text format LyXFont & LyXFont::setLyXColor(string const & col) { @@ -545,20 +630,8 @@ LyXFont & LyXFont::setLyXColor(string const & col) } -/// Sets size after GUI name -LyXFont & LyXFont::setGUISize(string const & siz) -{ -#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; -} - - // Returns size in latex format -string LyXFont::latexSize() const +string const LyXFont::latexSize() const { return LaTeXSizeNames[size()]; } @@ -570,9 +643,9 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) { bool error = false; bool finished = false; - while (!finished && lex.IsOK() && !error) { + while (!finished && lex.isOK() && !error) { lex.next(); - string tok = lowercase(lex.GetString()); + string const tok = ascii_lowercase(lex.getString()); if (tok.empty()) { continue; @@ -580,65 +653,43 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) finished = true; } else if (tok == "family") { lex.next(); - string tok = lex.GetString(); - setLyXFamily(tok); + string const ttok = lex.getString(); + setLyXFamily(ttok); } else if (tok == "series") { lex.next(); - string tok = lex.GetString(); - setLyXSeries(tok); + string const ttok = lex.getString(); + setLyXSeries(ttok); } else if (tok == "shape") { lex.next(); - string tok = lex.GetString(); - setLyXShape(tok); + string const ttok = lex.getString(); + setLyXShape(ttok); } else if (tok == "size") { lex.next(); - string tok = lex.GetString(); - setLyXSize(tok); - } else if (tok == "latex") { - lex.next(); - string tok = lowercase(lex.GetString()); - - if (tok == "no_latex") { - setLatex(OFF); - } else if (tok == "latex") { - setLatex(ON); - } else { - lex.printError("Illegal LaTeX type`$$Token'"); - } + string const ttok = lex.getString(); + setLyXSize(ttok); } else if (tok == "misc") { lex.next(); - string tok = lowercase(lex.GetString()); + string const ttok = ascii_lowercase(lex.getString()); - if (tok == "no_bar") { + if (ttok == "no_bar") { setUnderbar(OFF); - } else if (tok == "no_emph") { + } else if (ttok == "no_emph") { setEmph(OFF); - } else if (tok == "no_noun") { + } else if (ttok == "no_noun") { setNoun(OFF); - } else if (tok == "emph") { + } else if (ttok == "emph") { setEmph(ON); - } else if (tok == "underbar") { + } else if (ttok == "underbar") { setUnderbar(ON); - } else if (tok == "noun") { + } else if (ttok == "noun") { setNoun(ON); } else { lex.printError("Illegal misc type `$$Token´"); } } else if (tok == "color") { 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'"); - } + string const ttok = lex.getString(); + setLyXColor(ttok); } else { lex.printError("Unknown tag `$$Token'"); error = true; @@ -649,7 +700,8 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) /// Writes the changes from this font to orgfont in .lyx format in file -void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const +void LyXFont::lyxWriteChanges(LyXFont const & orgfont, + ostream & os) const { os << "\n"; if (orgfont.family() != family()) { @@ -667,6 +719,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()) { @@ -686,124 +741,113 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const if (orgfont.noun() != noun()) { os << "\\noun " << LyXMiscNames[noun()] << " \n"; } - if (orgfont.latex() != latex()) { - // This is only for backwards compatibility - switch (latex()) { - case OFF: os << "\\latex no_latex \n"; break; - case ON: os << "\\latex latex \n"; break; - case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: " - "TOGGLE should not appear here!" - << endl; - break; - case INHERIT: os << "\\latex default \n"; break; - case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: " - "IGNORE should not appear here!" - << endl; - break; - } - } 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; - env = true; //We have opened a new environment + if (language()->babel() != base.language()->babel() && + language() != prev.language()) { + if (isRightToLeft() != prev.isRightToLeft()) { + if (isRightToLeft()) { + os << "\\R{"; + count += 3; + } else { + os << "\\L{"; + count += 3; + } + } else { + string const tmp = + subst(lyxrc.language_command_local, + "$$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() != LColor::inherit) { - file += "\\textcolor{"; - file += lcolor.getLaTeXName(f.color()); - file += "}{"; + 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 += '{'; + 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,80 +856,78 @@ 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 += '}'; - ++count; - env = true; // Size change need not bother about closing env. - } + // reduce the current font to changes against the base + // font (of the layout). We use a temporary for this to + // avoid changing this font instance, as that would break + LyXFont f = *this; + f.reduce(base); 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 += '}'; + 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(); @@ -909,203 +951,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; - f1.setLatex(f.latex()); - return f1 == f; -} - - -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);