using support::bformat;
using support::trim;
+using support::rtrim;
using support::subst;
using support::isStrInt;
using support::prefixIs;
using support::suffixIs;
using support::getVectorFromString;
+using lyx::support::contains;
namespace {
if (!hint_.empty())
return hint_;
else
- return _("Please specify a latex length expression.");
+ return _("Please specify a LaTeX length expression.");
}
if (!isValidLength(par2))
- return _("Invalid latex length expression.");
+ return _("Invalid LaTeX length expression.");
if (unclosed)
return _("Unbalanced braces!");
return docstring();
/// key is the name of the parameter
typedef map<string, ListingsParam> ListingsParams;
ListingsParams all_params_;
- ///
- string all_param_names_;
};
ListingsParam("", false, INTEGER, "", empty_hint);
all_params_["lastline"] =
ListingsParam("", false, INTEGER, "", empty_hint);
+ all_params_["linerange"] =
+ ListingsParam("", false, ALL, "", empty_hint);
all_params_["showlines"] =
ListingsParam("", false, TRUEFALSE, "", empty_hint);
all_params_["emptylines"] =
// this option is not handled in the parameter box
all_params_["caption"] =
ListingsParam("", false, ALL, "", _(
- "This parameter should not be entered here. Please use caption "
- "editbox (Include dialog) or insert->caption (listings inset)"));
+ "This parameter should not be entered here. Please use the caption "
+ "edit box (when using the child document dialog) or "
+ "menu Insert->Caption (when defining a listing inset)"));
// this option is not handled in the parameter box
all_params_["label"] =
ListingsParam("", false, ALL, "",_(
- "This parameter should not be entered here. Please use label "
- "editbox (Include dialog) or insert->caption (listings inset)"));
+ "This parameter should not be entered here. Please use the label "
+ "edit box (when using the child document dialog) or "
+ "menu Insert->Label (when defining a listing inset)"));
all_params_["nolol"] =
ListingsParam("", false, TRUEFALSE, "", empty_hint);
all_params_["captionpos"] =
ListingsParam("", false, ALL, "", empty_hint);
all_params_["podcomment"] =
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;
- }
}
ListingsParam const & ParValidator::param(string const & name) const
{
if (name.empty())
- throw invalidParam(_("Invalid (empty) listings param name."));
-
- if (name == "?")
- throw invalidParam(bformat(
- _("Available listings parameters are %1$s"), from_ascii(all_param_names_)));
-
+ throw invalidParam(_("Invalid (empty) listing parameter name."));
+
+ if (name[0] == '?') {
+ string suffix = trim(string(name, 1));
+ 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
ListingsParams::const_iterator it = all_params_.find(name);
if (it != all_params_.end())
}
}
if (matching_names.empty())
- throw invalidParam(bformat(_("Unknown listings param name: %1$s"),
+ throw invalidParam(bformat(_("Unknown listing parameter name: %1$s"),
from_utf8(name)));
else
throw invalidParam(bformat(_("Parameters starting with '%1$s': %2$s"),
it != params_.end(); ++it) {
if (!par.empty())
par += sep;
+ // key=value,key=value1 is stored in params_ as key=value,key_=value1.
if (it->second.empty())
- par += it->first;
+ par += rtrim(it->first, "_");
else
- par += it->first + '=' + it->second;
+ par += rtrim(it->first, "_") + '=' + it->second;
}
return par;
}
// exception may be thown.
ListingsParam const & lparam = par_validator.validate(key, value);
// duplicate parameters!
+ string keyname = key;
if (params_.find(key) != params_.end())
- throw invalidParam(bformat(_("Parameter %1$s has already been defined"),
- from_utf8(key)));
+ // key=value,key=value1 is allowed in listings
+ // use key_, key__, key___ etc to avoid name conflict
+ while (params_.find(keyname += '_') != params_.end());
// check onoff flag
// onoff parameter with value false
if (lparam.onoff_ && (value == "false" || value == "{false}"))
- params_[key] = string();
+ params_[keyname] = string();
// if the parameter is surrounded with {}, good
else if (prefixIs(value, "{") && suffixIs(value, "}"))
- params_[key] = value;
+ params_[keyname] = value;
// otherwise, check if {} is needed. Add {} to all values with
// non-ascii/number characters, just to be safe
else {
break;
}
if (has_special_char)
- params_[key] = "{" + value + "}";
+ params_[keyname] = "{" + value + "}";
else
- params_[key] = value;
+ params_[keyname] = value;
}
}
{
// is this parameter defined?
map<string, string>::const_iterator it = params_.find(param);
- return (it == params_.end()) ? string() : it->second;
+ string par = (it == params_.end()) ? string() : it->second;
+ if (prefixIs(par, "{") && suffixIs(par, "}"))
+ return par.substr(1, par.size() - 2);
+ else
+ return par;
}
projects / lyx.git / blobdiff