#include "Buffer.h"
#include "DispatchResult.h"
#include "Font.h"
+#include "Encoding.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetIterator.h"
#include "LaTeXFeatures.h"
#include "Length.h"
#include "LyX.h"
-#include "MetricsInfo.h"
+#include "OutputParams.h"
#include "output_xhtml.h"
#include "sgml.h"
/////////////////////////////////////////////////////////////////////
InsetNomencl::InsetNomencl(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p, "nomenclature"),
+ : InsetCommand(buf, p),
nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
{}
static ParamInfo param_info_;
if (param_info_.empty()) {
param_info_.add("prefix", ParamInfo::LATEX_OPTIONAL);
- param_info_.add("symbol", ParamInfo::LATEX_REQUIRED);
- param_info_.add("description", ParamInfo::LATEX_REQUIRED);
+ param_info_.add("symbol", ParamInfo::LATEX_REQUIRED,
+ ParamInfo::HANDLING_LATEXIFY);
+ param_info_.add("description", ParamInfo::LATEX_REQUIRED,
+ ParamInfo::HANDLING_LATEXIFY);
}
return param_info_;
}
/////////////////////////////////////////////////////////////////////
InsetPrintNomencl::InsetPrintNomencl(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p, "nomencl_print")
+ : InsetCommand(buf, p)
{}
void InsetPrintNomencl::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
InsetCommandParams p(NOMENCL_PRINT_CODE);
// FIXME UNICODE
- InsetCommand::string2params("nomencl_print",
- to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(to_utf8(cmd.argument()), p);
if (p.getCmdName().empty()) {
- cur.noUpdate();
+ cur.noScreenUpdate();
break;
}
setParams(p);
bool InsetPrintNomencl::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_DIALOG_UPDATE:
case LFUN_INSET_MODIFY:
namespace {
-docstring nomenclWidest(Buffer const & buffer)
+docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
{
// nomenclWidest() determines and returns the widest used
// nomenclature symbol in the document
}
}
// return the widest (or an empty) string
- return symb;
-}
+ if (symb.empty())
+ return symb;
+
+ // we have to encode the string properly
+ docstring latex_symb;
+ for (size_t n = 0; n < symb.size(); ++n) {
+ try {
+ latex_symb += runparams.encoding->latexChar(symb[n]);
+ } catch (EncodingException & /* e */) {
+ if (runparams.dryrun) {
+ latex_symb += "<" + _("LyX Warning: ")
+ + _("uncodable character") + " '";
+ latex_symb += docstring(1, symb[n]);
+ latex_symb += "'>";
+ }
+ }
+ }
+ return latex_symb;
}
+} // namespace anon
int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in) const
{
+ OutputParams runparams = runparams_in;
int lines = 0;
if (getParam("set_width") == "auto") {
- docstring widest = nomenclWidest(buffer());
+ docstring widest = nomenclWidest(buffer(), runparams);
// Set the label width via nomencl's command \nomlabelwidth.
// This must be output before the command \printnomenclature
if (!widest.empty()) {
return lines;
}
// output the command \printnomenclature
- OutputParams runparams = runparams_in;
os << getCommand(runparams);
return lines;
}