if (params_.useNonTeXFonts)
return params_.documentClass().provides(name);
- bool const ot1 = (params_.font_encoding() == "default"
- || params_.font_encoding() == "OT1");
+ bool const ot1 = (params_.main_font_encoding() == "default"
+ || params_.main_font_encoding() == "OT1");
bool const complete = (params_.fontsSans() == "default"
&& params_.fontsTypewriter() == "default");
bool const nomath = (params_.fontsMath() == "default");
// if fontspec or newtxmath is used, AMS packages have to be loaded
// before fontspec (in BufferParams)
string const amsPackages = loadAMSPackages();
- bool const ot1 = (params_.font_encoding() == "default" || params_.font_encoding() == "OT1");
+ bool const ot1 = (params_.main_font_encoding() == "default"
+ || params_.main_font_encoding() == "OT1");
bool const use_newtxmath =
theLaTeXFonts().getLaTeXFont(from_ascii(params_.fontsMath())).getUsedPackage(
ot1, false, false) == "newtxmath";
if (!usePolyglossia() && mustProvide("textgreek")) {
// ensure LGR font encoding is defined also if fontenc is not loaded by LyX
- if (params_.font_encoding() == "default")
+ if (params_.main_font_encoding() == "default")
macros << textgreek_LGR_def;
macros << textgreek_def << '\n';
}
if (!usePolyglossia() && mustProvide("textcyr")) {
// ensure T2A font encoding is set up also if fontenc is not loaded by LyX
- if (params_.font_encoding() == "default")
+ if (params_.main_font_encoding() == "default")
macros << textcyr_T2A_def;
macros << textcyr_def << '\n';
}
list<docstring>::const_iterator cit = usedLayouts_.begin();
list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit)
- tcpreamble << tclass[*cit].preamble();
+ // For InPreamble layouts, we output the preamble stuff earlier
+ // (before the layouts). See Paragraph::Private::validate.
+ if (!tclass[*cit].inpreamble)
+ tcpreamble << tclass[*cit].preamble();
cit = usedInsetLayouts_.begin();
end = usedInsetLayouts_.end();