void ParamInfo::add(std::string const & name, ParamType type,
- ParamHandling handling, bool ignore,
+ ParamHandling handling, bool ignoreval,
docstring default_value)
{
- info_.push_back(ParamData(name, type, handling, ignore, default_value));
+ info_.push_back(ParamData(name, type, handling, ignoreval, default_value));
}
}
-ParamInfo::ParamData const &
+ParamInfo::ParamData const &
ParamInfo::operator[](std::string const & name) const
{
const_iterator it = begin();
string InsetCommandParams::getDefaultCmd(InsetCode code)
{
switch (code) {
- case BIBITEM_CODE:
+ case BIBITEM_CODE:
return InsetBibitem::defaultCommand();
case BIBTEX_CODE:
return InsetBibtex::defaultCommand();
bool InsetCommandParams::isCompatibleCommand(InsetCode code, string const & s)
{
switch (code) {
- case BIBITEM_CODE:
+ case BIBITEM_CODE:
return InsetBibitem::isCompatibleCommand(s);
case BIBTEX_CODE:
return InsetBibtex::isCompatibleCommand(s);
void InsetCommandParams::setCmdName(string const & name)
{
if (!isCompatibleCommand(insetCode_, name)) {
- LYXERR0("InsetCommand: Incompatible command name " <<
+ LYXERR0("InsetCommand: Incompatible command name " <<
name << ".");
throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
_("Incompatible command name."));
if (param.ignore()) {
params_[param.name()] = param.defaultValue();
}
-
+
string token;
while (lex.isOK()) {
lex.next();
docstring const & command,
ParamInfo::ParamHandling handling) const
{
- if (handling == ParamInfo::HANDLING_LATEXIFY)
+ docstring result;
+ bool ltrimmed = false;
+ // Trimming can be done on top of any of the other handlings
+ // We check this here since handling might be changed below.
+ if (handling & ParamInfo::HANDLING_LTRIM) {
+ // this is used if no other handling is done
+ result = command;
+ ltrimmed = true;
+ }
+ if (handling & ParamInfo::HANDLING_LATEXIFY
+ || handling & ParamInfo::HANDLING_INDEX_ESCAPE)
if ((*this)["literal"] == "true")
handling = ParamInfo::HANDLING_NONE;
- docstring result;
- switch (handling) {
- case ParamInfo::HANDLING_LATEXIFY: {
+
+ // LATEXIFY, ESCAPE and NONE are mutually exclusive
+ if (handling & ParamInfo::HANDLING_LATEXIFY) {
// First handle backslash
result = subst(command, from_ascii("\\"), from_ascii("\\textbackslash{}"));
// Then get LaTeX macros
}
// Now escape special commands
static docstring const backslash = from_ascii("\\");
- static char_type const chars_escape[6] = {
- '&', '_', '$', '%', '#', '^'};
+ int const nchars_escape = 8;
+ static char_type const chars_escape[nchars_escape] = {
+ '&', '_', '$', '%', '#', '^', '{', '}'};
if (!result.empty()) {
int previous;
// The characters in chars_name[] need to be changed to a command when
// they are LaTeXified.
- for (int k = 0; k < 6; k++)
+ for (int k = 0; k < nchars_escape; k++)
for (size_t i = 0, pos;
(pos = result.find(chars_escape[k], i)) != string::npos;
i = pos + 2) {
result.replace(pos, 1, backslash + chars_escape[k] + term);
}
}
- break;
}
- case ParamInfo::HANDLING_ESCAPE:
+ else if (handling & ParamInfo::HANDLING_ESCAPE)
result = escape(command);
- break;
- case ParamInfo::HANDLING_NONE:
- result = command;
- break;
- } // switch
+ else if (handling & ParamInfo::HANDLING_NONE) {
+ // we can only output characters covered by the current
+ // encoding!
+ docstring uncodable;
+ for (size_type i = 0 ; i < command.size() ; ++i) {
+ char_type c = command[i];
+ try {
+ if (runparams.encoding->encodable(c))
+ result += c;
+ else if (runparams.dryrun) {
+ result += "<" + _("LyX Warning: ")
+ + _("uncodable character") + " '";
+ result += docstring(1, c);
+ result += "'>";
+ } else
+ uncodable += c;
+ } catch (EncodingException & /* e */) {
+ if (runparams.dryrun) {
+ result += "<" + _("LyX Warning: ")
+ + _("uncodable character") + " '";
+ result += docstring(1, c);
+ result += "'>";
+ } else
+ uncodable += c;
+ }
+ }
+ if (!uncodable.empty() && !runparams.silent) {
+ // issue a warning about omitted characters
+ // FIXME: should be passed to the error dialog
+ frontend::Alert::warning(_("Uncodable characters in inset"),
+ bformat(_("The following characters in one of the insets are\n"
+ "not representable in the current encoding and have been omitted: %1$s.\n"
+ "Unchecking 'Literal' in the respective inset dialog might help."),
+ uncodable));
+ }
+ }
+ // INDEX_ESCAPE is independent of the others
+ if (handling & ParamInfo::HANDLING_INDEX_ESCAPE) {
+ // Now escape special commands
+ static docstring const quote = from_ascii("\"");
+ int const nchars_escape = 4;
+ static char_type const chars_escape[nchars_escape] = { '"', '@', '|', '!' };
- return result;
+ if (!result.empty()) {
+ // The characters in chars_name[] need to be changed to a command when
+ // they are LaTeXified.
+ for (int k = 0; k < nchars_escape; k++)
+ for (size_t i = 0, pos;
+ (pos = result.find(chars_escape[k], i)) != string::npos;
+ i = pos + 2)
+ result.replace(pos, 1, quote + chars_escape[k]);
+ }
+ }
+
+ return ltrimmed ? ltrim(result) : result;
}
noparam = false;
}
break;
- }
+ }
} //end switch
}
if (noparam)
docstring InsetCommandParams::getFirstNonOptParam() const
{
- ParamInfo::const_iterator it =
- find_if(info_.begin(), info_.end(),
+ ParamInfo::const_iterator it =
+ find_if(info_.begin(), info_.end(),
not1(mem_fun_ref(&ParamInfo::ParamData::isOptional)));
LASSERT(it != info_.end(), return docstring());
return (*this)[it->name()];
projects / lyx.git / blobdiff