char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
-const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "cochineal", "crimson", "fourier",
+const char * const known_roman_font_packages[] = { "ae", "beraserif", "bookman",
+"ccfonts", "chancery", "charter", "cmr", "cochineal", "crimson", "DejaVuSerif", "DejaVuSerifCondensed", "fourier",
"garamondx", "libertine", "libertineRoman", "libertine-type1", "lmodern", "mathdesign", "mathpazo",
-"mathptmx", "MinionPro", "newcent", "NotoSerif-TLF", "PTSerif-TLF", "tgbonum", "tgchorus",
+"mathptmx", "MinionPro", "newcent", "noto", "noto-serif", "PTSerif", "tgbonum", "tgchorus",
"tgpagella", "tgschola", "tgtermes", "utopia", "xcharter", 0 };
-const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum",
-"biolinum-type1", "cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc",
-"kurier", "kurierc", "kurierl", "kurierlc", "lmss", "NotoSans-TLF", "PTSans-TLF",
+const char * const known_sans_font_packages[] = { "avant", "berasans", "biolinum",
+"biolinum-type1", "cmbr", "cmss", "DejaVuSans", "DejaVuSansCondensed", "helvet", "iwona", "iwonac", "iwonal", "iwonalc",
+"kurier", "kurierc", "kurierl", "kurierlc", "lmss", "noto", "noto-sans", "PTSans",
"tgadventor", "tgheros", "uop", 0 };
-const char * const known_typewriter_fonts[] = { "beramono", "cmtl", "cmtt",
-"courier", "lmtt", "luximono", "fourier", "libertineMono", "libertineMono-type1", "lmodern",
-"mathpazo", "mathptmx", "newcent", "NotoMono-TLF", "PTMono-TLF", "tgcursor", "txtt", 0 };
+const char * const known_typewriter_font_packages[] = { "beramono", "cmtl", "cmtt",
+"courier", "DejaVuSansMono", "lmtt", "luximono", "fourier", "libertineMono", "libertineMono-type1", "lmodern",
+"mathpazo", "mathptmx", "newcent", "noto", "noto-mono", "PTMono", "tgcursor", "txtt", 0 };
-const char * const known_math_fonts[] = { "eulervm", "newtxmath", 0};
+const char * const known_math_font_packages[] = { "eulervm", "newtxmath", 0};
const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper",
"a1paper", "b1paper", "c1paper", "a2paper", "b2paper", "c2paper", "a3paper",
"amstext", "amsthm", "array", "babel", "booktabs", "calc", "CJK", "color",
"float", "fontspec", "framed", "graphicx", "hhline", "ifthen", "longtable",
"makeidx", "minted", "multirow", "nomencl", "pdfpages", "prettyref", "refstyle",
-"rotating", "rotfloat", "splitidx", "setspace", "subscript", "textcomp", "tipa",
-"tipx", "tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xcolor",
+"rotating", "rotfloat", "splitidx", "setspace", "subscript", "tabularx","textcomp", "tipa",
+"tipx", "tone", "ulem", "url", "varioref", "verbatim", "wrapfig", "xcolor", "xltabular",
"xunicode", 0};
// codes used to remove packages that are loaded automatically by LyX.
}
+bool Preamble::isPackageAutoLoaded(string const & package) const
+{
+ return auto_packages.find(package) != auto_packages.end();
+}
+
+
vector<string> Preamble::getPackageOptions(string const & package) const
{
map<string, vector<string> >::const_iterator it = used_packages.find(package);
void Preamble::addModule(string const & module)
{
+ for (auto const & m : used_modules) {
+ if (m == module)
+ return;
+ }
used_modules.push_back(module);
}
h_html_math_output = "0";
h_index[0] = "Index";
h_index_command = "default";
- h_inputencoding = "auto";
+ h_inputencoding = "auto-legacy";
h_justification = "true";
h_language = "english";
h_language_package = "none";
xetex = true;
h_use_non_tex_fonts = true;
registerAutomaticallyLoadedPackage("fontspec");
- if (h_inputencoding == "auto")
+ if (h_inputencoding == "auto-legacy")
p.setEncoding("UTF-8");
}
// roman fonts
- if (is_known(name, known_roman_fonts))
+ if (is_known(name, known_roman_font_packages))
h_font_roman[0] = name;
if (name == "fourier") {
if (opts == "osf")
h_font_osf = "true";
}
-
+
+ if (name == "plex-serif") {
+ if (opts.empty())
+ h_font_roman[0] = "IBMPlexSerif";
+ else if (opts.find("thin") != string::npos)
+ h_font_roman[0] = "IBMPlexSerifThin";
+ else if (opts.find("extralight") != string::npos)
+ h_font_roman[0] = "IBMPlexSerifExtraLight";
+ else if (opts.find("light") != string::npos)
+ h_font_roman[0] = "IBMPlexSerifLight";
+ else if (opts.find("semibold") != string::npos)
+ h_font_roman[0] = "IBMPlexSerifSemibold";
+ }
+ if (name == "noto-serif") {
+ h_font_roman[0] = "NotoSerifRegular";
+ if (!opts.empty()) {
+ if (opts.find("thin") != string::npos)
+ h_font_roman[0] = "NotoSerifThin";
+ else if (opts.find("medium") != string::npos)
+ h_font_roman[0] = "NotoSerifMedium";
+ else if (opts.find("extralight") != string::npos)
+ h_font_roman[0] = "NotoSerifExtralight";
+ else if (opts.find("light") != string::npos)
+ h_font_roman[0] = "NotoSerifLight";
+ }
+ }
+
// sansserif fonts
- if (is_known(name, known_sans_fonts)) {
+ if (is_known(name, known_sans_font_packages)) {
h_font_sans[0] = name;
if (options.size() >= 1) {
if (scale_as_percentage(opts, h_font_sf_scale[0]))
}
}
+ if (name == "plex-sans") {
+ if (opts.find("condensed") != string::npos)
+ h_font_sans[0] = "IBMPlexSansCondensed";
+ else if (opts.find("thin") != string::npos)
+ h_font_sans[0] = "IBMPlexSansThin";
+ else if (opts.find("extralight") != string::npos)
+ h_font_sans[0] = "IBMPlexSansExtraLight";
+ else if (opts.find("light") != string::npos)
+ h_font_sans[0] = "IBMPlexSansLight";
+ else if (opts.find("semibold") != string::npos)
+ h_font_sans[0] = "IBMPlexSansSemibold";
+ else
+ h_font_sans[0] = "IBMPlexSans";
+ // check if the option contains scaling, if yes, extract it
+ string::size_type pos = opts.find("scale");
+ if (pos != string::npos) {
+ string scale;
+ string::size_type i = opts.find(',', pos);
+ if (i == string::npos)
+ scale_as_percentage(opts.substr(pos + 1), scale);
+ else
+ scale_as_percentage(opts.substr(pos, i - pos), scale);
+ if (!scale.empty())
+ h_font_sf_scale[1] = scale;
+ }
+ }
+ if (name == "noto-sans") {
+ h_font_sans[0] = "NotoSansRegular";
+ if (!opts.empty()) {
+ if (opts.find("medium") != string::npos)
+ h_font_sans[0] = "NotoSansMedium";
+ else if (opts.find("thin") != string::npos)
+ h_font_sans[0] = "NotoSansThin";
+ else if (opts.find("extralight") != string::npos)
+ h_font_sans[0] = "NotoSansExtralight";
+ else if (opts.find("light") != string::npos)
+ h_font_sans[0] = "NotoSansLight";
+ }
+
+ }
+
// typewriter fonts
- if (is_known(name, known_typewriter_fonts)) {
+ if (is_known(name, known_typewriter_font_packages)) {
// fourier can be set as roman font _only_
// fourier as typewriter is handled in handling of \ttdefault
if (name != "fourier") {
}
}
+ if (name == "plex-mono") {
+ if (opts.find("thin") != string::npos)
+ h_font_typewriter[0] = "IBMPlexMonoThin";
+ else if (opts.find("extralight") != string::npos)
+ h_font_typewriter[0] = "IBMPlexMonoExtraLight";
+ else if (opts.find("light") != string::npos)
+ h_font_typewriter[0] = "IBMPlexMonoLight";
+ else if (opts.find("semibold") != string::npos)
+ h_font_typewriter[0] = "IBMPlexMonoSemibold";
+ else
+ h_font_typewriter[0] = "IBMPlexMono";
+ // check if the option contains scaling, if yes, extract it
+ string::size_type pos = opts.find("scale");
+ if (pos != string::npos) {
+ string scale;
+ string::size_type i = opts.find(',', pos);
+ if (i == string::npos)
+ scale_as_percentage(opts.substr(pos + 1), scale);
+ else
+ scale_as_percentage(opts.substr(pos, i - pos), scale);
+ if (!scale.empty())
+ h_font_tt_scale[1] = scale;
+ }
+ }
+
+ if (name == "noto-mono") {
+ h_font_typewriter[0] = "NotoMonoRegular";
+ }
+
// font uses old-style figure
if (name == "eco")
h_font_osf = "true";
// math fonts
- if (is_known(name, known_math_fonts))
+ if (is_known(name, known_math_font_packages))
h_font_math[0] = name;
if (name == "newtxmath") {
// after the detection and handling of special cases, we can remove the
// fonts, otherwise they would appear in the preamble, see bug #7856
- if (is_known(name, known_roman_fonts) || is_known(name, known_sans_fonts)
- || is_known(name, known_typewriter_fonts) || is_known(name, known_math_fonts))
+ if (is_known(name, known_roman_font_packages) || is_known(name, known_sans_font_packages)
+ || is_known(name, known_typewriter_font_packages) || is_known(name, known_math_font_packages))
;
//"On". See the enum Package in BufferParams.h if you thought that "2" should have been "42"
else if (name == "amsmath" || name == "amssymb" || name == "cancel" ||
name == "esint" || name == "mhchem" || name == "mathdots" ||
name == "mathtools" || name == "stackrel" ||
- name == "stmaryrd" || name == "undertilde")
+ name == "stmaryrd" || name == "undertilde") {
h_use_packages[name] = "2";
+ registerAutomaticallyLoadedPackage(name);
+ }
else if (name == "babel") {
h_language_package = "default";
// perhaps in future others.
// Therefore keep the babel call as it is as the user might have
// reasons for it.
- h_preamble << "\\usepackage[" << opts << "]{babel}\n";
+ string const babelcall = "\\usepackage[" + opts + "]{babel}\n";
+ if (!contains(h_preamble.str(), babelcall))
+ h_preamble << babelcall;
}
delete_opt(options, known_languages);
} else {
- h_preamble << "\\usepackage{babel}\n";
+ if (!contains(h_preamble.str(), "\\usepackage{babel}\n"))
+ h_preamble << "\\usepackage{babel}\n";
explicit_babel = true;
}
}
h_use_non_tex_fonts = true;
xetex = true;
registerAutomaticallyLoadedPackage("xunicode");
- if (h_inputencoding == "auto")
+ if (h_inputencoding == "auto-legacy")
p.setEncoding("UTF-8");
}
else if (name == "CJK") {
- // set the encoding to "auto" because it might be set to "default" by the babel handling
+ // set the encoding to "auto-legacy" because it might be set to "auto-legacy-plain" by the babel handling
// and this would not be correct for CJK
- if (h_inputencoding == "default")
- h_inputencoding = "auto";
+ if (h_inputencoding == "auto-legacy-plain")
+ h_inputencoding = "auto-legacy";
registerAutomaticallyLoadedPackage("CJK");
}
else if (name == "inputenc" || name == "luainputenc") {
// h_inputencoding is only set when there is not more than one
// inputenc option because otherwise h_inputencoding must be
- // set to "auto" (the default encoding of the document language)
+ // set to "auto-legacy" (the default encodings of the document's languages)
// Therefore check that exactly one option is passed to inputenc.
// It is also only set when there is not more than one babel
// language option.
cerr << "Ignoring unkown refesection value '"
<< opt << "'.";
}
+ opt = process_keyval_opt(options, "bibencoding");
+ if (!opt.empty())
+ bibencoding = opt;
if (!options.empty()) {
h_biblio_options = join(options, ",");
options.clear();
return;
while (is_full_document && p.good()) {
- if (detectEncoding && h_inputencoding != "auto" &&
- h_inputencoding != "default")
+ if (detectEncoding && h_inputencoding != "auto-legacy" &&
+ h_inputencoding != "auto-legacy-plain")
return;
Token const & t = p.get_token();
"% This document must be compiled with XeLaTeX ";
if (comment.size() > magicXeLaTeX.size()
&& comment.substr(0, magicXeLaTeX.size()) == magicXeLaTeX
- && h_inputencoding == "auto") {
+ && h_inputencoding == "auto-legacy") {
if (!detectEncoding)
cerr << "XeLaTeX comment found, switching to UTF8\n";
h_inputencoding = "utf8";
}
if (t.cs() == "addbibresource") {
- biblatex_bibliographies.push_back(removeExtension(p.getArg('{', '}')));
+ string const options = p.getArg('[', ']');
+ string const arg = removeExtension(p.getArg('{', '}'));
+ if (!options.empty()) {
+ // check if the option contains a bibencoding, if yes, extract it
+ string::size_type pos = options.find("bibencoding=");
+ string encoding;
+ if (pos != string::npos) {
+ string::size_type i = options.find(',', pos);
+ if (i == string::npos)
+ encoding = options.substr(pos + 1);
+ else
+ encoding = options.substr(pos, i - pos);
+ pos = encoding.find('=');
+ if (pos == string::npos)
+ encoding.clear();
+ else
+ encoding = encoding.substr(pos + 1);
+ }
+ if (!encoding.empty())
+ biblatex_encodings.push_back(normalize_filename(arg) + ' ' + encoding);
+ }
+ biblatex_bibliographies.push_back(arg);
continue;
}
bool const was_in_lyx_preamble = in_lyx_preamble;
// font settings
if (name == "\\rmdefault")
- if (is_known(body, known_roman_fonts)) {
+ if (is_known(body, known_roman_font_packages)) {
h_font_roman[0] = body;
p.skip_spaces();
in_lyx_preamble = true;
}
if (name == "\\sfdefault")
- if (is_known(body, known_sans_fonts)) {
+ if (is_known(body, known_sans_font_packages)) {
h_font_sans[0] = body;
p.skip_spaces();
in_lyx_preamble = true;
}
if (name == "\\ttdefault")
- if (is_known(body, known_typewriter_fonts)) {
+ if (is_known(body, known_typewriter_font_packages)) {
h_font_typewriter[0] = body;
p.skip_spaces();
in_lyx_preamble = true;
ss << '*';
ss << '{' << name << '}' << opt1 << opt2
<< '{' << body << "}";
- h_preamble << ss.str();
+ if (prefixIs(t.cs(), "renew") || !contains(h_preamble.str(), ss.str()))
+ h_preamble << ss.str();
/*
ostream & out = in_preamble ? h_preamble : os;
out << "\\" << t.cs() << "{" << name << "}"
{
TeX2LyXDocClass dummy;
parse(p, forceclass, true, dummy);
- if (h_inputencoding != "auto" && h_inputencoding != "default")
+ if (h_inputencoding != "auto-legacy" && h_inputencoding != "auto-legacy-plain")
return h_inputencoding;
return "";
}
projects / lyx.git / blobdiff