anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: consider options passed via \PassOptionsToPackage

Browse Source
This commit is contained in:
Juergen Spitzmueller 2018-03-04 16:45:37 +01:00
parent ccb9ae9670
commit 476401a76f
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tex2lyx/Preamble.cpp
View File

@ -418,6 +418,15 @@ void Preamble::add_package(string const & name, vector<string> & options)
if (used_packages.find(name) == used_packages.end())
used_packages[name] = split_options(h_options);
// Insert options passed via PassOptionsToPackage
for (auto const & p : extra_package_options_) {
if (p.first == name) {
vector<string> eo = getVectorFromString(p.second);
for (auto const & eoi : eo)
options.push_back(eoi);
}
}
vector<string> & v = used_packages[name];
v.insert(v.end(), options.begin(), options.end());
if (name == "jurabib") {
@ -1033,6 +1042,8 @@ void Preamble::handle_package(Parser &p, string const & name,
options.erase(it);
}
}
if (!options.empty())
h_biblio_options = join(options, ",");
}
else if (name == "jurabib") {
@ -1407,6 +1418,12 @@ void Preamble::parse(Parser & p, string const & forceclass,
h_preamble << t.asInput();
}
else if (t.cs() == "PassOptionsToPackage") {
string const poptions = p.getArg('{', '}');
string const package = p.verbatim_item();
extra_package_options_.insert(make_pair(package, poptions));
}
else if (t.cs() == "pagestyle")
h_paperpagestyle = p.verbatim_item();

2
src/tex2lyx/Preamble.h
View File

@ -241,6 +241,8 @@ private:
AuthorList authors_;
/// special table column types
std::map<char, int> special_columns_;
///
std::map<std::string, std::string> extra_package_options_;
};