X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=450d67fa3a1b794fbbd6717c0ef451fdf8f3099e;hb=2e253eab0fe4cd318d153ace513829be93a97800;hp=9e8375c29c4e70dfca6f889b72e0829b99c9330a;hpb=f42c9e50df505f7149e40f332f820e22c8e2c987;p=lyx.git diff --git a/src/Font.cpp b/src/Font.cpp index 9e8375c29c..450d67fa3a 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -25,6 +25,7 @@ #include "LyXRC.h" #include "output_latex.h" #include "OutputParams.h" +#include "texstream.h" #include "support/lassert.h" #include "support/convert.h" @@ -44,9 +45,9 @@ namespace lyx { // // These are defined in FontInfo.cpp extern char const * LyXFamilyNames[NUM_FAMILIES + 2]; -extern char const * LyXSeriesNames[4]; -extern char const * LyXShapeNames[6]; -extern char const * LyXSizeNames[14]; +extern char const * LyXSeriesNames[NUM_SERIES + 2]; +extern char const * LyXShapeNames[NUM_SHAPE + 2]; +extern char const * LyXSizeNames[NUM_SIZE + 4]; extern char const * LyXMiscNames[5]; // @@ -57,17 +58,17 @@ namespace { char const * GUIFamilyNames[NUM_FAMILIES + 2 /* default & error */] = { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"), - "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "wasy", "esint", - N_("Inherit"), N_("Ignore") }; + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry", + "wasy", "esint", N_("Inherit"), N_("Ignore") }; -char const * GUISeriesNames[4] = +char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] = { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") }; -char const * GUIShapeNames[6] = +char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] = { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"), N_("Ignore") }; -char const * GUISizeNames[14] = +char const * GUISizeNames[NUM_SIZE + 4 /* increase, decrease, default & error */] = { 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") }; @@ -78,20 +79,22 @@ char const * GUIMiscNames[5] = // // Strings used to write LaTeX files // -char const * LaTeXFamilyNames[6] = -{ "textrm", "textsf", "texttt", "error1", "error2", "error3" }; +char const * LaTeXFamilyNames[NUM_FAMILIES + 2] = +{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4", + "error5", "error6", "error7", "error8", "error9", "error10", "error11", + "error12", "error13" }; -char const * LaTeXSeriesNames[4] = +char const * LaTeXSeriesNames[NUM_SERIES + 2] = { "textmd", "textbf", "error4", "error5" }; -char const * LaTeXShapeNames[6] = +char const * LaTeXShapeNames[NUM_SHAPE + 2] = { "textup", "textit", "textsl", "textsc", "error6", "error7" }; -char const * LaTeXSizeNames[14] = +char const * LaTeXSizeNames[NUM_SIZE + 4] = { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large", "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" }; -} // namespace anon +} // namespace Font::Font(FontInfo bits, Language const * l) @@ -163,8 +166,11 @@ docstring const stateText(FontInfo const & f) os << bformat(_("Underline %1$s, "), _(GUIMiscNames[f.underbar()])); if (f.strikeout() != FONT_INHERIT) - os << bformat(_("Strikeout %1$s, "), + os << bformat(_("Strike out %1$s, "), _(GUIMiscNames[f.strikeout()])); + if (f.xout() != FONT_INHERIT) + os << bformat(_("Cross out %1$s, "), + _(GUIMiscNames[f.xout()])); if (f.uuline() != FONT_INHERIT) os << bformat(_("Double underline %1$s, "), _(GUIMiscNames[f.uuline()])); @@ -238,6 +244,9 @@ void Font::lyxWriteChanges(Font const & orgfont, if (orgfont.fontInfo().strikeout() != bits_.strikeout()) { os << "\\strikeout " << LyXMiscNames[bits_.strikeout()] << "\n"; } + if (orgfont.fontInfo().xout() != bits_.xout()) { + os << "\\xout " << LyXMiscNames[bits_.xout()] << "\n"; + } if (orgfont.fontInfo().uuline() != bits_.uuline()) { os << "\\uuline " << LyXMiscNames[bits_.uuline()] << "\n"; } @@ -284,6 +293,10 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, tmp += "{"; os << from_ascii(tmp); count += tmp.length(); + pushLanguageName(language()->polyglossia(), true); + } else if (language()->encoding()->package() != Encoding::CJK) { + os << '{'; + count += 1; } } else if (language()->babel() != base.language()->babel() && language() != prev.language()) { @@ -316,7 +329,9 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, "$$lang", language()->babel()); os << from_ascii(tmp); count += tmp.length(); - } else { + if (!lyxrc.language_command_end.empty()) + pushLanguageName(language()->babel(), true); + } else if (language()->encoding()->package() != Encoding::CJK) { os << '{'; count += 1; } @@ -332,14 +347,15 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, } } - // When the current language is Hebrew, Arabic, or Farsi + // If the current language is Hebrew, Arabic, or Farsi // the numbers are written Left-to-Right. ArabTeX package // reorders the number automatically but the packages used // for Hebrew and Farsi (Arabi) do not. - if (bits_.number() == FONT_ON && prev.fontInfo().number() != FONT_ON - && (language()->lang() == "hebrew" - || language()->lang() == "farsi" - || language()->lang() == "arabic_arabi")) { + if (!runparams.pass_thru && bits_.number() == FONT_ON + && prev.fontInfo().number() != FONT_ON + && (language()->lang() == "hebrew" + || language()->lang() == "farsi" + || language()->lang() == "arabic_arabi")) { os << "{\\beginL "; count += 9; } @@ -390,46 +406,50 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams, count += 6; env = true; //We have opened a new environment } + // \noun{} is a LyX special macro + if (f.noun() == FONT_ON) { + os << "\\noun{"; + count += 6; + env = true; //We have opened a new environment + } + if (f.size() != FONT_SIZE_INHERIT) { + // If we didn't open an environment above, we open one here + if (!env) { + os << '{'; + ++count; + } + os << '\\' + << LaTeXSizeNames[f.size()] + << "{}"; + count += strlen(LaTeXSizeNames[f.size()]) + 3; + } + // The ulem commands need to be on the deepest nesting level + // because ulem puts every nested group or macro in a box, + // which prevents linebreaks (#8424, #8733) if (f.underbar() == FONT_ON) { os << "\\uline{"; count += 10; - runparams.inulemcmd = true; - env = true; //We have opened a new environment + ++runparams.inulemcmd; } if (f.strikeout() == FONT_ON) { os << "\\sout{"; count += 9; - runparams.inulemcmd = true; - env = true; //We have opened a new environment + ++runparams.inulemcmd; + } + if (f.xout() == FONT_ON) { + os << "\\xout{"; + count += 9; + ++runparams.inulemcmd; } if (f.uuline() == FONT_ON) { os << "\\uuline{"; count += 11; - runparams.inulemcmd = true; - env = true; //We have opened a new environment + ++runparams.inulemcmd; } if (f.uwave() == FONT_ON) { os << "\\uwave{"; count += 10; - runparams.inulemcmd = true; - env = true; //We have opened a new environment - } - // \noun{} is a LyX special macro - if (f.noun() == FONT_ON) { - os << "\\noun{"; - count += 6; - env = true; //We have opened a new environment - } - if (f.size() != FONT_SIZE_INHERIT) { - // If we didn't open an environment above, we open one here - if (!env) { - os << '{'; - ++count; - } - os << '\\' - << LaTeXSizeNames[f.size()] - << ' '; - count += strlen(LaTeXSizeNames[f.size()]) + 2; + ++runparams.inulemcmd; } return count; } @@ -442,6 +462,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams, OutputParams const & runparams, Font const & base, Font const & next, + bool & needPar, bool const & closeLanguage) const { int count = 0; @@ -478,51 +499,58 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams, ++count; env = true; // Size change need not bother about closing env. } - if (f.underbar() == FONT_ON) { + if (f.noun() == FONT_ON) { os << '}'; ++count; - runparams.inulemcmd = false; env = true; // Size change need not bother about closing env. } - if (f.strikeout() == FONT_ON) { + if (f.size() != FONT_SIZE_INHERIT) { + // We only have to close if only size changed + if (!env) { + if (needPar && !closeLanguage) { + os << "\\par"; + count += 4; + needPar = false; + } + os << '}'; + ++count; + } + } + if (f.underbar() == FONT_ON) { os << '}'; ++count; - runparams.inulemcmd = false; - env = true; // Size change need not bother about closing env. + --runparams.inulemcmd; } - if (f.uuline() == FONT_ON) { + if (f.strikeout() == FONT_ON) { os << '}'; ++count; - runparams.inulemcmd = false; - env = true; // Size change need not bother about closing env. + --runparams.inulemcmd; } - if (f.uwave() == FONT_ON) { + if (f.xout() == FONT_ON) { os << '}'; ++count; - runparams.inulemcmd = false; - env = true; // Size change need not bother about closing env. + --runparams.inulemcmd; } - if (f.noun() == FONT_ON) { + if (f.uuline() == FONT_ON) { os << '}'; ++count; - env = true; // Size change need not bother about closing env. + --runparams.inulemcmd; } - if (f.size() != FONT_SIZE_INHERIT) { - // We only have to close if only size changed - if (!env) { - os << '}'; - ++count; - } + if (f.uwave() == FONT_ON) { + os << '}'; + ++count; + --runparams.inulemcmd; } - // When the current language is Hebrew, Arabic, or Farsi + // If the current language is Hebrew, Arabic, or Farsi // the numbers are written Left-to-Right. ArabTeX package // reorders the number automatically but the packages used // for Hebrew and Farsi (Arabi) do not. - if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON - && (language()->lang() == "hebrew" - || language()->lang() == "farsi" - || language()->lang() == "arabic_arabi")) { + if (!runparams.pass_thru && bits_.number() == FONT_ON + && next.fontInfo().number() != FONT_ON + && (language()->lang() == "hebrew" + || language()->lang() == "farsi" + || language()->lang() == "arabic_arabi")) { os << "\\endL}"; count += 6; } @@ -533,16 +561,22 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams, Encoding const * const ascii = encodings.fromLyXName("ascii"); pair const c = switchEncoding(os.os(), bparams, runparams, *ascii); - LASSERT(c.first, /**/); + LATTEST(c.first); count += c.second; runparams.encoding = ascii; open_encoding_ = false; } - if (closeLanguage && - language() != base.language() && language() != next.language()) { + if (closeLanguage + && language() != base.language() && language() != next.language() + && language()->encoding()->package() != Encoding::CJK) { os << '}'; ++count; + bool const using_begin_end = + runparams.use_polyglossia || + !lyxrc.language_command_end.empty(); + if (using_begin_end) + popLanguageName(); } return count; @@ -562,6 +596,7 @@ string Font::toString(bool const toggle) const << "emph " << bits_.emph() << '\n' << "underbar " << bits_.underbar() << '\n' << "strikeout " << bits_.strikeout() << '\n' + << "xout " << bits_.xout() << '\n' << "uuline " << bits_.uuline() << '\n' << "uwave " << bits_.uwave() << '\n' << "noun " << bits_.noun() << '\n' @@ -604,10 +639,10 @@ bool Font::fromString(string const & data, bool & toggle) int const next = lex.getInteger(); bits_.setSize(FontSize(next)); - } else if (token == "emph" || token == "underbar" || - token == "noun" || token == "number" || - token == "uuline" || token == "uwave" || - token == "strikeout") { + } else if (token == "emph" || token == "underbar" + || token == "noun" || token == "number" + || token == "uuline" || token == "uwave" + || token == "strikeout" || token == "xout") { int const next = lex.getInteger(); FontState const misc = FontState(next); @@ -618,6 +653,8 @@ bool Font::fromString(string const & data, bool & toggle) bits_.setUnderbar(misc); else if (token == "strikeout") bits_.setStrikeout(misc); + else if (token == "xout") + bits_.setXout(misc); else if (token == "uuline") bits_.setUuline(misc); else if (token == "uwave") @@ -673,7 +710,12 @@ void Font::validate(LaTeXFeatures & features) const if (bits_.strikeout() == FONT_ON) { LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout()); features.require("ulem"); - LYXERR(Debug::LATEX, "Strikeout enabled. Font: " << to_utf8(stateText(0))); + LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0))); + } + if (bits_.xout() == FONT_ON) { + LYXERR(Debug::LATEX, "font.xout: " << bits_.xout()); + features.require("ulem"); + LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText(0))); } if (bits_.uuline() == FONT_ON) { LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline()); @@ -694,6 +736,19 @@ void Font::validate(LaTeXFeatures & features) const case Color_latex: case Color_notelabel: break; + case Color_brown: + case Color_darkgray: + case Color_gray: + case Color_lightgray: + case Color_lime: + case Color_olive: + case Color_orange: + case Color_pink: + case Color_purple: + case Color_teal: + case Color_violet: + features.require("xcolor"); + break; default: features.require("color"); LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0))); @@ -702,7 +757,8 @@ void Font::validate(LaTeXFeatures & features) const // FIXME: Do something for background and soul package? if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia()) - || (features.useBabel() && lang_->babel() != doc_language->babel())) + || (features.useBabel() && lang_->babel() != doc_language->babel()) + || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language)) && lang_ != ignore_language && lang_ != latex_language) { @@ -731,6 +787,7 @@ ostream & operator<<(ostream & os, FontInfo const & f) << " emph " << f.emph() << " underbar " << f.underbar() << " strikeout " << f.strikeout() + << " xout " << f.xout() << " uuline " << f.uuline() << " uwave " << f.uwave() << " noun " << f.noun()