extern char const * LyXShapeNames[NUM_SHAPE + 2];
extern char const * LyXSizeNames[NUM_SIZE + 4];
extern char const * LyXMiscNames[5];
-
-//
-// Names for the GUI
-//
+extern char const * GUIMiscNames[5];
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", "stmry",
- "wasy", "esint", N_("Inherit"), N_("Ignore") };
-
-char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] =
-{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-
-char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] =
-{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
- N_("Ignore") };
-
-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") };
-
-char const * GUIMiscNames[5] =
-{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
-
//
// Strings used to write LaTeX files
//
char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
"error5", "error6", "error7", "error8", "error9", "error10", "error11",
- "error12", "error13" };
+ "error12", "error13", "error14" };
char const * LaTeXSeriesNames[NUM_SERIES + 2] =
{ "textmd", "textbf", "error4", "error5" };
}
-docstring const stateText(FontInfo const & f)
-{
- 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(_("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()]));
- 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
+docstring const Font::stateText(BufferParams * params, bool const terse) 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"),
_(GUIMiscNames[bits_.number()]));
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())
&& language() != prev.language()) {
if (!language()->polyglossia().empty()) {
string tmp = "\\text" + language()->polyglossia();
- if (!language()->polyglossiaOpts().empty())
+ 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
+ tmp = "\\texorpdfstring{" + tmp + "}{}";
+ }
tmp += "{";
os << from_ascii(tmp);
count += tmp.length();
}
}
- // If the current language is Hebrew, Arabic, or Farsi
- // the numbers are written Left-to-Right. ArabTeX package
- // and bidi (polyglossia) reorder the number automatically
- // but the packages used for Hebrew and Farsi (Arabi) do not.
- if (!runparams.use_polyglossia
- && !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;
- }
-
FontInfo f = bits_;
f.reduce(base.bits_);
FontInfo p = bits_;
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
+ os << "\\LR{";
+ count += 5;
+ } else {
+ os << "{\\beginL ";
+ count += 9;
+ }
+ }
if (f.emph() == FONT_ON) {
os << "\\emph{";
count += 6;
count += 6;
env = true; //We have opened a new environment
}
- if (f.size() != FONT_SIZE_INHERIT) {
+ if (f.size() != INHERIT_SIZE) {
// If we didn't open an environment above, we open one here
if (!env) {
os << '{';
++count;
env = true; // Size change need not bother about closing env.
}
- if (f.size() != FONT_SIZE_INHERIT) {
+ if (f.size() != INHERIT_SIZE) {
// We only have to close if only size changed
if (!env) {
if (needPar && !closeLanguage) {
// If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
- // and bidi (polyglossia) reorder the number automatically
+ // and bidi (polyglossia with XeTeX) reorder the number automatically
// but the packages used for Hebrew and Farsi (Arabi) do not.
- if (!runparams.use_polyglossia
+ 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")) {
- os << "\\endL}";
- count += 6;
+ if (runparams.use_polyglossia) {
+ // LuaTeX/luabidi
+ os << "}";
+ count += 1;
+ } else {
+ os << "\\endL}";
+ count += 6;
+ }
}
if (open_encoding_) {
if (closeLanguage
&& language() != base.language() && language() != next.language()
- && language()->encoding()->package() != Encoding::CJK) {
+ && (language()->encoding()->package() != Encoding::CJK)) {
os << '}';
++count;
bool const using_begin_end =
} else if (token == "size") {
int const next = lex.getInteger();
bits_.setSize(FontSize(next));
-
+ // FIXME: shall style be handled there? Probably not.
} else if (token == "emph" || token == "underbar"
|| token == "noun" || token == "number"
|| token == "uuline" || token == "uwave"
if (bits_.noun() == FONT_ON) {
LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
features.require("noun");
- LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText()));
}
if (bits_.underbar() == FONT_ON) {
LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
features.require("ulem");
- LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.strikeout() == FONT_ON) {
LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
features.require("ulem");
- LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText()));
}
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)));
+ LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uuline() == FONT_ON) {
LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
features.require("ulem");
- LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText()));
}
if (bits_.uwave() == FONT_ON) {
LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
features.require("ulem");
- LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText()));
}
switch (bits_.color()) {
case Color_none:
break;
default:
features.require("color");
- LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
+ LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
}
// FIXME: Do something for background and soul package?
<< " 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()
ostream & operator<<(ostream & os, Font const & font)
{
return os << font.bits_
- << " lang: " << (font.lang_ ? font.lang_->lang() : 0);
+ << " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
}