#include "lyxlex.h"
#include "FontLoader.h"
#include "support/lstrings.h"
+#include "bufferparams.h" // stateText
using std::ostream;
using std::endl;
/// Build GUI description of font state
-string LyXFont::stateText() const
+string LyXFont::stateText(BufferParams * params) const
{
#ifdef HAVE_SSTREAM
std::ostringstream ost;
ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
if (bits == inherit)
ost << _("Default") << ", ";
- ost << _("Language: ") << _(language()->display.c_str());
+ if (!params || language() != params->language_info)
+ ost << _("Language: ") << _(language()->display().c_str());
#ifdef HAVE_SSTREAM
string buf(ost.str().c_str());
#else
if (orgfont.color() != color()) {
// To make us file compatible with older
// lyx versions we emit "default" instead
- // of "ignore"
+ // of "inherit"
string col_str(lcolor.getLyXName(color()));
if (col_str == "inherit") col_str = "default";
os << "\\color " << col_str << "\n";
}
if (orgfont.language() != language()) {
if (language())
- os << "\\lang " << language()->lang << "\n";
+ os << "\\lang " << language()->lang() << "\n";
else
os << "\\lang unknown\n";
}
} else {
string tmp = '{' +
subst(lyxrc.language_command_begin,
- "$$lang", language()->lang);
+ "$$lang", language()->lang());
os << tmp;
count += tmp.length();
env = true; //We have opened a new environment