/// Increases font size by one
LyXFont & LyXFont::incSize()
{
- switch(size()) {
+ switch (size()) {
case SIZE_HUGER: break;
case SIZE_HUGE: setSize(SIZE_HUGER); break;
case SIZE_LARGEST: setSize(SIZE_HUGE); break;
void LyXFont::update(LyXFont const & newfont,
Language const * document_language, bool toggleall)
{
- if(newfont.family() == family() && toggleall)
+ if (newfont.family() == family() && toggleall)
setFamily(INHERIT_FAMILY); // toggle 'back'
else if (newfont.family() != IGNORE_FAMILY)
setFamily(newfont.family());
break;
}
- if(newfont.shape() == shape() && toggleall)
+ if (newfont.shape() == shape() && toggleall)
setShape(INHERIT_SHAPE); // toggle 'back'
else if (newfont.shape() != IGNORE_SHAPE)
setShape(newfont.shape());
setNumber(setMisc(newfont.number(), number()));
if (newfont.language() == language() && toggleall)
- setLanguage(document_language);
+ if (language() == document_language)
+ setLanguage(default_language);
+ else
+ setLanguage(document_language);
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
if (bits == inherit)
ost << _("Default") << ", ";
- if (!params || (language() != params->language_info))
- ost << _("Language: ") << _(language()->display().c_str()) << ", ";
+ if (!params || (language() != params->language))
+ ost << _("Language: ") << _(language()->display()) << ", ";
if (number() != OFF)
ost << _(" Number ") << _(GUIMiscNames[number()]);
-
string buf(ost.str().c_str());
buf = strip(buf, ' ');
buf = strip(buf, ',');
}
+#if 0
/// Sets size after GUI name
LyXFont & LyXFont::setGUISize(string const & siz)
{
setColor(lcolor.getFromGUIName(siz));
return *this;
}
+#endif
// Returns size in latex format
int count = 0;
bool env = false;
- if (language() != base.language() && language() != prev.language()) {
+ if (language()->babel() != base.language()->babel() &&
+ language()->babel() != prev.language()->babel()) {
if (isRightToLeft() != prev.isRightToLeft()) {
if (isRightToLeft()) {
os << "\\R{";
} else {
string tmp = '{' +
subst(lyxrc.language_command_begin,
- "$$lang", language()->lang());
+ "$$lang", language()->babel());
os << tmp;
count += tmp.length();
}