namespace lyx {
/// Get information for \p code and command \p cmdName.
-/// Returns 0 if the combination is not known. [FIXME: 0?]
/// Don't call this without first making sure the command name is
/// acceptable to the inset.
static ParamInfo const & findInfo(InsetCode code, string const & cmdName)
case TOC_CODE:
return InsetTOC::findInfo(cmdName);
default:
- LASSERT(false, /**/);
+ LATTEST(false);
+ // fall through in release mode
}
static const ParamInfo pi;
- return pi; // to silence the warning
+ return pi;
}
ParamInfo::ParamData const &
ParamInfo::operator[](std::string const & name) const
{
- LASSERT(hasParam(name), /**/);
const_iterator it = begin();
const_iterator last = end();
for (; it != last; ++it) {
if (it->name() == name)
return *it;
}
- return *it; // silence warning
+ LATTEST(false);
+ // we will try to continue in release mode
+ static const ParamData pd("asdfghjkl", LYX_INTERNAL);
+ return pd;
}
case TOC_CODE:
return InsetTOC::defaultCommand();
default:
- LASSERT(false, /**/);
+ LATTEST(false);
+ // fall through in release mode
}
- return string(); // silence the warning
+ return string();
}
return InsetRef::isCompatibleCommand(s);
case TOC_CODE:
return InsetTOC::isCompatibleCommand(s);
- default:
- LASSERT(false, /**/);
+ default:
+ LATTEST(false);
+ // fall through in release mode
}
- return false; // silence the warning
+ return false;
}
bool InsetCommandParams::writeEmptyOptional(ParamInfo::const_iterator ci) const
{
- if (!ci->isOptional()) {
- LASSERT(false, /**/);
- }
+ LASSERT(ci->isOptional(), return false);
+
++ci; // we want to start with the next one
ParamInfo::const_iterator end = info_.end();
for (; ci != end; ++ci) {
ParamInfo::ParamHandling handling) const
{
docstring result;
- if (handling == ParamInfo::HANDLING_LATEXIFY) {
- docstring uncodable;
- for (size_t n = 0; n < command.size(); ++n) {
- try {
- char_type const c = command[n];
- docstring const latex = runparams.encoding->latexChar(c);
- result += latex;
- if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
- // Prevent eating of a following
- // space or command corruption by
- // following characters
- result += "{}";
- }
- } catch (EncodingException & /* e */) {
- LYXERR0("Uncodable character in command inset!");
- if (runparams.dryrun) {
- result += "<" + _("LyX Warning: ")
- + _("uncodable character") + " '";
- result += docstring(1, command[n]);
- result += "'>";
- } else
- uncodable += command[n];
- }
- }
- if (!uncodable.empty()) {
+ switch (handling) {
+ case ParamInfo::HANDLING_LATEXIFY: {
+ pair<docstring, docstring> command_latexed =
+ runparams.encoding->latexString(command, runparams.dryrun);
+ result = command_latexed.first;
+ if (!command_latexed.second.empty()) {
// issue a warning about omitted characters
// FIXME: should be passed to the error dialog
frontend::Alert::warning(_("Uncodable characters"),
bformat(_("The following characters that are used in the inset %1$s are not\n"
"representable in the current encoding and therefore have been omitted:\n%2$s."),
- from_utf8(insetType()), uncodable));
+ from_utf8(insetType()), command_latexed.second));
}
- } else if (handling == ParamInfo::HANDLING_ESCAPE)
+ break;
+ }
+ case ParamInfo::HANDLING_ESCAPE:
result = escape(command);
- else
+ break;
+ case ParamInfo::HANDLING_NONE:
result = command;
+ break;
+ } // switch
return result;
}
ParamInfo::const_iterator it =
find_if(info_.begin(), info_.end(),
not1(mem_fun_ref(&ParamInfo::ParamData::isOptional)));
- if (it == info_.end()) {
- LASSERT(false, return docstring());
- }
+ LASSERT(it != info_.end(), return docstring());
return (*this)[it->name()];
}
docstring const & InsetCommandParams::operator[](string const & name) const
{
- static const docstring dummy; //so we don't return a ref to temporary
+ static const docstring dummy;
LASSERT(info_.hasParam(name), return dummy);
ParamMap::const_iterator data = params_.find(name);
if (data == params_.end() || data->second.empty())
docstring & InsetCommandParams::operator[](string const & name)
{
- LASSERT(info_.hasParam(name), /**/);
+ LATTEST(info_.hasParam(name));
+ // this will add the name in release mode
return params_[name];
}