anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7044: Better error messages when modules are unavailable. Patch

Browse Source 
from Julien Rioux, modified by me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37207 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-01-13 21:19:14 +00:00
parent 1b263187cd
commit 28e08b23e2
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ModuleList.cpp
View File

@ -45,6 +45,17 @@ LyXModule::LyXModule(string const & n, string const & i,
} }
vector<string> LyXModule::prerequisites() const {
#ifdef TEX2LYX
return vector<string>();
#else
if (!checked_)
isAvailable();
return prerequisites_;
#endif
}
bool LyXModule::isAvailable() const { bool LyXModule::isAvailable() const {
#ifdef TEX2LYX #ifdef TEX2LYX
return true; return true;
@ -54,16 +65,16 @@ bool LyXModule::isAvailable() const {
if (checked_) if (checked_)
return available_; return available_;
checked_ = true; checked_ = true;
available_ = true;
//check whether all of the required packages are available //check whether all of the required packages are available
vector<string>::const_iterator it = package_list_.begin(); vector<string>::const_iterator it = package_list_.begin();
vector<string>::const_iterator end = package_list_.end(); vector<string>::const_iterator end = package_list_.end();
for (; it != end; ++it) { for (; it != end; ++it) {
if (!LaTeXFeatures::isAvailable(*it)) { if (!LaTeXFeatures::isAvailable(*it)) {
available_ = false; available_ = false;
return available_; prerequisites_.push_back(*it);
} }
} }
available_ = true;
return available_; return available_;
#endif #endif
} }

4
src/ModuleList.h
View File

@ -58,6 +58,8 @@ public:
std::string const & catgy); std::string const & catgy);
/// whether the required packages are available /// whether the required packages are available
bool isAvailable() const; bool isAvailable() const;
/// the missing prerequisites, if any
std::vector<std::string> prerequisites() const;
/// ///
std::string const & getName() const { return name_; } std::string const & getName() const { return name_; }
/// ///
@ -108,6 +110,8 @@ private:
mutable bool checked_; mutable bool checked_;
/// ///
mutable bool available_; mutable bool available_;
///
mutable std::vector<std::string> prerequisites_;
}; };
typedef std::vector<LyXModule> LyXModuleList; typedef std::vector<LyXModule> LyXModuleList;

12
src/TextClass.cpp
View File

@ -1308,11 +1308,15 @@ DocumentClass & DocumentClassBundle::makeDocumentClass(
continue; continue;
} }
if (!lm->isAvailable()) { if (!lm->isAvailable()) {
docstring const prereqs = from_utf8(getStringFromVector(lm->prerequisites(), "\n\t"));
docstring const msg = docstring const msg =
bformat(_("The module %1$s requires a package that is\n" bformat(_("The module %1$s requires a package that is not\n"
"not available in your LaTeX installation, or a converter\n" "available in your LaTeX installation, or a converter that\n"
"you have not installed. LaTeX output may not be possible.\n"), "you have not installed. LaTeX output may not be possible.\n"
from_utf8(modName)); "Missing prerequisites:\n"
"\t%2$s\n"
"See section 3.1.2.3 of the User's Guide for more information."),
from_utf8(modName), prereqs);
frontend::Alert::warning(_("Package not available"), msg); frontend::Alert::warning(_("Package not available"), msg);
} }
FileName layout_file = libFileSearch("layouts", lm->getFilename()); FileName layout_file = libFileSearch("layouts", lm->getFilename());