#include "InsetRef.h"
#include "InsetTOC.h"
+#include "Encoding.h"
#include "Lexer.h"
+#include "OutputParams.h"
+
+#include "frontends/alert.h"
#include "support/debug.h"
#include "support/docstream.h"
case BIBTEX_CODE:
return InsetBibtex::findInfo(cmdName);
case CITE_CODE:
- return InsetCitation::findInfo(cmdName);
+ return InsetCitation::findInfo(cmdName);
case FLOAT_LIST_CODE:
return InsetFloatList::findInfo(cmdName);
case HYPERLINK_CODE:
case INDEX_PRINT_CODE:
return InsetPrintIndex::findInfo(cmdName);
case LABEL_CODE:
- return InsetLabel::findInfo(cmdName);
+ return InsetLabel::findInfo(cmdName);
case NOMENCL_CODE:
return InsetNomencl::findInfo(cmdName);
case NOMENCL_PRINT_CODE:
//
/////////////////////////////////////////////////////////////////////
-ParamInfo::ParamData::ParamData(std::string const & s, ParamType t)
- : name_(s), type_(t)
+ParamInfo::ParamData::ParamData(std::string const & s, ParamType t,
+ ParamHandling h)
+ : name_(s), type_(t), handling_(h)
{}
bool ParamInfo::ParamData::operator==(ParamInfo::ParamData const & rhs) const
{
- return name() == rhs.name() && type() == rhs.type();
+ return name() == rhs.name() && type() == rhs.type()
+ && handling() == rhs.handling();
}
}
-void ParamInfo::add(std::string const & name, ParamType type)
+void ParamInfo::add(std::string const & name, ParamType type,
+ ParamHandling handling)
{
- info_.push_back(ParamData(name, type));
+ info_.push_back(ParamData(name, type, handling));
}
void InsetCommandParams::setCmdName(string const & name)
{
- if (!isCompatibleCommand(insetCode_, cmdName_)) {
+ if (!isCompatibleCommand(insetCode_, name)) {
LYXERR0("InsetCommand: Incompatible command name " <<
name << ".");
throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
lex.printError("Missing \\end_inset at this point. "
"Read: `$$Token'");
throw ExceptionMessage(WarningException,
- _("Missing \\end_inset at this point."),
- from_utf8(token));
+ _("InsetCommandParams Error: "),
+ _("Missing \\end_inset at this point: ") + from_utf8(token));
}
}
}
-docstring InsetCommandParams::getCommand() const
+
+docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
+ docstring const & command,
+ ParamInfo::ParamHandling handling) const
+{
+ docstring result;
+ if (handling == ParamInfo::HANDLING_LATEXIFY) {
+ docstring uncodable;
+ for (size_t n = 0; n < command.size(); ++n) {
+ try {
+ result += runparams.encoding->latexChar(command[n]);
+ } 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()) {
+ // 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));
+ }
+ } else if (handling == ParamInfo::HANDLING_ESCAPE)
+ result = escape(command);
+ else
+ result = command;
+
+ return result;
+}
+
+
+docstring InsetCommandParams::getCommand(OutputParams const & runparams) const
{
docstring s = '\\' + from_ascii(cmdName_);
bool noparam = true;
break;
case ParamInfo::LATEX_REQUIRED: {
- docstring const & data = (*this)[name];
+ docstring const & data =
+ prepareCommand(runparams, (*this)[name], it->handling());
s += '{' + data + '}';
noparam = false;
break;
}
case ParamInfo::LATEX_OPTIONAL: {
- docstring const & data = (*this)[name];
+ docstring const & data =
+ prepareCommand(runparams, (*this)[name], it->handling());
if (!data.empty()) {
s += '[' + data + ']';
noparam = false;