X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=61143f4bac1b2ed8751df51adc630c0569a2a640;hb=f360c39690150b6ff9116ff56c39c3a0e0a92fd2;hp=6bd290ead5297b2775c6a730e738d061a4540b8b;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git diff --git a/src/lyxfont.C b/src/lyxfont.C index 6bd290ead5..61143f4bac 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -3,114 +3,304 @@ * * LyX, The Document Processor * - * Copyright (C) 1995 Matthias Ettrich - * Copyright (C) 1995-1999 The LyX Team. + * Copyright 1995 Matthias Ettrich + * 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 "lyxdraw.h" #include "FontLoader.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[12] = +{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", + 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") }; + 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_("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] = +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] = -{ "roman", "sans", "typewriter", "symbol", "default", "error" }; - -string const LyXSeriesNames[4] = +char const * LyXFamilyNames[12] = +{ "roman", "sans", "typewriter", "symbol", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", + "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" }; + "increase", "decrease", "default", "error" }; -string const LyXMiscNames[12] = +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] = +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" }; - -string const LaTeXColorNames[13] = -{ "none", "black", "white", "red", "green", "blue", "cyan", "magenta", - "yellow", "error12", "error13", "error14", "error15" }; + +} // 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 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.number == number; +} + + +bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const +{ + return !(fb1 == *this); +} + + +LyXFont::LyXFont(LyXFont::FONT_INIT1) +#ifndef INHERIT_LANGUAGE + : bits(inherit), lang(default_language) +#else + : bits(inherit), lang(inherit_language) +#endif +{} + + +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; @@ -136,14 +326,14 @@ LyXFont& LyXFont::decSize() lyxerr <<"Can't LyXFont::decSize on IGNORE_SIZE" << endl; break; } - return (*this); + return *this; } /// 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; @@ -167,7 +357,7 @@ LyXFont& LyXFont::incSize() lyxerr <<"Can't LyXFont::incSize on IGNORE_SIZE" << endl; break; } - return (*this); + return *this; } @@ -193,12 +383,14 @@ 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' + if (newfont.family() == family() && toggleall) + setFamily(INHERIT_FAMILY); // toggle 'back' else if (newfont.family() != IGNORE_FAMILY) - setFamily(newfont.family()); + setFamily(newfont.family()); // else it's IGNORE_SHAPE // "Old" behaviour: "Setting" bold will toggle bold on/off. @@ -218,10 +410,10 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall) break; } - if(newfont.shape() == shape() && toggleall) - setShape(INHERIT_SHAPE); // toggle 'back' + if (newfont.shape() == shape() && toggleall) + setShape(INHERIT_SHAPE); // toggle 'back' else if (newfont.shape() != IGNORE_SHAPE) - setShape(newfont.shape()); + setShape(newfont.shape()); // else it's IGNORE_SHAPE if (newfont.size() != IGNORE_SIZE) { @@ -229,8 +421,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()); } @@ -238,12 +428,24 @@ 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())); + + setNumber(setMisc(newfont.number(), number())); + if (newfont.language() == language() && toggleall) + if (language() == document_language) + setLanguage(default_language); + else +#ifndef INHERIT_LANGUAGE + setLanguage(document_language); +#else + setLanguage(inherit_language); +#endif + else if (newfont.language() != ignore_language) + setLanguage(newfont.language()); - if(newfont.color() == color() && toggleall) - setColor(INHERIT_COLOR); // toggle 'back' - else if (newfont.color() != IGNORE_COLOR) - setColor(newfont.color()); + if (newfont.color() == color() && toggleall) + setColor(LColor::inherit); // toggle 'back' + else if (newfont.color() != LColor::ignore) + setColor(newfont.color()); } @@ -264,66 +466,62 @@ 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(INHERIT_COLOR); + setColor(LColor::inherit); +#ifdef INHERIT_LANGUAGE + if (language() == tmplt.language()) + setLanguage(inherit_language); +#endif } /// Realize font from a template -// This one is not pretty, but it's extremely fast (Asger) +#ifndef INHERIT_LANGUAGE LyXFont & LyXFont::realize(LyXFont const & tmplt) +#else +LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang) +#endif { +#ifdef INHERIT_LANGUAGE + if (language() == inherit_language) { + if (tmplt.language() == inherit_language || + tmplt.language() == ignore_language || + tmplt.language() == default_language) + { + setLanguage(deflang); + } else { + setLanguage(tmplt.language()); + } + } +#endif 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(ost.str().c_str()); buf = strip(buf, ' '); buf = strip(buf, ','); return buf; @@ -371,73 +578,74 @@ string LyXFont::stateText() const // Set family according to lyx format string -LyXFont& LyXFont::setLyXFamily(string const & fam) +LyXFont & LyXFont::setLyXFamily(string const & fam) { - string s = lowercase(fam); + string const 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; } // Set series according to lyx format string -LyXFont& LyXFont::setLyXSeries(string const & ser) +LyXFont & LyXFont::setLyXSeries(string const & ser) { - string s = lowercase(ser); + string const 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; } // Set shape according to lyx format string -LyXFont& LyXFont::setLyXShape(string const & sha) +LyXFont & LyXFont::setLyXShape(string const & sha) { - string s = lowercase(sha); + string const 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; } // Set size according to lyx format string -LyXFont& LyXFont::setLyXSize(string const & siz) +LyXFont & LyXFont::setLyXSize(string const & siz) { - string s = lowercase(siz); - int i= 0; - while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") i++; + string const s = lowercase(siz); + 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 LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz) { - string s = lowercase(siz); - int i= 0; - while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") i++; + string const s = lowercase(siz); + int i = 0; + while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i; if (s == LyXMiscNames[i]) return FONT_MISC_STATE(i); lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `" @@ -445,40 +653,17 @@ 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; - return (*this); -} - -/// Sets size after GUI name -LyXFont& LyXFont::setGUISize(string const & siz) +/// Sets color after LyX text format +LyXFont & LyXFont::setLyXColor(string const & col) { - 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); + setColor(lcolor.getFromLyXName(col)); + return *this; } // Returns size in latex format -string LyXFont::latexSize() const +string const LyXFont::latexSize() const { return LaTeXSizeNames[size()]; } @@ -490,9 +675,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 = lowercase(lex.getString()); if (tok.empty()) { continue; @@ -500,54 +685,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 = 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); + string const ttok = lex.getString(); + setLyXColor(ttok); } else { lex.printError("Unknown tag `$$Token'"); error = true; @@ -558,145 +732,163 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex) /// Writes the changes from this font to orgfont in .lyx format in file -void LyXFont::lyxWriteChanges(LyXFont const & orgfont, FILE * file) const +void LyXFont::lyxWriteChanges(LyXFont const & orgfont, +#ifdef INHERIT_LANGUAGE + Language const * doclang, +#endif + ostream & os) const { - fprintf(file, "\n"); + os << "\n"; if (orgfont.family() != family()) { - fprintf(file, "\\family %s \n", - LyXFamilyNames[family()].c_str()); + os << "\\family " << LyXFamilyNames[family()] << " \n"; } if (orgfont.series() != series()) { - fprintf(file, "\\series %s \n", - LyXSeriesNames[series()].c_str()); + os << "\\series " << LyXSeriesNames[series()] << " \n"; } if (orgfont.shape() != shape()) { - fprintf(file, "\\shape %s \n", LyXShapeNames[shape()].c_str()); + os << "\\shape " << LyXShapeNames[shape()] << " \n"; } if (orgfont.size() != size()) { - fprintf(file, "\\size %s \n", LyXSizeNames[size()].c_str()); + os << "\\size " << LyXSizeNames[size()] << " \n"; } if (orgfont.emph() != emph()) { - fprintf(file, "\\emph %s \n", LyXMiscNames[emph()].c_str()); + 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()) { - case OFF: fprintf(file, "\\bar no \n"); break; - case ON: fprintf(file, "\\bar under \n"); break; + case OFF: os << "\\bar no \n"; break; + case ON: os << "\\bar under \n"; break; case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: " "TOGGLE should not appear here!" << endl; - break; - case INHERIT: fprintf(file, "\\bar default \n"); break; + break; + case INHERIT: os << "\\bar default \n"; break; case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: " "IGNORE should not appear here!" << endl; - break; + break; } } if (orgfont.noun() != noun()) { - fprintf(file, "\\noun %s \n", LyXMiscNames[noun()].c_str()); - } - if (orgfont.latex() != latex()) { - // This is only for backwards compatibility - switch (latex()) { - case OFF: fprintf(file, "\\latex no_latex \n"); break; - case ON: fprintf(file, "\\latex latex \n"); break; - case TOGGLE: lyxerr << "LyXFont::lyxWriteFontChanges: " - "TOGGLE should not appear here!" - << endl; - break; - case INHERIT: fprintf(file, "\\latex default \n"); break; - case IGNORE: lyxerr << "LyXFont::lyxWriteFontChanges: " - "IGNORE should not appear here!" - << endl; - break; - } + os << "\\noun " << LyXMiscNames[noun()] << " \n"; } if (orgfont.color() != color()) { - fprintf(file, "\\color %s\n", LyXColorNames[color()].c_str()); + // 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()) { +#ifndef INHERIT_LANGUAGE + if (language()) +#else + if (language() == inherit_language) + os << "\\lang " << doclang->lang() << "\n"; + else if (language()) +#endif + 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(FILE * file, LyXFont const & base) const +int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, + LyXFont const & prev) const { - string font; - int count = latexWriteStartChanges(font, base); - fprintf(file, "%s", font.c_str()); - return count; -} + 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 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; + } -/// 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 -{ LyXFont f = *this; f.reduce(base); - if (f.bits == inherit) - return 0; - - int count = 0; - bool env = false; - 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; } @@ -705,78 +897,85 @@ 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(FILE * file, LyXFont const & base) const +int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, + LyXFont const & next) const { - string ending; - int count = latexWriteEndChanges(ending, base); - fprintf(file, "%s", ending.c_str()); - return count; -} - + int count = 0; + bool env = false; -/// 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 -{ 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 (color() == LColor::none) + return LColor::foreground; + return color(); +} + + // Convert logical attributes to concrete shape attribute LyXFont::FONT_SHAPE LyXFont::realShape() const { @@ -794,184 +993,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(); - if (finfo->per_char - && c >= static_cast(finfo->min_char_or_byte2) - && c <= static_cast(finfo->max_char_or_byte2)) { - unsigned int index = c - finfo->min_char_or_byte2; - return finfo->per_char[index].ascent; - } else - return finfo->ascent; -} - - -int LyXFont::descent(char c) const -{ - XFontStruct *finfo = getXFontstruct(); - if (finfo->per_char - && c >= static_cast(finfo->min_char_or_byte2) - && c <= static_cast(finfo->max_char_or_byte2)) { - unsigned int index = c - finfo->min_char_or_byte2; - return finfo->per_char[index].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::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]; - if (islower(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 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 - 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++){ - 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; - f1.setLatex(f.latex()); - return f1 == f; -} - ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms) { return o << int(fms);