setNoun(setMisc(newfont.noun(), noun()));
setLatex(setMisc(newfont.latex(), latex()));
+ 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().c_str()) << ", ";
+ if (number() != OFF)
+ ost << _(" Number ") << _(GUIMiscNames[number()]);
string buf(ost.str().c_str());
buf = strip(buf, ' ');
if (orgfont.emph() != emph()) {
os << "\\emph " << LyXMiscNames[emph()] << " \n";
}
+ if (orgfont.number() != number()) {
+ os << "\\numeric " << LyXMiscNames[number()] << " \n";
+ }
if (orgfont.underbar() != underbar()) {
// This is only for backwards compatibility
switch (underbar()) {
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{";
count += 3;
- env = true; //We have opened a new environment
} else {
os << "\\L{";
count += 3;
- env = true; //We have opened a new environment
}
} else {
string tmp = '{' +
subst(lyxrc.language_command_begin,
- "$$lang", language()->lang());
+ "$$lang", language()->babel());
os << tmp;
count += tmp.length();
- env = true; //We have opened a new environment
}
}
+ if (number() == ON && prev.number() != ON &&
+ language()->lang() == "hebrew") {
+ os << "{\\beginL ";
+ count += 9;
+ }
+
LyXFont f = *this;
f.reduce(base);
int count = 0;
bool env = false;
- if (language() != base.language() && language() != next.language()) {
- os << "}";
- ++count;
- env = true; // Size change need not bother about closing env.
- }
-
LyXFont f = *this; // why do you need this?
f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
// Because this function is const. Everything breaks if this
// method changes the font it represents. There is no speed penalty
// by using the temporary. (Asger)
+
if (f.family() != INHERIT_FAMILY) {
os << '}';
++count;
}
}
+ if (number() == ON && next.number() != ON &&
+ language()->lang() == "hebrew") {
+ os << "\\endL}";
+ count += 6;
+ }
+
+ if (language() != base.language() && language() != next.language()) {
+ os << "}";
+ ++count;
+ }
+
return count;
}