anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

?xxx show all parameters containing xxx in InsetListingsParams, remove all_param_names_ from ParValidator

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18687 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-06-05 22:08:43 +00:00
parent 221b6a8452
commit 276f6fcde5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/insets/InsetListingsParams.cpp
View File

@ -41,6 +41,7 @@ using support::isStrInt;
using support::prefixIs; using support::prefixIs;
using support::suffixIs; using support::suffixIs;
using support::getVectorFromString; using support::getVectorFromString;
using lyx::support::contains;
namespace { namespace {
@ -283,8 +284,6 @@ private:
/// key is the name of the parameter /// key is the name of the parameter
typedef map<string, ListingsParam> ListingsParams; typedef map<string, ListingsParam> ListingsParams;
ListingsParams all_params_; ListingsParams all_params_;
///
string all_param_names_;
}; };
@ -579,14 +578,6 @@ ParValidator::ParValidator()
ListingsParam("", false, ALL, "", empty_hint); ListingsParam("", false, ALL, "", empty_hint);
all_params_["podcomment"] = all_params_["podcomment"] =
ListingsParam("", false, ALL, "", empty_hint); ListingsParam("", false, ALL, "", empty_hint);
ListingsParams::const_iterator it = all_params_.begin();
ListingsParams::const_iterator end = all_params_.end();
for (; it != end; ++it) {
if (!all_param_names_.empty())
all_param_names_ += ", ";
all_param_names_ += it->first;
}
} }
@ -606,10 +597,27 @@ ListingsParam const & ParValidator::param(string const & name) const
if (name.empty()) if (name.empty())
throw invalidParam(_("Invalid (empty) listing parameter name.")); throw invalidParam(_("Invalid (empty) listing parameter name."));
if (name == "?") if (name[0] == '?') {
throw invalidParam(bformat( string suffix = trim(string(name, 1));
_("Available listing parameters are %1$s"), from_ascii(all_param_names_))); string param_names;
ListingsParams::const_iterator it = all_params_.begin();
ListingsParams::const_iterator end = all_params_.end();
for (; it != end; ++it) {
if (suffix.empty() || contains(it->first, suffix)) {
if (!param_names.empty())
param_names += ", ";
param_names += it->first;
}
}
if (suffix.empty())
throw invalidParam(bformat(
_("Available listing parameters are %1$s"), from_ascii(param_names)));
else
throw invalidParam(bformat(
_("Available listings parameters containing string \"%1$s\" are %2$s"),
from_utf8(suffix), from_utf8(param_names)));
}
// locate name in parameter table // locate name in parameter table
ListingsParams::const_iterator it = all_params_.find(name); ListingsParams::const_iterator it = all_params_.find(name);
if (it != all_params_.end()) if (it != all_params_.end())