fonts_roman = "default";
fonts_sans = "default";
fonts_typewriter = "default";
+ fonts_math = "auto";
fonts_default_family = "default";
useNonTeXFonts = false;
fonts_expert_sc = false;
packages.push_back("mathdots");
packages.push_back("mathtools");
packages.push_back("mhchem");
+ packages.push_back("stackrel");
+ packages.push_back("stmaryrd");
packages.push_back("undertilde");
}
return packages;
} else if (token == "\\font_typewriter") {
lex.eatLine();
fonts_typewriter = lex.getString();
+ } else if (token == "\\font_math") {
+ lex.eatLine();
+ fonts_math = lex.getString();
} else if (token == "\\font_default_family") {
lex >> fonts_default_family;
} else if (token == "\\use_non_tex_fonts") {
lex.eatLine();
string color = lex.getString();
notefontcolor = lyx::rgbFromHexName(color);
+ lcolor.setColor("notefontcolor", color);
} else if (token == "\\boxbgcolor") {
lex.eatLine();
string color = lex.getString();
boxbgcolor = lyx::rgbFromHexName(color);
+ lcolor.setColor("boxbgcolor", color);
} else if (token == "\\paperwidth") {
lex >> paperwidth;
} else if (token == "\\paperheight") {
<< "\n\\font_roman " << fonts_roman
<< "\n\\font_sans " << fonts_sans
<< "\n\\font_typewriter " << fonts_typewriter
+ << "\n\\font_math " << fonts_math
<< "\n\\font_default_family " << fonts_default_family
<< "\n\\use_non_tex_fonts " << convert<string>(useNonTeXFonts)
<< "\n\\font_sc " << convert<string>(fonts_expert_sc)
{
features.require(documentClass().requires());
+ if (columns > 1 && language->rightToLeft())
+ features.require("rtloutputdblcol");
+
if (outputChanges) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
|| useNonTeXFonts))
features.require("polyglossia");
+ if (useNonTeXFonts && fonts_math != "auto")
+ features.require("unicode-math");
+
if (!language->requires().empty())
features.require(language->requires());
}
if (useNonTeXFonts && !ams.empty())
os << from_ascii(ams);
- if (useNonTeXFonts)
+ if (useNonTeXFonts) {
os << "\\usepackage{fontspec}\n";
+ if (features.mustProvide("unicode-math")
+ && features.isAvailable("unicode-math"))
+ os << "\\usepackage{unicode-math}\n";
+ }
// font selection must be done before loading fontenc.sty
- string const fonts =
- loadFonts(fonts_roman, fonts_sans, fonts_typewriter,
- fonts_expert_sc, fonts_old_figures,
- fonts_sans_scale, fonts_typewriter_scale,
- useNonTeXFonts, features);
+ string const fonts = loadFonts(features);
if (!fonts.empty())
os << from_utf8(fonts);
// XeTeX and LuaTeX (with OS fonts) work without fontenc
if (font_encoding() != "default" && language->lang() != "japanese"
&& !useNonTeXFonts && !features.isProvided("fontenc")) {
+ docstring extra_encoding;
+ if (features.mustProvide("textgreek"))
+ extra_encoding += from_ascii("LGR");
+ if (features.mustProvide("textcyr")) {
+ if (!extra_encoding.empty())
+ extra_encoding.push_back(',');
+ extra_encoding += from_ascii("T2A");
+ }
+ if (!extra_encoding.empty() && !font_encoding().empty())
+ extra_encoding.push_back(',');
size_t fars = language_options.str().find("farsi");
size_t arab = language_options.str().find("arabic");
if (language->lang() == "arabic_arabi"
|| language->lang() == "farsi" || fars != string::npos
|| arab != string::npos) {
- os << "\\usepackage[" << from_ascii(font_encoding())
+ os << "\\usepackage[" << extra_encoding
+ << from_ascii(font_encoding())
<< ",LFE,LAE]{fontenc}\n";
} else {
- os << "\\usepackage[" << from_ascii(font_encoding())
+ os << "\\usepackage[" << extra_encoding
+ << from_ascii(font_encoding())
<< "]{fontenc}\n";
}
}
return;
LayoutModuleList mods;
- LayoutModuleList::iterator it;
- LayoutModuleList::iterator en;
-
- it = layout_modules_.begin();
- en = layout_modules_.end();
+ LayoutModuleList::iterator it = layout_modules_.begin();
+ LayoutModuleList::iterator en = layout_modules_.end();
for (; it != en; ++it)
mods.push_back(*it);
+
it = cite_engine_.begin();
en = cite_engine_.end();
for (; it != en; ++it)
mods.push_back(*it);
+
doc_class_ = getDocumentClass(*baseClass(), mods);
if (!local_layout.empty()) {
}
-bool BufferParams::moduleCanBeAdded(string const & modName) const
+bool BufferParams::layoutModuleCanBeAdded(string const & modName) const
+{
+ return layout_modules_.moduleCanBeAdded(modName, baseClass());
+}
+
+
+bool BufferParams::citationModuleCanBeAdded(string const & modName) const
{
- return cite_engine_.moduleCanBeAdded(modName, baseClass()) &&
- layout_modules_.moduleCanBeAdded(modName, baseClass());
+ return cite_engine_.moduleCanBeAdded(modName, baseClass());
}
namespace {
-bool formatSorter(Format const * lhs, Format const * rhs) {
+
+bool formatSorter(Format const * lhs, Format const * rhs)
+{
return _(lhs->prettyname()) < _(rhs->prettyname());
}
+
}
}
-string const BufferParams::loadFonts(string const & rm,
- string const & sf, string const & tt,
- bool const & sc, bool const & osf,
- int const & sfscale, int const & ttscale,
- bool const & use_systemfonts,
- LaTeXFeatures & features) const
+string const BufferParams::loadFonts(LaTeXFeatures & features) const
{
- // TODO: separate math fonts.
-
- if (rm == "default" && sf == "default" && tt == "default")
+ if (fonts_roman == "default" && fonts_sans == "default"
+ && fonts_typewriter == "default"
+ && (fonts_math == "default" || fonts_math == "auto"))
//nothing to do
return string();
* -- if there's a way to find out if a font really supports
* OldStyle, enable/disable the widget accordingly.
*/
- if (use_systemfonts && features.isAvailable("fontspec")) {
+ if (useNonTeXFonts && features.isAvailable("fontspec")) {
// "Mapping=tex-text" and "Ligatures=TeX" are equivalent.
// However, until v.2 (2010/07/11) fontspec only knew
// Mapping=tex-text (for XeTeX only); then "Ligatures=TeX"
string const texmapping =
(features.runparams().flavor == OutputParams::XETEX) ?
"Mapping=tex-text" : "Ligatures=TeX";
- if (rm != "default") {
+ if (fonts_roman != "default") {
os << "\\setmainfont[" << texmapping;
- if (osf)
+ if (fonts_old_figures)
os << ",Numbers=OldStyle";
- os << "]{" << parseFontName(rm) << "}\n";
+ os << "]{" << parseFontName(fonts_roman) << "}\n";
}
- if (sf != "default") {
- string const sans = parseFontName(sf);
- if (sfscale != 100)
+ if (fonts_sans != "default") {
+ string const sans = parseFontName(fonts_sans);
+ if (fonts_sans_scale != 100)
os << "\\setsansfont[Scale="
- << float(sfscale) / 100
+ << float(fonts_sans_scale) / 100
<< "," << texmapping << "]{"
<< sans << "}\n";
else
os << "\\setsansfont[" << texmapping << "]{"
<< sans << "}\n";
}
- if (tt != "default") {
- string const mono = parseFontName(tt);
- if (ttscale != 100)
+ if (fonts_typewriter != "default") {
+ string const mono = parseFontName(fonts_typewriter);
+ if (fonts_typewriter_scale != 100)
os << "\\setmonofont[Scale="
- << float(ttscale) / 100
+ << float(fonts_typewriter_scale) / 100
<< "]{"
<< mono << "}\n";
else
// Tex Fonts
bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1");
bool const dryrun = features.runparams().dryrun;
- bool const complete = (sf == "default" && tt == "default");
+ bool const complete = (fonts_sans == "default" && fonts_typewriter == "default");
+ bool const nomath = (fonts_math == "default");
// ROMAN FONTS
- os << theLaTeXFonts().getLaTeXFont(from_ascii(rm)).getLaTeXCode(dryrun, ot1, complete, sc, osf);
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_roman)).getLaTeXCode(
+ dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
+ nomath);
// SANS SERIF
- os << theLaTeXFonts().getLaTeXFont(from_ascii(sf)).getLaTeXCode(dryrun, ot1, complete, sc, osf, sfscale);
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_sans)).getLaTeXCode(
+ dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
+ nomath, fonts_sans_scale);
// MONOSPACED/TYPEWRITER
- os << theLaTeXFonts().getLaTeXFont(from_ascii(tt)).getLaTeXCode(dryrun, ot1, complete, sc, osf, ttscale);
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_typewriter)).getLaTeXCode(
+ dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
+ nomath, fonts_typewriter_scale);
+
+ // MATH
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_math)).getLaTeXCode(
+ dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures,
+ nomath);
return os.str();
}
projects / lyx.git / blobdiff