}
-Language const * LyXFont::language() const
-{
- return lang;
-}
-
-
bool LyXFont::isRightToLeft() const
{
- return lang->RightToLeft();
+ return lang->rightToLeft();
}
bool LyXFont::isVisibleRightToLeft() const
{
- return (lang->RightToLeft() &&
+ return (lang->rightToLeft() &&
number() != ON);
}
{
ostringstream os;
if (family() != INHERIT_FAMILY)
- os << _(GUIFamilyNames[family()]) << ", ";
+ os << lyx::to_utf8(_(GUIFamilyNames[family()])) << ", ";
if (series() != INHERIT_SERIES)
- os << _(GUISeriesNames[series()]) << ", ";
+ os << lyx::to_utf8(_(GUISeriesNames[series()])) << ", ";
if (shape() != INHERIT_SHAPE)
- os << _(GUIShapeNames[shape()]) << ", ";
+ os << lyx::to_utf8(_(GUIShapeNames[shape()])) << ", ";
if (size() != INHERIT_SIZE)
- os << _(GUISizeNames[size()]) << ", ";
+ os << lyx::to_utf8(_(GUISizeNames[size()])) << ", ";
if (color() != LColor::inherit)
os << lcolor.getGUIName(color()) << ", ";
if (emph() != INHERIT)
- os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
+ os << lyx::to_utf8(bformat(_("Emphasis %1$s, "),
+ _(GUIMiscNames[emph()])));
if (underbar() != INHERIT)
- os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
+ os << lyx::to_utf8(bformat(_("Underline %1$s, "),
+ _(GUIMiscNames[underbar()])));
if (noun() != INHERIT)
- os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
+ os << lyx::to_utf8(bformat(_("Noun %1$s, "),
+ _(GUIMiscNames[noun()])));
if (bits == inherit)
- os << _("Default") << ", ";
+ os << lyx::to_utf8(_("Default")) << ", ";
if (!params || (language() != params->language))
- os << bformat(_("Language: %1$s, "), _(language()->display()));
+ os << lyx::to_utf8(bformat(_("Language: %1$s, "),
+ _(language()->display())));
if (number() != OFF)
- os << bformat(_(" Number %1$s"), _(GUIMiscNames[number()]));
+ os << lyx::to_utf8(bformat(_(" Number %1$s"),
+ _(GUIMiscNames[number()])));
return rtrim(os.str(), ", ");
}
if (col_str == "inherit") col_str = "default";
os << "\\color " << col_str << "\n";
}
- if (orgfont.language() != language()) {
+ if (orgfont.language() != language() &&
+ language() != latex_language) {
if (language())
os << "\\lang " << language()->lang() << "\n";
else
}
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
-{
- register FONT_SHAPE s = shape();
-
- if (emph() == ON) {
- if (s == UP_SHAPE)
- s = ITALIC_SHAPE;
- else
- s = UP_SHAPE;
- }
- if (noun() == ON)
- s = SMALLCAPS_SHAPE;
- return s;
-}
-
-
ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
{
return os << int(fms);