" \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
"\\ProvideTextCommand{\\~}{LGR}[1]{\\char126#1}\n");
-
+
+static docstring const textcyr_T2A_def = from_ascii(
+ "\\InputIfFileExists{t2aenc.def}{}{%\n"
+ " \\errmessage{File `t2aenc.def' not found: Cyrillic script not supported}}\n");
static docstring const textcyr_def = from_ascii(
"\\DeclareRobustCommand{\\cyrtext}{%\n"
" \\fontencoding{T2A}\\selectfont\\def\\encodingdefault{T2A}}\n"
- "\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n"
- "\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n");
+ "\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n");
static docstring const lyxmathsym_def = from_ascii(
"\\newcommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
bool const ot1 = (params_.font_encoding() == "default"
|| params_.font_encoding() == "OT1");
- bool const complete = (params_.fonts_sans == "default")
- && (params_.fonts_typewriter == "default");
- bool const nomath = (params_.fonts_math == "default");
+ bool const complete = (params_.fontsSans() == "default"
+ && params_.fontsTypewriter() == "default");
+ bool const nomath = (params_.fontsMath() == "default");
return params_.documentClass().provides(name)
|| theLaTeXFonts().getLaTeXFont(
- from_ascii(params_.fonts_roman)).provides(name, ot1,
+ from_ascii(params_.fontsRoman())).provides(name, ot1,
complete,
nomath)
|| theLaTeXFonts().getLaTeXFont(
- from_ascii(params_.fonts_sans)).provides(name, ot1,
+ from_ascii(params_.fontsSans())).provides(name, ot1,
complete,
nomath)
|| theLaTeXFonts().getLaTeXFont(
- from_ascii(params_.fonts_typewriter)).provides(name, ot1,
+ from_ascii(params_.fontsTypewriter())).provides(name, ot1,
complete,
nomath)
|| theLaTeXFonts().getLaTeXFont(
- from_ascii(params_.fonts_math)).provides(name, ot1,
+ from_ascii(params_.fontsMath())).provides(name, ot1,
complete,
nomath);
// TODO: "textbaltic" provided, if the font-encoding is "L7x"
"pdfcomment",
"fixme",
"todonotes",
- "forest"
+ "forest",
+ "varwidth"
};
char const * bibliofeatures[] = {
string const amsPackages = loadAMSPackages();
bool const ot1 = (params_.font_encoding() == "default" || params_.font_encoding() == "OT1");
bool const use_newtxmath =
- theLaTeXFonts().getLaTeXFont(from_ascii(params_.fonts_math)).getUsedPackage(
+ theLaTeXFonts().getLaTeXFont(from_ascii(params_.fontsMath())).getUsedPackage(
ot1, false, false) == "newtxmath";
if (!params_.useNonTeXFonts && !use_newtxmath && !amsPackages.empty())
// ensure LGR font encoding is defined also if fontenc is not loaded by LyX
if (params_.font_encoding() == "default")
macros << textgreek_LGR_def;
- // Avoid a LaTeX error if times fonts are used and the grtimes
- // package is installed but actual fonts are not (bug 6469).
- if (params_.fonts_roman == "times")
- macros << subst(textgreek_def,
- from_ascii("\\greektext #1"),
- from_ascii("%\n \\IfFileExists"
- "{grtm10.tfm}{}{\\fontfamily"
- "{cmr}}\\greektext #1"))
- << '\n';
- else
- macros << textgreek_def << '\n';
+ macros << textgreek_def << '\n';
}
- if (!usePolyglossia() && mustProvide("textcyr"))
+ if (!usePolyglossia() && mustProvide("textcyr")) {
+ // ensure T2A font encoding is set up also if fontenc is not loaded by LyX
+ if (params_.font_encoding() == "default")
+ macros << textcyr_T2A_def;
macros << textcyr_def << '\n';
+ }
// non-standard text accents:
if (mustProvide("textcommaabove") || mustProvide("textcommaaboveright") ||