else if (ot1 && !ot1font_.empty())
return (ot1font_ == "none") ?
true : altFont(ot1font_).available(ot1, nomath);
- else if (requires_.empty() && package_.empty())
+ else if (required_.empty() && package_.empty())
return true;
- else if (!requires_.empty()
- && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+ else if (!required_.empty()
+ && LaTeXFeatures::isAvailable(to_ascii(required_)))
return true;
- else if (requires_.empty() && !package_.empty()
+ else if (required_.empty() && !package_.empty()
&& LaTeXFeatures::isAvailable(to_ascii(package_)))
return true;
else if (!altfonts_.empty()) {
&& altFont(completefont_).available(ot1, nomath))
return completefont_;
else if (switchdefault_) {
- if (requires_.empty()
- || (!requires_.empty()
- && LaTeXFeatures::isAvailable(to_ascii(requires_))))
+ if (required_.empty()
+ || (!required_.empty()
+ && LaTeXFeatures::isAvailable(to_ascii(required_))))
return name_;
}
- else if (!requires_.empty()
- && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+ else if (!required_.empty()
+ && LaTeXFeatures::isAvailable(to_ascii(required_)))
return name_;
else if (!package_.empty()
&& LaTeXFeatures::isAvailable(to_ascii(package_)))
return name_;
else if (!preamble_.empty() && package_.empty()
- && requires_.empty() && !switchdefault_
+ && required_.empty() && !switchdefault_
&& altfonts_.empty()) {
return name_;
}
return string();
string const package = to_ascii(package_);
- if (!requires_.empty() && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+ if (!required_.empty() && LaTeXFeatures::isAvailable(to_ascii(required_)))
return package;
else if (LaTeXFeatures::isAvailable(package))
return package;
else if (dryrun)
return package;
- docstring const req = requires_.empty() ? package_ : requires_;
+ docstring const req = required_.empty() ? package_ : required_;
frontend::Alert::warning(_("Font not available"),
bformat(_("The LaTeX package `%1$s' needed for the font `%2$s'\n"
"is not available on your system. LyX will fall back to the default font."),
string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool osf,
- int scale, string const extraopts, bool nomath)
+ int scale, string const & extraopts, bool nomath)
{
ostringstream os;
bool const needosfopt = (osf != osfdefault_);
bool const has_sc = providesSC(ot1, complete, nomath);
bool const moreopts = providesMoreOptions(ot1, complete, nomath);
- if (!packageoption_.empty())
- os << to_ascii(packageoption_);
+ if (!packageoptions_.empty())
+ os << to_ascii(packageoptions_);
if (sc && needosfopt && has_osf && has_sc) {
if (!os.str().empty())
string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool sc,
- bool osf, bool nomath, string const extraopts,
+ bool osf, bool nomath, string const & extraopts,
int const & scale)
{
ostringstream os;
frontend::Alert::warning(_("Font not available"),
bformat(_("The LaTeX package `%1$s' needed for the font `%2$s'\n"
"is not available on your system. LyX will fall back to the default font."),
- requires_, guiname_), true);
+ required_, guiname_), true);
} else {
string const package =
getAvailablePackage(dryrun);
LF_OT1_FONT,
LF_MOREOPTS,
LF_PACKAGE,
- LF_PACKAGEOPTION,
+ LF_PACKAGEOPTIONS,
LF_PREAMBLE,
LF_PROVIDES,
LF_REQUIRES,
{ "osfscoption", LF_OSFSCOPTION },
{ "ot1font", LF_OT1_FONT },
{ "package", LF_PACKAGE },
- { "packageoption", LF_PACKAGEOPTION },
+ { "packageoptions", LF_PACKAGEOPTIONS },
{ "preamble", LF_PREAMBLE },
{ "provides", LF_PROVIDES },
{ "requires", LF_REQUIRES },
case LF_PACKAGE:
lex >> package_;
break;
- case LF_PACKAGEOPTION:
- lex >> packageoption_;
+ case LF_PACKAGEOPTIONS:
+ lex >> packageoptions_;
break;
case LF_PREAMBLE:
preamble_ = lex.getLongString(from_ascii("EndPreamble"));
break;
}
case LF_REQUIRES:
- lex >> requires_;
+ lex >> required_;
break;
case LF_SCALEOPTION:
lex >> scaleoption_;