//
// 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];
//
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") };
//
// 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" };
tmp += "{";
os << from_ascii(tmp);
count += tmp.length();
+ } else if (language()->encoding()->package() != Encoding::CJK) {
+ os << '{';
+ count += 1;
}
} else if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
"$$lang", language()->babel());
os << from_ascii(tmp);
count += tmp.length();
- } else {
+ } else if (language()->encoding()->package() != Encoding::CJK) {
os << '{';
count += 1;
}
}
}
- // 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.
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.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;
}
/// Writes ending block of LaTeX needed to close use of this font
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
Font const & next,
++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) {
+ 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.uuline() == 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.uwave() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
- }
- if (f.size() != FONT_SIZE_INHERIT) {
- // We only have to close if only size changed
- if (!env) {
- 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.
// We need to close the encoding even if it does not change
// to do correct environment nesting
Encoding const * const ascii = encodings.fromLyXName("ascii");
- pair<bool, int> const c = switchEncoding(os, bparams,
+ pair<bool, int> 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;
}
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)));
// FIXME: Do something for background and soul package?
- if (lang_->babel() != doc_language->babel() &&
- lang_ != ignore_language &&
- lang_ != latex_language)
+ if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
+ || (features.useBabel() && lang_->babel() != doc_language->babel())
+ || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
+ && lang_ != ignore_language
+ && lang_ != latex_language)
{
features.useLanguage(lang_);
LYXERR(Debug::LATEX, "Found language " << lang_->lang());
projects / lyx.git / blobdiff