#include "LyXRC.h"
#include "output_latex.h"
#include "OutputParams.h"
+#include "texstream.h"
#include "support/lassert.h"
#include "support/convert.h"
namespace lyx {
-//
-// Names for the GUI
-//
-
-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", "wasy", "esint",
- N_("Inherit"), N_("Ignore") };
-
-char const * GUISeriesNames[4] =
-{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-
-char const * GUIShapeNames[6] =
-{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
- N_("Ignore") };
-
-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") };
-
-char const * GUIMiscNames[5] =
-{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
-
-
//
// Strings used to read and write .lyx format files
//
-char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
-{ "roman", "sans", "typewriter", "symbol",
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
- "default", "error" };
+// These are defined in FontInfo.cpp
+extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
+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];
+extern char const * GUIMiscNames[5];
-char const * LyXSeriesNames[4] =
-{ "medium", "bold", "default", "error" };
-
-char const * LyXShapeNames[6] =
-{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-
-char const * LyXSizeNames[14] =
-{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
- "larger", "largest", "huge", "giant",
- "increase", "decrease", "default", "error" };
-
-char const * LyXMiscNames[5] =
-{ "off", "on", "toggle", "default", "error" };
+namespace {
//
// Strings used to write LaTeX files
//
-char const * LaTeXFamilyNames[6] =
-{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
+char const * LaTeXFamilyCommandNames[NUM_FAMILIES + 2] =
+{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
+ "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+ "error12", "error13", "error14" };
+
+char const * LaTeXFamilySwitchNames[NUM_FAMILIES + 2] =
+{ "rmfamily", "sffamily", "ttfamily", "error1", "error2", "error3", "error4",
+ "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+ "error12", "error13", "error14" };
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesCommandNames[NUM_SERIES + 2] =
{ "textmd", "textbf", "error4", "error5" };
-char const * LaTeXShapeNames[6] =
+char const * LaTeXSeriesSwitchNames[NUM_SERIES + 2] =
+{ "mdseries", "bfseries", "error4", "error5" };
+
+char const * LaTeXShapeCommandNames[NUM_SHAPE + 2] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-char const * LaTeXSizeNames[14] =
+char const * LaTeXShapeSwitchNames[NUM_SHAPE + 2] =
+{ "upshape", "itshape", "slshape", "scshape", "error6", "error7" };
+
+char const * LaTeXSizeSwitchNames[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)
- : bits_(bits), lang_(l), misspelled_(false), open_encoding_(false)
+ : bits_(bits), lang_(l), open_encoding_(false)
{
if (!lang_)
lang_ = default_language;
/// Updates font settings according to request
void Font::update(Font const & newfont,
- Language const * document_language,
+ Language const * default_lang,
bool toggleall)
{
bits_.update(newfont.fontInfo(), toggleall);
if (newfont.language() == language() && toggleall)
- if (language() == document_language)
+ if (language() == default_lang)
setLanguage(default_language);
else
- setLanguage(document_language);
+ setLanguage(default_lang);
else if (newfont.language() == reset_language)
- setLanguage(document_language);
+ setLanguage(default_lang);
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
}
-docstring const stateText(FontInfo const & f)
+docstring const Font::stateText(BufferParams * params, bool const terse) const
{
odocstringstream os;
- if (f.family() != INHERIT_FAMILY)
- os << _(GUIFamilyNames[f.family()]) << ", ";
- if (f.series() != INHERIT_SERIES)
- os << _(GUISeriesNames[f.series()]) << ", ";
- if (f.shape() != INHERIT_SHAPE)
- os << _(GUIShapeNames[f.shape()]) << ", ";
- if (f.size() != FONT_SIZE_INHERIT)
- os << _(GUISizeNames[f.size()]) << ", ";
- if (f.color() != Color_inherit)
- os << lcolor.getGUIName(f.color()) << ", ";
- // FIXME: uncomment this when we support background.
- //if (f.background() != Color_inherit)
- // os << lcolor.getGUIName(f.background()) << ", ";
- if (f.emph() != FONT_INHERIT)
- os << bformat(_("Emphasis %1$s, "),
- _(GUIMiscNames[f.emph()]));
- if (f.underbar() != FONT_INHERIT)
- os << bformat(_("Underline %1$s, "),
- _(GUIMiscNames[f.underbar()]));
- if (f.strikeout() != FONT_INHERIT)
- os << bformat(_("Strikeout %1$s, "),
- _(GUIMiscNames[f.strikeout()]));
- if (f.uuline() != FONT_INHERIT)
- os << bformat(_("Double underline %1$s, "),
- _(GUIMiscNames[f.uuline()]));
- if (f.uwave() != FONT_INHERIT)
- os << bformat(_("Wavy underline %1$s, "),
- _(GUIMiscNames[f.uwave()]));
- if (f.noun() != FONT_INHERIT)
- os << bformat(_("Noun %1$s, "),
- _(GUIMiscNames[f.noun()]));
- if (f == inherit_font)
- os << _("Default") << ", ";
-
- return os.str();
-}
-
-
-docstring const Font::stateText(BufferParams * params) const
-{
- odocstringstream os;
- os << lyx::stateText(bits_);
- if (!params || (language() != params->language))
+ os << bits_.stateText(terse);
+ if ((!params || (language() != params->language))
+ && (!terse || language() != ignore_language)) {
+ // reset_language is a null pointer!
os << bformat(_("Language: %1$s, "),
- _(language()->display()));
+ (language() == reset_language) ? _("Default")
+ : _(language()->display()));
+ }
if (bits_.number() != FONT_OFF)
- os << bformat(_(" Number %1$s"),
+ os << " " << bformat(_("Number %1$s"),
_(GUIMiscNames[bits_.number()]));
return rtrim(os.str(), ", ");
}
-// Set family according to lyx format string
-void setLyXFamily(string const & fam, FontInfo & f)
-{
- string const s = ascii_lowercase(fam);
-
- int i = 0;
- while (LyXFamilyNames[i] != s &&
- LyXFamilyNames[i] != string("error"))
- ++i;
- if (s == LyXFamilyNames[i])
- f.setFamily(FontFamily(i));
- else
- lyxerr << "setLyXFamily: Unknown family `"
- << s << '\'' << endl;
-}
-
-
-// Set series according to lyx format string
-void setLyXSeries(string const & ser, FontInfo & f)
-{
- string const s = ascii_lowercase(ser);
-
- int i = 0;
- while (LyXSeriesNames[i] != s &&
- LyXSeriesNames[i] != string("error")) ++i;
- if (s == LyXSeriesNames[i]) {
- f.setSeries(FontSeries(i));
- } else
- lyxerr << "setLyXSeries: Unknown series `"
- << s << '\'' << endl;
-}
-
-
-// Set shape according to lyx format string
-void setLyXShape(string const & sha, FontInfo & f)
-{
- string const s = ascii_lowercase(sha);
-
- int i = 0;
- while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
- ++i;
- if (s == LyXShapeNames[i])
- f.setShape(FontShape(i));
- else
- lyxerr << "Font::setLyXShape: Unknown shape `"
- << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-void setLyXSize(string const & siz, FontInfo & f)
-{
- string const s = ascii_lowercase(siz);
- int i = 0;
- while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
- ++i;
- if (s == LyXSizeNames[i]) {
- f.setSize(FontSize(i));
- } else
- lyxerr << "Font::setLyXSize: Unknown size `"
- << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-FontState Font::setLyXMisc(string const & siz)
-{
- string const s = ascii_lowercase(siz);
- int i = 0;
- while (LyXMiscNames[i] != s &&
- LyXMiscNames[i] != string("error")) ++i;
- if (s == LyXMiscNames[i])
- return FontState(i);
- lyxerr << "Font::setLyXMisc: Unknown misc flag `"
- << s << '\'' << endl;
- return FONT_OFF;
-}
-
-
-/// Sets color after LyX text format
-void setLyXColor(string const & col, FontInfo & f)
-{
- f.setColor(lcolor.getFromLyXName(col));
-}
-
-
// Returns size in latex format
string const Font::latexSize() const
{
- return LaTeXSizeNames[bits_.size()];
-}
-
-
-// Read a font definition from given file in lyx format
-// Used for layouts
-FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
-{
- FontInfo f = fi;
- bool error = false;
- bool finished = false;
- while (!finished && lex.isOK() && !error) {
- lex.next();
- string const tok = ascii_lowercase(lex.getString());
-
- if (tok.empty()) {
- continue;
- } else if (tok == "endfont") {
- finished = true;
- } else if (tok == "family") {
- lex.next();
- string const ttok = lex.getString();
- setLyXFamily(ttok, f);
- } else if (tok == "series") {
- lex.next();
- string const ttok = lex.getString();
- setLyXSeries(ttok, f);
- } else if (tok == "shape") {
- lex.next();
- string const ttok = lex.getString();
- setLyXShape(ttok, f);
- } else if (tok == "size") {
- lex.next();
- string const ttok = lex.getString();
- setLyXSize(ttok, f);
- } else if (tok == "misc") {
- lex.next();
- string const ttok = ascii_lowercase(lex.getString());
-
- if (ttok == "no_bar") {
- f.setUnderbar(FONT_OFF);
- } else if (ttok == "no_strikeout") {
- f.setStrikeout(FONT_OFF);
- } else if (ttok == "no_uuline") {
- f.setUuline(FONT_OFF);
- } else if (ttok == "no_uwave") {
- f.setUwave(FONT_OFF);
- } else if (ttok == "no_emph") {
- f.setEmph(FONT_OFF);
- } else if (ttok == "no_noun") {
- f.setNoun(FONT_OFF);
- } else if (ttok == "emph") {
- f.setEmph(FONT_ON);
- } else if (ttok == "underbar") {
- f.setUnderbar(FONT_ON);
- } else if (ttok == "strikeout") {
- f.setStrikeout(FONT_ON);
- } else if (ttok == "uuline") {
- f.setUuline(FONT_ON);
- } else if (ttok == "uwave") {
- f.setUwave(FONT_ON);
- } else if (ttok == "noun") {
- f.setNoun(FONT_ON);
- } else {
- lex.printError("Illegal misc type");
- }
- } else if (tok == "color") {
- lex.next();
- string const ttok = lex.getString();
- setLyXColor(ttok, f);
- } else {
- lex.printError("Unknown tag");
- error = true;
- }
- }
- return f;
+ return LaTeXSizeSwitchNames[bits_.size()];
}
os << "\\shape " << LyXShapeNames[bits_.shape()] << "\n";
if (orgfont.fontInfo().size() != bits_.size())
os << "\\size " << LyXSizeNames[bits_.size()] << "\n";
+ // FIXME: shall style be handled there? Probably not.
if (orgfont.fontInfo().emph() != bits_.emph())
os << "\\emph " << LyXMiscNames[bits_.emph()] << "\n";
if (orgfont.fontInfo().number() != bits_.number())
os << "\\numeric " << LyXMiscNames[bits_.number()] << "\n";
+ if (orgfont.fontInfo().nospellcheck() != bits_.nospellcheck())
+ os << "\\nospellcheck " << LyXMiscNames[bits_.nospellcheck()] << "\n";
if (orgfont.fontInfo().underbar() != bits_.underbar()) {
// This is only for backwards compatibility
switch (bits_.underbar()) {
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";
}
/// Writes the head of the LaTeX needed to impose this font
// Returns number of chars written.
-int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
- Font const & prev) const
+ Font const & prev,
+ bool non_inherit_inset,
+ bool needs_cprotection) const
{
- bool env = false;
-
int count = 0;
- if (language()->babel() != base.language()->babel() &&
+
+ // polyglossia or babel?
+ if (runparams.use_polyglossia
+ && language()->lang() != base.language()->lang()
+ && language() != prev.language()) {
+ if (!language()->polyglossia().empty()) {
+ string tmp;
+ if (needs_cprotection)
+ tmp += "\\cprotect";
+ tmp += "\\text" + language()->polyglossia();
+ if (!language()->polyglossiaOpts().empty()) {
+ tmp += "[" + language()->polyglossiaOpts() + "]";
+ if (runparams.use_hyperref && runparams.moving_arg) {
+ // We need to strip the command for
+ // the pdf string, see #11813
+ string tmpp;
+ if (needs_cprotection)
+ tmpp = "\\cprotect";
+ tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
+ }
+ }
+ 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()) {
if (language()->lang() == "farsi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textFR{";
count += 8;
} else if (!isRightToLeft() &&
base.language()->lang() == "farsi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textLR{";
count += 8;
} else if (language()->lang() == "arabic_arabi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textAR{";
count += 8;
} else if (!isRightToLeft() &&
base.language()->lang() == "arabic_arabi") {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\textLR{";
count += 8;
// currently the remaining RTL languages are arabic_arabtex and hebrew
- } else if (isRightToLeft() != prev.isRightToLeft()) {
+ } else if (isRightToLeft() != prev.isRightToLeft() && !runparams.isFullUnicode()) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
if (isRightToLeft()) {
os << "\\R{";
count += 3;
"$$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;
}
}
if (language()->encoding()->package() == Encoding::CJK) {
- pair<bool, int> const c = switchEncoding(os, bparams,
+ pair<bool, int> const c = switchEncoding(os.os(), bparams,
runparams, *(language()->encoding()));
if (c.first) {
open_encoding_ = true;
}
}
- // When 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")) {
- os << "{\\beginL ";
- count += 9;
- }
-
FontInfo f = bits_;
f.reduce(base.bits_);
+ FontInfo p = bits_;
+ p.reduce(prev.bits_);
+ if (f.size() != INHERIT_SIZE) {
+ if (!runparams.find_effective()) {
+ os << '{';
+ ++count;
+ os << '\\'
+ << LaTeXSizeSwitchNames[f.size()] << termcmd;
+ count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+ }
+ else {
+ os << '\\'
+ << LaTeXSizeSwitchNames[f.size()] << '{';
+ count += strlen(LaTeXSizeSwitchNames[f.size()]) + 2;
+ }
+ }
if (f.family() != INHERIT_FAMILY) {
- os << '\\'
- << LaTeXFamilyNames[f.family()]
- << '{';
- count += strlen(LaTeXFamilyNames[f.family()]) + 2;
- env = true; //We have opened a new environment
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
+ count += strlen(LaTeXFamilySwitchNames[f.family()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXFamilyCommandNames[f.family()]
+ << '{';
+ count += strlen(LaTeXFamilyCommandNames[f.family()]) + 2;
+ }
}
if (f.series() != INHERIT_SERIES) {
- os << '\\'
- << LaTeXSeriesNames[f.series()]
- << '{';
- count += strlen(LaTeXSeriesNames[f.series()]) + 2;
- env = true; //We have opened a new environment
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
+ count += strlen(LaTeXSeriesSwitchNames[f.series()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXSeriesCommandNames[f.series()]
+ << '{';
+ count += strlen(LaTeXSeriesCommandNames[f.series()]) + 2;
+ }
}
if (f.shape() != INHERIT_SHAPE) {
- os << '\\'
- << LaTeXShapeNames[f.shape()]
- << '{';
- count += strlen(LaTeXShapeNames[f.shape()]) + 2;
- env = true; //We have opened a new environment
+ if (non_inherit_inset) {
+ os << '{';
+ ++count;
+ os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
+ count += strlen(LaTeXShapeSwitchNames[f.shape()]) + 1;
+ } else {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << '\\'
+ << LaTeXShapeCommandNames[f.shape()]
+ << '{';
+ count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
+ }
}
if (f.color() != Color_inherit && f.color() != Color_ignore) {
- os << "\\textcolor{"
- << from_ascii(lcolor.getLaTeXName(f.color()))
- << "}{";
- count += lcolor.getLaTeXName(f.color()).length() + 13;
- env = true; //We have opened a new environment
+ if (f.color() == Color_none && p.color() != Color_none) {
+ // Color none: Close previous color, if any
+ os << '}';
+ ++count;
+ } else if (f.color() != Color_none) {
+ os << "\\textcolor{"
+ << from_ascii(lcolor.getLaTeXName(f.color()))
+ << "}{";
+ count += lcolor.getLaTeXName(f.color()).length() + 13;
+ }
}
// FIXME: uncomment this when we support background.
/*
env = true; //We have opened a new environment
}
*/
+ // If the current language is Hebrew, Arabic, or Farsi
+ // the numbers are written Left-to-Right. ArabTeX package
+ // and bidi (polyglossia with XeTeX) reorder the number automatically
+ // but the packages used for Hebrew and Farsi (Arabi) do not.
+ if (!runparams.useBidiPackage()
+ && !runparams.pass_thru
+ && bits_.number() == FONT_ON
+ && prev.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
+ if (runparams.use_polyglossia) {
+ // LuaTeX/luabidi
+ // \LR needs extra grouping
+ // (possibly a LuaTeX bug)
+ os << "{\\LR{";
+ count += 6;
+ } else if (!runparams.isFullUnicode()) {
+ // not needed with babel/lua|xetex
+ os << "{\\beginL ";
+ count += 9;
+ }
+ }
if (f.emph() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\emph{";
count += 6;
- env = true; //We have opened a new environment
}
+ // \noun{} is a LyX special macro
+ if (f.noun() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << "\\noun{";
+ count += 6;
+ }
+ // 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) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\uline{";
- count += 10;
- env = true; //We have opened a new environment
- }
- if (f.strikeout() == FONT_ON) {
- os << "\\sout{";
- count += 6;
- env = true; //We have opened a new environment
+ count += 7;
+ ++runparams.inulemcmd;
}
if (f.uuline() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
os << "\\uuline{";
count += 8;
- env = true; //We have opened a new environment
+ ++runparams.inulemcmd;
}
- if (f.uwave() == FONT_ON) {
- os << "\\uwave{";
- count += 7;
- env = true; //We have opened a new environment
+ if (f.strikeout() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << "\\sout{";
+ count += 6;
+ ++runparams.inulemcmd;
}
- // \noun{} is a LyX special macro
- if (f.noun() == FONT_ON) {
- os << "\\noun{";
+ if (f.xout() == FONT_ON) {
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
+ }
+ os << "\\xout{";
count += 6;
- env = true; //We have opened a new environment
+ ++runparams.inulemcmd;
}
- if (f.size() != FONT_SIZE_INHERIT) {
- // If we didn't open an environment above, we open one here
- if (!env) {
- os << '{';
- ++count;
+ if (f.uwave() == FONT_ON) {
+ if (runparams.inulemcmd) {
+ // needed with nested uwave in xout
+ // see https://tex.stackexchange.com/a/263042
+ os << "\\ULdepth=1000pt";
+ count += 15;
+ }
+ if (needs_cprotection) {
+ os << "\\cprotect";
+ count += 9;
}
- os << '\\'
- << LaTeXSizeNames[f.size()]
- << ' ';
- count += strlen(LaTeXSizeNames[f.size()]) + 2;
+ os << "\\uwave{";
+ count += 7;
+ ++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,
- bool const & closeLanguage) const
+ bool & needPar,
+ bool closeLanguage) const
{
int count = 0;
- bool env = false;
// reduce the current font to changes against the base
// font (of the layout). We use a temporary for this to
if (f.family() != INHERIT_FAMILY) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
}
if (f.series() != INHERIT_SERIES) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
}
if (f.shape() != INHERIT_SHAPE) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
}
- if (f.color() != Color_inherit && f.color() != Color_ignore) {
+ if (f.color() != Color_inherit && f.color() != Color_ignore && f.color() != Color_none) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
}
if (f.emph() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
+ }
+ if (f.noun() == FONT_ON) {
+ os << '}';
+ ++count;
+ }
+ if (f.size() != INHERIT_SIZE) {
+ // We do not close size group in front of
+ // insets with InheritFont() false (as opposed
+ // to all other font properties) (#8384)
+ if (needPar && !closeLanguage) {
+ os << "\\par";
+ count += 4;
+ needPar = false;
+ }
+ os << '}';
+ ++count;
}
if (f.underbar() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
if (f.strikeout() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
- if (f.uuline() == FONT_ON) {
+ if (f.xout() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
- if (f.uwave() == FONT_ON) {
+ if (f.uuline() == FONT_ON) {
os << '}';
++count;
- 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.
- if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON
- && (language()->lang() == "hebrew"
- || language()->lang() == "farsi"
- || language()->lang() == "arabic_arabi")) {
- os << "\\endL}";
- count += 6;
+ // and bidi (polyglossia with XeTeX) reorder the number automatically
+ // but the packages used for Hebrew and Farsi (Arabi) do not.
+ if (!runparams.useBidiPackage()
+ && !runparams.pass_thru
+ && bits_.number() == FONT_ON
+ && next.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
+ if (runparams.use_polyglossia) {
+ // LuaTeX/luabidi
+ // luabidi's \LR needs extra grouping
+ // (possibly a LuaTeX bug)
+ os << "}}";
+ count += 2;
+ } else if (!runparams.isFullUnicode()) {
+ // not needed with babel/lua|xetex
+ os << "\\endL}";
+ count += 6;
+ }
}
if (open_encoding_) {
// 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;
+ bool const using_begin_end =
+ runparams.use_polyglossia ||
+ !lyxrc.language_command_end.empty();
+ if (using_begin_end && !languageStackEmpty())
+ popLanguageName();
}
return count;
<< "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'
<< "number " << bits_.number() << '\n'
+ << "nospellcheck " << bits_.nospellcheck() << '\n'
<< "color " << bits_.color() << '\n'
<< "language " << lang << '\n'
<< "toggleall " << convert<string>(toggle);
} else if (token == "size") {
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") {
+ // FIXME: shall style be handled there? Probably not.
+ } else if (token == "emph" || token == "underbar"
+ || token == "noun" || token == "number"
+ || token == "uuline" || token == "uwave"
+ || token == "strikeout" || token == "xout"
+ || token == "nospellcheck") {
int const next = lex.getInteger();
FontState const misc = FontState(next);
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")
bits_.setNoun(misc);
else if (token == "number")
bits_.setNumber(misc);
+ else if (token == "nospellcheck")
+ bits_.setNoSpellcheck(misc);
} else if (token == "color") {
int const next = lex.getInteger();
Language const * doc_language = bparams.language;
if (bits_.noun() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
+ LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
features.require("noun");
- LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
}
if (bits_.underbar() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.underline: " << bits_.strikeout());
+ LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
features.require("ulem");
- LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.strikeout() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+ LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
features.require("ulem");
- LYXERR(Debug::LATEX, "Strikeout enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
+ }
+ if (bits_.xout() == FONT_ON) {
+ LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
+ features.require("ulem");
+ LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uuline() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+ LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
features.require("ulem");
- LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uwave() == FONT_ON) {
- LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+ LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
features.require("ulem");
- LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
}
switch (bits_.color()) {
case Color_none:
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)));
+ LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
}
// 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());
+ LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
}
}
<< " series " << f.series()
<< " shape " << f.shape()
<< " size " << f.size()
+ << " style " << f.style()
<< " color " << f.color()
// FIXME: uncomment this when we support background.
//<< " background " << f.background()
<< " emph " << f.emph()
<< " underbar " << f.underbar()
<< " strikeout " << f.strikeout()
+ << " xout " << f.xout()
<< " uuline " << f.uuline()
<< " uwave " << f.uwave()
<< " noun " << f.noun()
- << " number " << f.number();
+ << " number " << f.number()
+ << " nospellcheck " << f.nospellcheck();
}
ostream & operator<<(ostream & os, Font const & font)
{
return os << font.bits_
- << " lang: " << (font.lang_ ? font.lang_->lang() : 0);
+ << " lang: " << (font.lang_ ? font.lang_->lang() : "");
}
projects / lyx.git / blobdiff